MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-68119 show "please specify sdk" dialog only when user opened a logcat; check version name

Browse Source
This commit is contained in:
Eugene Kudelevsky
2011-04-15 19:04:00 +04:00
parent c221ecc30c
commit 258c859f6c
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowFactory.java
+18 -13
View File
@@ -49,24 +49,12 @@ import java.util.List;
public class AndroidLogcatToolWindowFactory implements ToolWindowFactory, Condition<Project> {
public static final String TOOL_WINDOW_ID = AndroidBundle.message("android.logcat.title");
public void createToolWindowContent(Project project, final ToolWindow toolWindow) {
public void createToolWindowContent(final Project project, final ToolWindow toolWindow) {
toolWindow.setIcon(AndroidUtils.ANDROID_ICON);
toolWindow.setAvailable(true, null);
toolWindow.setToHideOnEmptyContent(true);
toolWindow.setTitle(TOOL_WINDOW_ID);
List<AndroidFacet> facets = ProjectFacetManager.getInstance(project).getFacets(AndroidFacet.ID);
if (facets.size() == 0) {
Messages.showErrorDialog(project, AndroidBundle.message("android.logcat.no.android.facets.error"), CommonBundle.getErrorTitle());
return;
}
AndroidFacet facet = facets.get(0);
AndroidPlatform platform = facet.getConfiguration().getAndroidPlatform();
if (platform == null) {
Messages.showErrorDialog(project, AndroidBundle.message("specify.platform.error"), CommonBundle.getErrorTitle());
return;
}
final AndroidLogcatToolWindowView view = new AndroidLogcatToolWindowView(project) {
@Override
protected boolean isActive() {
@@ -85,6 +73,9 @@ public class AndroidLogcatToolWindowFactory implements ToolWindowFactory, Condit
if (visible != myToolWindowVisible) {
myToolWindowVisible = visible;
view.activate();
if (visible) {
checkFacetAndSdk(project);
}
}
}
}
@@ -104,6 +95,20 @@ public class AndroidLogcatToolWindowFactory implements ToolWindowFactory, Condit
});
}
private static void checkFacetAndSdk(Project project) {
List<AndroidFacet> facets = ProjectFacetManager.getInstance(project).getFacets(AndroidFacet.ID);
if (facets.size() == 0) {
Messages.showErrorDialog(project, AndroidBundle.message("android.logcat.no.android.facets.error"), CommonBundle.getErrorTitle());
return;
}
AndroidFacet facet = facets.get(0);
AndroidPlatform platform = facet.getConfiguration().getAndroidPlatform();
if (platform == null) {
Messages.showErrorDialog(project, AndroidBundle.message("specify.platform.error"), CommonBundle.getErrorTitle());
}
}
public boolean value(Project project) {
ModuleManager manager = ModuleManager.getInstance(project);
for (Module module : manager.getModules()) {
plugins/android/src/org/jetbrains/android/sdk/AndroidSdk.java
+1 -1
View File
@@ -81,7 +81,7 @@ public abstract class AndroidSdk {
public IAndroidTarget findTargetByApiLevel(@NotNull String apiLevel) {
IAndroidTarget candidate = null;
for (IAndroidTarget target : getTargets()) {
if (apiLevel.equals(target.getVersion().getApiString())) {
if (apiLevel.equals(target.getVersion().getApiString()) || apiLevel.equals(target.getVersionName())) {
if (target.isPlatform()) {
return target;
}