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

moves

Browse Source
This commit is contained in:
Nikolay Chashnikov
2009-09-02 09:48:45 +04:00
parent 8d007cc4c4
commit 76e6e21570
21 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/ant/artifacts/ArtifactsGenerator.java
+1 -1
View File
@@ -7,7 +7,7 @@ import com.intellij.compiler.ant.Comment;
import com.intellij.compiler.ant.taskdefs.*;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.artifacts.ArtifactManager;
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactModelImpl.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.intellij.packaging.impl.artifacts;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.packaging.artifacts.*;
import com.intellij.util.EventDispatcher;
import org.jetbrains.annotations.NotNull;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactUtil.java → java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java
+3 -1
View File
@@ -1,7 +1,9 @@
package com.intellij.openapi.roots.ui.configuration.artifacts;
package com.intellij.packaging.impl.artifacts;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.CompilerProjectExtension;
import com.intellij.packaging.impl.artifacts.PackagingElementProcessor;
import com.intellij.packaging.impl.artifacts.ParentElementProcessor;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementProcessor.java → java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PackagingElementProcessor.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.intellij.openapi.roots.ui.configuration.artifacts;
package com.intellij.packaging.impl.artifacts;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.packaging.elements.ComplexPackagingElement;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ParentElementProcessor.java → java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ParentElementProcessor.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.intellij.openapi.roots.ui.configuration.artifacts;
package com.intellij.packaging.impl.artifacts;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.elements.CompositePackagingElement;
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.intellij.compiler.impl.ModuleCompileScope;
import com.intellij.compiler.impl.ProjectCompileScope;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.compiler.CompileScope;
import com.intellij.packaging.artifacts.Artifact;
java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.intellij.packaging.impl.elements;
import com.intellij.openapi.compiler.CompilerBundle;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.openapi.roots.ui.configuration.artifacts.ChooseArtifactsDialog;
import com.intellij.openapi.project.Project;
import com.intellij.packaging.artifacts.Artifact;
java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java
-4
View File
@@ -3,18 +3,14 @@ package com.intellij.packaging.impl.elements;
import com.intellij.openapi.compiler.CompilerBundle;
import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.openapi.roots.ui.configuration.packaging.ChooseLibrariesDialog;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.elements.CompositePackagingElement;
import com.intellij.packaging.elements.PackagingElementType;
import com.intellij.packaging.ui.PackagingEditorContext;
import com.intellij.util.Icons;
import com.intellij.util.Processor;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java
+2 -2
View File
@@ -5,8 +5,8 @@ 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.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.openapi.roots.ui.configuration.artifacts.PackagingElementProcessor;
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;
java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserDialog;
import com.intellij.openapi.fileChooser.FileChooserFactory;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.roots.libraries.LibraryTable;
import com.intellij.openapi.ui.Messages;
java/idea-ui/src/com/intellij/facet/impl/DefaultFacetsProvider.java
-37
View File
@@ -1,37 +0,0 @@
/*
* Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved.
*/
package com.intellij.facet.impl;
import com.intellij.openapi.roots.ui.configuration.FacetsProvider;
import com.intellij.openapi.module.Module;
import com.intellij.facet.Facet;
import com.intellij.facet.FacetTypeId;
import com.intellij.facet.FacetManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
/**
* @author nik
*/
public class DefaultFacetsProvider implements FacetsProvider {
public static final FacetsProvider INSTANCE = new DefaultFacetsProvider();
@NotNull
public Facet[] getAllFacets(Module module) {
return FacetManager.getInstance(module).getAllFacets();
}
@NotNull
public <F extends Facet> Collection<F> getFacetsByType(Module module, FacetTypeId<F> type) {
return FacetManager.getInstance(module).getFacetsByType(type);
}
@Nullable
public <F extends Facet> F findFacet(Module module, FacetTypeId<F> type, String name) {
return FacetManager.getInstance(module).findFacet(type, name);
}
}
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java
+1
View File
@@ -9,6 +9,7 @@ import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.artifacts.ArtifactType;
import com.intellij.packaging.elements.CompositePackagingElement;
import com.intellij.packaging.ui.PackagingEditorContext;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import org.jetbrains.annotations.Nls;
import javax.swing.*;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
+1
View File
@@ -24,6 +24,7 @@ import com.intellij.packaging.elements.CompositePackagingElement;
import com.intellij.packaging.elements.PackagingElementType;
import com.intellij.packaging.ui.ManifestFileConfiguration;
import com.intellij.packaging.ui.PackagingEditorContext;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.ui.PopupHandler;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.TabbedPaneWrapper;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java
+1
View File
@@ -7,6 +7,7 @@ import com.intellij.packaging.artifacts.ArtifactPropertiesProvider;
import com.intellij.packaging.artifacts.ModifiableArtifact;
import com.intellij.packaging.ui.ArtifactPropertiesEditor;
import com.intellij.packaging.ui.PackagingEditorContext;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.ui.TabbedPaneWrapper;
import javax.swing.*;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java
+1
View File
@@ -8,6 +8,7 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.packaging.artifacts.*;
import com.intellij.packaging.elements.CompositePackagingElement;
import com.intellij.packaging.impl.artifacts.ArtifactModelImpl;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.packaging.ui.ManifestFileConfiguration;
import com.intellij.packaging.ui.PackagingEditorContext;
import org.jetbrains.annotations.NotNull;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutNodesDraggingObject.java
+1
View File
@@ -3,6 +3,7 @@ package com.intellij.openapi.roots.ui.configuration.artifacts;
import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode;
import com.intellij.packaging.elements.PackagingElement;
import com.intellij.packaging.ui.ArtifactEditorContext;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.ui.treeStructure.SimpleNode;
import org.jetbrains.annotations.NotNull;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java
+1
View File
@@ -11,6 +11,7 @@ import com.intellij.packaging.artifacts.ArtifactPointerManager;
import com.intellij.packaging.elements.CompositePackagingElement;
import com.intellij.packaging.elements.PackagingElement;
import com.intellij.packaging.impl.artifacts.PlainArtifactType;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.elements.ArtifactPackagingElement;
import java.util.Collection;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeComponent;
import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeSelection;
import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode;
java/compiler/impl/src/com/intellij/packaging/impl/ui/FacetBasedPackagingSourceItemsProvider.java → java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/FacetBasedPackagingSourceItemsProvider.java
+3 -5
View File
@@ -1,15 +1,13 @@
package com.intellij.packaging.impl.ui;
package com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems;
import com.intellij.facet.Facet;
import com.intellij.facet.FacetTypeId;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.DelegatedSourceItemPresentation;
import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ModuleSourceItemGroup;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.elements.PackagingElement;
import com.intellij.packaging.elements.PackagingElementType;
import com.intellij.packaging.elements.PackagingElementOutputKind;
import com.intellij.packaging.elements.PackagingElementType;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.packaging.ui.*;
import com.intellij.util.Processor;
import org.jetbrains.annotations.NotNull;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModulesAndLibrariesSourceItemsProvider.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.intellij.openapi.roots.LibraryOrderEntry;
import com.intellij.openapi.roots.ModuleRootModel;
import com.intellij.openapi.roots.OrderEntry;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.vfs.VirtualFile;
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoParentAndLinkViaManifestAction.java
+2 -2
View File
@@ -5,8 +5,8 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorImpl;
import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil;
import com.intellij.openapi.roots.ui.configuration.artifacts.ParentElementProcessor;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.ParentElementProcessor;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.packaging.artifacts.Artifact;