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

converting packaging related parts of javaee facets to artifacts - 3

Browse Source
This commit is contained in:
Nikolay Chashnikov
2009-09-04 14:47:17 +04:00
parent 59e1b3e040
commit 061016def6
19 changed files with 169 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactPackagingElement.java
+3 -1
View File
@@ -15,6 +15,7 @@ import com.intellij.packaging.ui.ArtifactEditorContext;
import com.intellij.util.xmlb.annotations.Attribute;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NonNls;
import java.util.ArrayList;
import java.util.Collections;
@@ -26,6 +27,7 @@ import java.util.List;
public class ArtifactPackagingElement extends ComplexPackagingElement<ArtifactPackagingElement.ArtifactPackagingElementState> {
private final Project myProject;
private ArtifactPointer myArtifactPointer;
@NonNls public static final String ARTIFACT_NAME_ATTRIBUTE = "artifact-name";
public ArtifactPackagingElement(@NotNull Project project) {
super(ArtifactElementType.ARTIFACT_ELEMENT_TYPE);
@@ -125,7 +127,7 @@ public class ArtifactPackagingElement extends ComplexPackagingElement<ArtifactPa
public static class ArtifactPackagingElementState {
private String myArtifactName;
@Attribute("artifact-name")
@Attribute(ARTIFACT_NAME_ATTRIBUTE)
public String getArtifactName() {
return myArtifactName;
}
java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyPackagingElement.java
+4 -4
View File
@@ -3,7 +3,6 @@ package com.intellij.packaging.impl.elements;
import com.intellij.compiler.ant.Generator;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -11,8 +10,9 @@ import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.packaging.artifacts.ArtifactType;
import com.intellij.packaging.elements.*;
import com.intellij.packaging.impl.ui.FileCopyPresentation;
import com.intellij.packaging.ui.PackagingElementPresentation;
import com.intellij.packaging.ui.ArtifactEditorContext;
import com.intellij.packaging.ui.PackagingElementPresentation;
import com.intellij.util.PathUtil;
import com.intellij.util.xmlb.annotations.Attribute;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -66,7 +66,7 @@ public class FileCopyPackagingElement extends PackagingElement<FileCopyPackaging
}
public String getOutputFileName() {
return myRenamedOutputFileName != null ? myRenamedOutputFileName : StringUtil.getShortName(myFilePath, '/');
return myRenamedOutputFileName != null ? myRenamedOutputFileName : PathUtil.getFileName(myFilePath);
}
@Override
@@ -144,7 +144,7 @@ public class FileCopyPackagingElement extends PackagingElement<FileCopyPackaging
}
public void rename(@NotNull String newName) {
myRenamedOutputFileName = newName.equals(StringUtil.getShortName(myFilePath, '/')) ? null : newName;
myRenamedOutputFileName = newName.equals(PathUtil.getFileName(myFilePath)) ? null : newName;
}
@Nullable
java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java
+5 -4
View File
@@ -5,8 +5,6 @@ import com.intellij.openapi.deployment.DeploymentUtil;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.PackagingElementProcessor;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtil;
@@ -16,7 +14,10 @@ import com.intellij.packaging.elements.CompositePackagingElement;
import com.intellij.packaging.elements.PackagingElement;
import com.intellij.packaging.elements.PackagingElementFactory;
import com.intellij.packaging.elements.PackagingElementResolvingContext;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.PackagingElementProcessor;
import com.intellij.packaging.ui.ManifestFileConfiguration;
import com.intellij.util.PathUtil;
import com.intellij.util.Processor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -36,8 +37,8 @@ import java.util.jar.Manifest;
public class ManifestFileUtil {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorContextImpl");
public static final String MANIFEST_PATH = JarFile.MANIFEST_NAME;
public static final String MANIFEST_FILE_NAME = StringUtil.getShortName(MANIFEST_PATH, '/');
public static final String MANIFEST_DIR_NAME = StringUtil.getPackageName(MANIFEST_PATH, '/');
public static final String MANIFEST_FILE_NAME = PathUtil.getFileName(MANIFEST_PATH);
public static final String MANIFEST_DIR_NAME = PathUtil.getParentPath(MANIFEST_PATH);
@Nullable
public static VirtualFile findManifestFile(@NotNull CompositePackagingElement<?> root, PackagingElementResolvingContext context, ArtifactType artifactType) {
java/compiler/impl/src/com/intellij/packaging/impl/ui/FileCopyPresentation.java
+4 -4
View File
@@ -1,15 +1,15 @@
package com.intellij.packaging.impl.ui;
import com.intellij.ide.projectView.PresentationData;
import com.intellij.openapi.compiler.CompilerBundle;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.packaging.ui.PackagingElementPresentation;
import com.intellij.packaging.ui.PackagingElementWeights;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.ide.projectView.PresentationData;
import com.intellij.util.PathUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -26,7 +26,7 @@ public class FileCopyPresentation extends PackagingElementPresentation {
private final boolean myIsDirectory;
public FileCopyPresentation(String filePath, String outputFileName) {
mySourceFileName = StringUtil.getShortName(filePath, '/');
mySourceFileName = PathUtil.getFileName(filePath);
myOutputFileName = outputFileName;
String parentPath;
@@ -37,7 +37,7 @@ public class FileCopyPresentation extends PackagingElementPresentation {
myIsDirectory = myFile.isDirectory();
}
else {
parentPath = FileUtil.toSystemDependentName(StringUtil.getPackageName(filePath, '/'));
parentPath = FileUtil.toSystemDependentName(PathUtil.getParentPath(filePath));
myIsDirectory = false;
}
java/idea-ui/src/com/intellij/openapi/project/impl/IdeaProjectManagerImpl.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class IdeaProjectManagerImpl extends ProjectManagerImpl {
final String fp = canonicalize(filePath);
final File f = new File(fp);
if (fp != null && f.exists() && f.isFile() && !ApplicationManager.getApplication().isHeadlessEnvironment()) {
if (fp != null && f.exists() && !ApplicationManager.getApplication().isHeadlessEnvironment()) {
final boolean converted = ConversionService.getInstance().convert(fp);
if (!converted) {
throw new ProcessCanceledException();