diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java index 24895f4689d0..ee891a1f25d3 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java @@ -335,9 +335,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { LOG.info("Unable to save plugin settings",e); } catch (IOException e) { - MessagesEx.error(this, ProjectBundle.message("project.save.error", ApplicationManagerEx.getApplicationEx().isInternal() - ? StringUtil.getThrowableText(e) - : e.getMessage())).showLater(); + MessagesEx.error(this, ProjectBundle.message("project.save.error", e.getMessage())).showLater(); LOG.info("Error saving project", e); } finally { mySavingInProgress.set(false); diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/AndroidExportPackageUtil.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/AndroidExportPackageUtil.java deleted file mode 100644 index 6f1fc3d2ff0f..000000000000 --- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/AndroidExportPackageUtil.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2010 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.android.exportSignedPackage; - -/** - * @author Eugene.Kudelevsky - */ -class AndroidExportPackageUtil { - private AndroidExportPackageUtil() { - } -} diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/CheckModulePanel.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/CheckModulePanel.java index 02caef6a9596..b556ad431ca8 100644 --- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/CheckModulePanel.java +++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/CheckModulePanel.java @@ -16,13 +16,9 @@ package org.jetbrains.android.exportSignedPackage; -import com.intellij.openapi.compiler.DummyCompileContext; -import com.intellij.openapi.module.Module; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.VerticalFlowLayout; -import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.android.facet.AndroidFacet; -import org.jetbrains.android.util.AndroidBundle; import javax.swing.*; import java.awt.*; @@ -39,29 +35,7 @@ public class CheckModulePanel extends JPanel { } public void updateMessages(AndroidFacet facet) { - Module module = facet.getModule(); clearMessages(); - final DummyCompileContext compileContext = DummyCompileContext.getInstance(); - VirtualFile outputDirectory = compileContext.getModuleOutputDirectory(module); - if (outputDirectory != null) { - /*String apkFilePath = facet.getApkPath(); - File f = new File(apkFilePath); - if (!f.isFile()) { - addError(AndroidBundle.message("android.file.not.exist.error", f.getPath())); - }*/ - } - else { - addError(AndroidBundle.message("android.unable.to.get.output.directory.error")); - } - - /*Manifest manifest = facet.getManifest(); - assert manifest != null; - Application application = manifest.getApplication(); - assert application != null; - String debuggable = application.getDebuggable().getValue(); - if (debuggable != null && BooleanValueConverter.getInstance(true).isTrue(debuggable)) { - addWarning(AndroidBundle.message("android.export.signed.package.debuggable.warning")); - }*/ revalidate(); } diff --git a/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporterBase.java b/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporterBase.java index f955b476ada6..41d636330cfb 100644 --- a/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporterBase.java +++ b/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporterBase.java @@ -124,7 +124,8 @@ public abstract class AndroidFacetImporterBase extends FacetImporter postTasks) { configurePaths(facet, mavenProject); configureAndroidPlatform(facet, mavenProject, modelsProvider); - importExternalApklibDependencies(module.getProject(), rootModel, modelsProvider, mavenTree, mavenProject, postTasks); + importExternalApklibDependencies(module.getProject(), rootModel, modelsProvider, mavenTree, mavenProject, mavenProjectToModuleName, + postTasks); if (hasApklibDependencies(mavenProject) && MavenProjectsManager.getInstance(module.getProject()).getImportingSettings().isUseMavenOutput()) { @@ -149,7 +150,8 @@ public abstract class AndroidFacetImporterBase extends FacetImporter mavenProject2ModuleName, List tasks) { final ModifiableRootModel rootModel = rootModelAdapter.getRootModel(); removeExtApklibDependencies(rootModel); @@ -165,7 +167,7 @@ public abstract class AndroidFacetImporterBase extends FacetImporter mavenProject2ModuleName) { final MavenId artifactMavenId = artifact.getMavenId(); final String genModuleName = AndroidMavenUtil.getModuleNameForExtApklibArtifact(artifactMavenId); - String targetDirPath = - AndroidMavenUtil.computePathToUnpackExtApklibArtifact(artifactMavenId, mavenProject, mavenTree.getProjects()); + final String genExternalApklibsDirPath = + AndroidMavenUtil.computePathForGenExternalApklibsDir(artifactMavenId, mavenProject, mavenTree.getProjects()); + + final String targetDirPath = genExternalApklibsDirPath != null + ? genExternalApklibsDirPath + '/' + AndroidMavenUtil.getMavenIdStringForFileName(artifactMavenId) + : null; if (targetDirPath == null) { return null; @@ -297,7 +304,7 @@ public abstract class AndroidFacetImporterBase extends FacetImporter mavenProject2ModuleName) { final AndroidExternalApklibDependenciesManager adm = AndroidExternalApklibDependenciesManager.getInstance(project); final AndroidExternalApklibDependenciesManager.MyResolvedInfo resolvedInfo = adm.getResolvedInfoForArtifact(artifact.getMavenId()); @@ -358,9 +367,10 @@ public abstract class AndroidFacetImporterBase extends FacetImporter allProjects) { + public static String computePathForGenExternalApklibsDir(@NotNull MavenId mavenId, + @NotNull MavenProject project, + @NotNull Collection allProjects) { String path = null; boolean resultUnderApp = false; @@ -58,23 +59,18 @@ public class AndroidMavenUtil { final VirtualFile projectDir = p.getDirectoryFile(); final boolean app = APK_PACKAGING_TYPE.equals(p.getPackaging()); if (path == null || !resultUnderApp && app) { - path = projectDir.getPath() + '/' + getDirNameToUnpackExtApklibArtifact(mavenId); + path = projectDir.getPath() + '/' + GEN_EXTERNAL_APKLIBS_DIRNAME; resultUnderApp = app; } } } if (path == null) { - path = project.getDirectoryFile().getPath() + '/' + getDirNameToUnpackExtApklibArtifact(mavenId); + path = project.getDirectoryFile().getPath() + '/' + GEN_EXTERNAL_APKLIBS_DIRNAME; } return path; } - @NotNull - private static String getDirNameToUnpackExtApklibArtifact(@NotNull MavenId mavenId) { - return "gen-external-apklibs/" + getMavenIdStringForFileName(mavenId); - } - @NotNull public static String getModuleNameForExtApklibArtifact(MavenId mavenId) { return APKLIB_MODULE_PREFIX + getMavenIdStringForFileName(mavenId);