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

IDEADEV-40673: Artifacts: seems that Find usages action does nothing

Browse Source
This commit is contained in:
nik
2009-10-14 17:17:34 +04:00
parent e955f8d306
commit dc831de4dd
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProjectStructureElement.java
+12 -2
View File
@@ -24,6 +24,7 @@ import com.intellij.packaging.elements.CompositePackagingElement;
import com.intellij.packaging.elements.PackagingElement;
import com.intellij.packaging.impl.artifacts.ArtifactUtil;
import com.intellij.packaging.impl.artifacts.PackagingElementProcessor;
import com.intellij.packaging.impl.elements.ArtifactPackagingElement;
import com.intellij.packaging.impl.elements.LibraryPackagingElement;
import com.intellij.packaging.impl.elements.ModuleOutputPackagingElement;
import org.jetbrains.annotations.NotNull;
@@ -39,10 +40,10 @@ public class ArtifactProjectStructureElement extends ProjectStructureElement {
private final Artifact myOriginalArtifact;
public ArtifactProjectStructureElement(StructureConfigurableContext context,
ArtifactsStructureConfigurableContext artifactsStructureContext, Artifact originalArtifact) {
ArtifactsStructureConfigurableContext artifactsStructureContext, Artifact artifact) {
super(context);
myArtifactsStructureContext = artifactsStructureContext;
myOriginalArtifact = originalArtifact;
myOriginalArtifact = artifactsStructureContext.getOriginalArtifact(artifact);
}
@Override
@@ -70,6 +71,15 @@ public class ArtifactProjectStructureElement extends ProjectStructureElement {
ArtifactProjectStructureElement.this, getPathFromRoot(parents, "/"), packagingElement));
}
}
else if (packagingElement instanceof ArtifactPackagingElement) {
final Artifact usedArtifact = ((ArtifactPackagingElement)packagingElement).findArtifact(myArtifactsStructureContext);
if (usedArtifact != null) {
final ArtifactProjectStructureElement artifactElement =
new ArtifactProjectStructureElement(myContext, myArtifactsStructureContext, usedArtifact);
usages.add(new UsageInArtifact(myOriginalArtifact, myArtifactsStructureContext, artifactElement,
ArtifactProjectStructureElement.this, getPathFromRoot(parents, "/"), packagingElement));
}
}
return true;
}
}, myArtifactsStructureContext, false, artifact.getArtifactType());
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContext.java
+3
View File
@@ -39,4 +39,7 @@ public interface ArtifactsStructureConfigurableContext extends PackagingElementR
void editLayout(@NotNull Artifact artifact, Runnable action);
ArtifactEditor getOrCreateEditor(Artifact artifact);
@NotNull
Artifact getOriginalArtifact(@NotNull Artifact artifact);
}
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java
+1 -1
View File
@@ -63,7 +63,7 @@ class ArtifactsStructureConfigurableContextImpl implements ArtifactsStructureCon
}
@NotNull
private Artifact getOriginalArtifact(@NotNull Artifact artifact) {
public Artifact getOriginalArtifact(@NotNull Artifact artifact) {
if (myModifiableModel != null) {
return ((ArtifactModelImpl)myModifiableModel).getOriginalArtifact(artifact);
}
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/UsageInArtifact.java
+6 -3
View File
@@ -43,9 +43,12 @@ public class UsageInArtifact extends ProjectStructureElementUsage {
@Override
public void navigate() {
final Artifact artifact = myContext.getArtifactModel().getArtifactByOriginal(myOriginalArtifact);
final ArtifactEditorEx artifactEditor = (ArtifactEditorEx)myContext.getOrCreateEditor(artifact);
artifactEditor.getLayoutTreeComponent().selectNode(myParentPath, myPackagingElement);
ProjectStructureConfigurable.getInstance(myContext.getProject()).select(myOriginalArtifact, true);
ProjectStructureConfigurable.getInstance(myContext.getProject()).select(myOriginalArtifact, true).doWhenDone(new Runnable() {
public void run() {
final ArtifactEditorEx artifactEditor = (ArtifactEditorEx)myContext.getOrCreateEditor(artifact);
artifactEditor.getLayoutTreeComponent().selectNode(myParentPath, myPackagingElement);
}
});
}
@Override