From f2b6a5604da6f7c9986dbce526eb944f8b650a6b Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Fri, 7 Nov 2008 14:16:41 +0300 Subject: [PATCH] Maven: tool window cosmetics and refactoring --- .../maven/navigator/MavenProjectsNavigator.java | 12 ++-- ...Panel.java => MavenProjectsNavigatorPanel.java} | 72 ++++++++++------------ ...gs.java => MavenProjectsNavigatorSettings.java} | 2 +- ...eStructure.java => MavenProjectsStructure.java} | 15 +++-- ...log.java => SelectFromMavenProjectsDialog.java} | 18 +++--- .../maven/navigator/SelectMavenGoalDialog.java | 12 ++-- .../maven/navigator/SelectMavenProjectDialog.java | 12 ++-- .../navigator/action/GroupStructurallyAction.java | 6 +- .../action/MavenProjectsNavigatorAction.java | 6 +- .../action/ShowIgnoredProjectsAction.java | 6 +- .../idea/maven/MavenImportingTestCase.java | 16 ++--- .../idea/maven/StructureImportingTest.java | 10 +-- 12 files changed, 88 insertions(+), 99 deletions(-) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/{MavenNavigatorPanel.java => MavenProjectsNavigatorPanel.java} (66%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/{PomTreeViewSettings.java => MavenProjectsNavigatorSettings.java} (82%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/{MavenTreeStructure.java => MavenProjectsStructure.java} (98%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/{SelectFromMavenTreeDialog.java => SelectFromMavenProjectsDialog.java} (81%) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java index 0a25b85295..075cddfac1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java @@ -38,14 +38,14 @@ import java.util.List; import java.util.Map; @State(name = "MavenProjectNavigator", storages = {@Storage(id = "default", file = "$WORKSPACE_FILE$")}) -public class MavenProjectsNavigator extends MavenTreeStructure implements ProjectComponent, PersistentStateComponent { +public class MavenProjectsNavigator extends MavenProjectsStructure implements ProjectComponent, PersistentStateComponent { public static final String TOOL_WINDOW_ID = "Maven Projects"; private static final Icon ICON = IconLoader.getIcon("/images/mavenEmblem.png"); private static final URL ADD_ICON_URL = MavenProjectsNavigator.class.getResource("/general/add.png"); private static final URL SYNC_ICON_URL = MavenProjectsNavigator.class.getResource("/actions/sync.png"); - private PomTreeViewSettings mySettings = new PomTreeViewSettings(); + private MavenProjectsNavigatorSettings mySettings = new MavenProjectsNavigatorSettings(); private SimpleTreeBuilder myTreeBuilder; private SimpleTree myTree; @@ -271,22 +271,22 @@ public class MavenProjectsNavigator extends MavenTreeStructure implements Projec } private void initToolWindow() { - final JPanel navigatorPanel = new MavenNavigatorPanel(myProject, myProjectsManager, myTree); + final JPanel navigatorPanel = new MavenProjectsNavigatorPanel(myProject, myTree); ToolWindow pomToolWindow = ToolWindowManager.getInstance(myProject) .registerToolWindow(TOOL_WINDOW_ID, navigatorPanel, ToolWindowAnchor.RIGHT, myProject); pomToolWindow.setIcon(ICON); } - public PomTreeViewSettings getTreeViewSettings() { + public MavenProjectsNavigatorSettings getTreeViewSettings() { return mySettings; } - public PomTreeViewSettings getState() { + public MavenProjectsNavigatorSettings getState() { return mySettings; } - public void loadState(PomTreeViewSettings state) { + public void loadState(MavenProjectsNavigatorSettings state) { mySettings = state; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenNavigatorPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java similarity index 66% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenNavigatorPanel.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java index fe73d9d223..2d72848978 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenNavigatorPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java @@ -6,30 +6,26 @@ import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.SimpleToolWindowPanel; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; import com.intellij.ui.PopupHandler; import com.intellij.ui.treeStructure.SimpleNode; import com.intellij.ui.treeStructure.SimpleTree; -import com.intellij.uiDesigner.core.GridConstraints; -import com.intellij.uiDesigner.core.GridLayoutManager; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; -import org.jetbrains.idea.maven.utils.MavenDataKeys; import org.jetbrains.idea.maven.embedder.MavenEmbedderFactory; import org.jetbrains.idea.maven.project.MavenProjectModel; -import org.jetbrains.idea.maven.project.MavenProjectsManager; import org.jetbrains.idea.maven.runner.MavenGoalLocation; +import org.jetbrains.idea.maven.utils.MavenDataKeys; import javax.swing.*; import java.awt.*; import java.util.*; import java.util.List; - -public class MavenNavigatorPanel extends JPanel implements DataProvider { - +public class MavenProjectsNavigatorPanel extends SimpleToolWindowPanel implements DataProvider { private final Project myProject; private final SimpleTree myTree; @@ -41,26 +37,21 @@ public class MavenNavigatorPanel extends JPanel implements DataProvider { } }; - public MavenNavigatorPanel(Project project, MavenProjectsManager projectsManager, SimpleTree tree) { + public MavenProjectsNavigatorPanel(Project project, SimpleTree tree) { + super(true, true); myProject = project; myTree = tree; - setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1)); - - add(ActionManager.getInstance().createActionToolbar("New Maven Toolbar", (ActionGroup)ActionManager.getInstance() - .getAction("Maven.PomTreeToolbar"), true).getComponent(), - new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_NORTH, GridConstraints.FILL_HORIZONTAL, GridConstraints - .SIZEPOLICY_CAN_SHRINK | GridConstraints - .SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(-1, 20), null)); + JComponent toolbar = ActionManager.getInstance().createActionToolbar("New Maven Toolbar", (ActionGroup)ActionManager.getInstance() + .getAction("Maven.PomTreeToolbar"), true).getComponent(); + JScrollPane pane = new JScrollPane(myTree); - add(new JScrollPane(myTree), new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_SOUTH, GridConstraints.FILL_BOTH, - GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, - null, null)); + setToolbar(toolbar); + setContent(pane); myTree.addMouseListener(new PopupHandler() { public void invokePopup(final Component comp, final int x, final int y) { - final String id = getMenuId(getSelectedNodes(MavenTreeStructure.CustomNode.class)); + final String id = getMenuId(getSelectedNodes(MavenProjectsStructure.CustomNode.class)); if (id != null) { final ActionGroup actionGroup = (ActionGroup)ActionManager.getInstance().getAction(id); if (actionGroup != null) { @@ -70,9 +61,9 @@ public class MavenNavigatorPanel extends JPanel implements DataProvider { } @Nullable - private String getMenuId(Collection nodes) { + private String getMenuId(Collection nodes) { String id = null; - for (MavenTreeStructure.CustomNode node : nodes) { + for (MavenProjectsStructure.CustomNode node : nodes) { String menuId = node.getMenuId(); if (menuId == null) { return null; @@ -110,14 +101,14 @@ public class MavenNavigatorPanel extends JPanel implements DataProvider { private List extractPomNodes() { List result = new ArrayList(); - for (MavenTreeStructure.PomNode each : getSelectedPomNodes()) { + for (MavenProjectsStructure.PomNode each : getSelectedPomNodes()) { result.add(each.getProjectModel()); } return result.isEmpty() ? null : result; } private VirtualFile extractVirtualFile() { - final MavenTreeStructure.PomNode pomNode = getContextPomNode(); + final MavenProjectsStructure.PomNode pomNode = getContextPomNode(); if (pomNode == null) return null; VirtualFile file = pomNode.getFile(); if (file == null || !file.isValid()) return null; @@ -126,7 +117,7 @@ public class MavenNavigatorPanel extends JPanel implements DataProvider { private Object extractVirtualFiles() { final List files = new ArrayList(); - for (MavenTreeStructure.PomNode pomNode : getSelectedPomNodes()) { + for (MavenProjectsStructure.PomNode pomNode : getSelectedPomNodes()) { VirtualFile file = pomNode.getFile(); if (file.isValid()) { files.add(file); @@ -145,7 +136,7 @@ public class MavenNavigatorPanel extends JPanel implements DataProvider { private Object extractNavigatables() { final List navigatables = new ArrayList(); - for (MavenTreeStructure.PomNode pomNode : getSelectedPomNodes()) { + for (MavenProjectsStructure.PomNode pomNode : getSelectedPomNodes()) { final Navigatable navigatable = pomNode.getNavigatable(); if (navigatable != null) { navigatables.add(navigatable); @@ -155,7 +146,7 @@ public class MavenNavigatorPanel extends JPanel implements DataProvider { } private List extractGoals() { - final MavenTreeStructure.PomNode pomNode = getSelectedPomNode(); + final MavenProjectsStructure.PomNode pomNode = getSelectedPomNode(); if (pomNode != null) { MavenProjectModel project = pomNode.getProjectModel(); String goal = project.getDefaultGoal(); @@ -164,12 +155,12 @@ public class MavenNavigatorPanel extends JPanel implements DataProvider { } } else { - final List nodes = getSelectedNodes(MavenTreeStructure.GoalNode.class); - if (MavenTreeStructure.getCommonParent(nodes) == null) { + final List nodes = getSelectedNodes(MavenProjectsStructure.GoalNode.class); + if (MavenProjectsStructure.getCommonParent(nodes) == null) { return null; } final List goals = new ArrayList(); - for (MavenTreeStructure.GoalNode node : nodes) { + for (MavenProjectsStructure.GoalNode node : nodes) { goals.add(node.getGoal()); } Collections.sort(goals, myGoalOrderComparator); @@ -179,36 +170,36 @@ public class MavenNavigatorPanel extends JPanel implements DataProvider { } private Object extractProfiles() { - final List nodes = getSelectedNodes(MavenTreeStructure.ProfileNode.class); + final List nodes = getSelectedNodes(MavenProjectsStructure.ProfileNode.class); final List profiles = new ArrayList(); - for (MavenTreeStructure.ProfileNode node : nodes) { + for (MavenProjectsStructure.ProfileNode node : nodes) { profiles.add(node.getProfile()); } return profiles; } private List getSelectedNodes(final Class aClass) { - return MavenTreeStructure.getSelectedNodes(myTree, aClass); + return MavenProjectsStructure.getSelectedNodes(myTree, aClass); } - private List getSelectedPomNodes() { - return getSelectedNodes(MavenTreeStructure.PomNode.class); + private List getSelectedPomNodes() { + return getSelectedNodes(MavenProjectsStructure.PomNode.class); } @Nullable - private MavenTreeStructure.PomNode getSelectedPomNode() { - final List pomNodes = getSelectedPomNodes(); + private MavenProjectsStructure.PomNode getSelectedPomNode() { + final List pomNodes = getSelectedPomNodes(); return pomNodes.size() == 1 ? pomNodes.get(0) : null; } @Nullable - private MavenTreeStructure.PomNode getContextPomNode() { - final MavenTreeStructure.PomNode pomNode = getSelectedPomNode(); + private MavenProjectsStructure.PomNode getContextPomNode() { + final MavenProjectsStructure.PomNode pomNode = getSelectedPomNode(); if (pomNode != null) { return pomNode; } else { - return MavenTreeStructure.getCommonParent(getSelectedNodes(MavenTreeStructure.CustomNode.class)); + return MavenProjectsStructure.getCommonParent(getSelectedNodes(MavenProjectsStructure.CustomNode.class)); } } @@ -223,5 +214,4 @@ public class MavenNavigatorPanel extends JPanel implements DataProvider { Integer order = standardGoalOrder.get(goal); return order != null ? order.intValue() : standardGoalOrder.size(); } - } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/PomTreeViewSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorSettings.java similarity index 82% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/PomTreeViewSettings.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorSettings.java index d9fc4780b6..2fd3bba416 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/PomTreeViewSettings.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorSettings.java @@ -3,7 +3,7 @@ package org.jetbrains.idea.maven.navigator; /** * @author Vladislav.Kaznacheev */ -public class PomTreeViewSettings { +public class MavenProjectsNavigatorSettings { public boolean groupStructurally = true; public boolean filterStandardPhases = false; public boolean showIgnored = true; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenTreeStructure.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java similarity index 98% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenTreeStructure.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java index e866b43557..3033a04b1a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenTreeStructure.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java @@ -34,7 +34,7 @@ import java.net.URL; import java.util.*; import java.util.List; -public abstract class MavenTreeStructure extends SimpleTreeStructure { +public abstract class MavenProjectsStructure extends SimpleTreeStructure { private static final Icon MAVEN_PROJECT_ICON = IconLoader.getIcon("/images/mavenProject.png"); private static final Icon OPEN_PROFILES_ICON = IconLoader.getIcon("/images/profilesOpen.png"); @@ -52,8 +52,8 @@ public abstract class MavenTreeStructure extends SimpleTreeStructure { private static final Icon OPEN_MODULES_ICON = IconLoader.getIcon("/images/modulesOpen.png"); private static final Icon CLOSED_MODULES_ICON = IconLoader.getIcon("/images/modulesClosed.png"); - private static final URL ERROR_ICON_URL = MavenTreeStructure.class.getResource("/images/error.png"); - private static final URL WARNING_ICON_URL = MavenTreeStructure.class.getResource("/images/warning.png"); + private static final URL ERROR_ICON_URL = MavenProjectsStructure.class.getResource("/images/error.png"); + private static final URL WARNING_ICON_URL = MavenProjectsStructure.class.getResource("/images/warning.png"); private static final CustomNode[] EMPTY_NODES_ARRAY = new CustomNode[0]; protected final Project myProject; @@ -65,7 +65,7 @@ public abstract class MavenTreeStructure extends SimpleTreeStructure { protected final Collection myStandardPhases = MavenEmbedderFactory.getStandardPhasesList(); protected final Collection myStandardGoals = MavenEmbedderFactory.getStandardGoalsList(); - public MavenTreeStructure(Project project, + public MavenProjectsStructure(Project project, MavenProjectsManager projectsManager, MavenEventsManager eventsHandler) { myProject = project; @@ -77,7 +77,7 @@ public abstract class MavenTreeStructure extends SimpleTreeStructure { return myRoot; } - protected abstract PomTreeViewSettings getTreeViewSettings(); + protected abstract MavenProjectsNavigatorSettings getTreeViewSettings(); protected abstract void updateTreeFrom(@Nullable SimpleNode node); @@ -164,7 +164,6 @@ public abstract class MavenTreeStructure extends SimpleTreeStructure { } public abstract class CustomNode extends SimpleNode { - private CustomNode myStructuralParent; private ErrorLevel myNodeErrorLevel = ErrorLevel.NONE; private ErrorLevel myOverallErrorLevelCache = null; @@ -574,7 +573,7 @@ public abstract class MavenTreeStructure extends SimpleTreeStructure { @Nullable public Navigatable getNavigatable() { - return PsiManager.getInstance(MavenTreeStructure.this.myProject).findFile(myProjectModel.getFile()); + return PsiManager.getInstance(MavenProjectsStructure.this.myProject).findFile(myProjectModel.getFile()); } private void updateNode() { @@ -775,7 +774,7 @@ public abstract class MavenTreeStructure extends SimpleTreeStructure { } public boolean containsAsModule(PomNode node) { - MavenProjectsManager m = MavenProjectsManager.getInstance(MavenTreeStructure.this.myProject); + MavenProjectsManager m = MavenProjectsManager.getInstance(MavenProjectsStructure.this.myProject); return m.isModuleOf(myProjectModel, node.myProjectModel); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenTreeDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenProjectsDialog.java similarity index 81% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenTreeDialog.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenProjectsDialog.java index 4f1eead362..04d578d0bd 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenTreeDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenProjectsDialog.java @@ -17,14 +17,14 @@ import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import java.awt.*; -public class SelectFromMavenTreeDialog extends DialogWrapper { +public class SelectFromMavenProjectsDialog extends DialogWrapper { private Project myProject; private SimpleTree myTree; private NodeSelector mySelector; - public SelectFromMavenTreeDialog(Project project, + public SelectFromMavenProjectsDialog(Project project, String title, - final Class nodeClass, + final Class nodeClass, NodeSelector selector) { super(project, false); myProject = project; @@ -36,7 +36,7 @@ public class SelectFromMavenTreeDialog extends DialogWrapper { myTree.setShowsRootHandles(true); myTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); - PopupMavenTreeStructure treeStructure = new PopupMavenTreeStructure(myProject) { + PopupMavenProjectsStructure treeStructure = new PopupMavenProjectsStructure(myProject) { @Override protected Class[] getVisibleNodesClasses() { return new Class[]{nodeClass}; @@ -70,17 +70,17 @@ public class SelectFromMavenTreeDialog extends DialogWrapper { return pane; } - private class PopupMavenTreeStructure extends MavenTreeStructure { - private PomTreeViewSettings myTreeViewSettings; + private class PopupMavenProjectsStructure extends MavenProjectsStructure { + private MavenProjectsNavigatorSettings myTreeViewSettings; - public PopupMavenTreeStructure(final Project project) { + public PopupMavenProjectsStructure(final Project project) { super(project, MavenProjectsManager.getInstance(project), MavenEventsManager.getInstance(project)); myTreeViewSettings = MavenProjectsNavigator.getInstance(project).getTreeViewSettings(); } - protected PomTreeViewSettings getTreeViewSettings() { + protected MavenProjectsNavigatorSettings getTreeViewSettings() { return myTreeViewSettings; } @@ -106,6 +106,6 @@ public class SelectFromMavenTreeDialog extends DialogWrapper { } protected interface NodeSelector { - SimpleNode findNode(MavenTreeStructure.PomNode pomNode); + SimpleNode findNode(MavenProjectsStructure.PomNode pomNode); } } \ No newline at end of file diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenGoalDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenGoalDialog.java index 3737105e66..5ad473a5ff 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenGoalDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenGoalDialog.java @@ -3,13 +3,13 @@ package org.jetbrains.idea.maven.navigator; import com.intellij.openapi.project.Project; import com.intellij.ui.treeStructure.SimpleNode; -public class SelectMavenGoalDialog extends SelectFromMavenTreeDialog { +public class SelectMavenGoalDialog extends SelectFromMavenProjectsDialog { private String myPomPath; private String myGoal; public SelectMavenGoalDialog(Project project, final String pomPath, final String goal, String title) { - super(project, title, MavenTreeStructure.GoalNode.class, new NodeSelector() { - public SimpleNode findNode(MavenTreeStructure.PomNode pomNode) { + super(project, title, MavenProjectsStructure.GoalNode.class, new NodeSelector() { + public SimpleNode findNode(MavenProjectsStructure.PomNode pomNode) { if (pomNode.getProjectModel().getPath().equals(pomPath)) { return pomNode.findGoalNode(goal); } @@ -27,9 +27,9 @@ public class SelectMavenGoalDialog extends SelectFromMavenTreeDialog { super.doOKAction(); SimpleNode node = getSelectedNode(); - if (node instanceof MavenTreeStructure.GoalNode) { - MavenTreeStructure.GoalNode goalNode = (MavenTreeStructure.GoalNode)node; - myPomPath = goalNode.getParent(MavenTreeStructure.PomNode.class).getProjectModel().getPath(); + if (node instanceof MavenProjectsStructure.GoalNode) { + MavenProjectsStructure.GoalNode goalNode = (MavenProjectsStructure.GoalNode)node; + myPomPath = goalNode.getParent(MavenProjectsStructure.PomNode.class).getProjectModel().getPath(); myGoal = goalNode.getGoal(); } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenProjectDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenProjectDialog.java index 8e22a28eff..74d3cc1920 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenProjectDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenProjectDialog.java @@ -8,12 +8,12 @@ import org.jetbrains.idea.maven.project.MavenProjectModel; import javax.swing.*; import java.awt.event.ActionEvent; -public class SelectMavenProjectDialog extends SelectFromMavenTreeDialog { +public class SelectMavenProjectDialog extends SelectFromMavenProjectsDialog { private MavenProjectModel myResult; public SelectMavenProjectDialog(Project project, final MavenProjectModel current) { - super(project, "Select Maven Project", MavenTreeStructure.PomNode.class, new NodeSelector() { - public SimpleNode findNode(MavenTreeStructure.PomNode pomNode) { + super(project, "Select Maven Project", MavenProjectsStructure.PomNode.class, new NodeSelector() { + public SimpleNode findNode(MavenProjectsStructure.PomNode pomNode) { return pomNode.getProjectModel() == current ? pomNode : null; } }); @@ -38,11 +38,11 @@ public class SelectMavenProjectDialog extends SelectFromMavenTreeDialog { if (node instanceof NullNode) node = null; if (node != null) { - if (!(node instanceof MavenTreeStructure.PomNode)) { - ((MavenTreeStructure.CustomNode)node).getParent(MavenTreeStructure.PomNode.class); + if (!(node instanceof MavenProjectsStructure.PomNode)) { + ((MavenProjectsStructure.CustomNode)node).getParent(MavenProjectsStructure.PomNode.class); } } - myResult = node != null ? ((MavenTreeStructure.PomNode)node).getProjectModel() : null; + myResult = node != null ? ((MavenProjectsStructure.PomNode)node).getProjectModel() : null; super.doOKAction(); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/GroupStructurallyAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/GroupStructurallyAction.java index 9664af20ef..5c58031c45 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/GroupStructurallyAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/GroupStructurallyAction.java @@ -1,13 +1,13 @@ package org.jetbrains.idea.maven.navigator.action; -import org.jetbrains.idea.maven.navigator.PomTreeViewSettings; +import org.jetbrains.idea.maven.navigator.MavenProjectsNavigatorSettings; public class GroupStructurallyAction extends MavenProjectsNavigatorAction { - public boolean isSelected(PomTreeViewSettings settings) { + public boolean isSelected(MavenProjectsNavigatorSettings settings) { return settings.groupStructurally; } - public void setSelected(PomTreeViewSettings settings, boolean state) { + public void setSelected(MavenProjectsNavigatorSettings settings, boolean state) { settings.groupStructurally = state; } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/MavenProjectsNavigatorAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/MavenProjectsNavigatorAction.java index d8c05ddb37..db2e294516 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/MavenProjectsNavigatorAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/MavenProjectsNavigatorAction.java @@ -6,7 +6,7 @@ import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.navigator.MavenProjectsNavigator; -import org.jetbrains.idea.maven.navigator.PomTreeViewSettings; +import org.jetbrains.idea.maven.navigator.MavenProjectsNavigatorSettings; public abstract class MavenProjectsNavigatorAction extends ToggleAction { public void update(final AnActionEvent e) { @@ -33,7 +33,7 @@ public abstract class MavenProjectsNavigatorAction extends ToggleAction { } } - protected abstract boolean isSelected(PomTreeViewSettings settings); + protected abstract boolean isSelected(MavenProjectsNavigatorSettings settings); - protected abstract void setSelected(PomTreeViewSettings settings, boolean state); + protected abstract void setSelected(MavenProjectsNavigatorSettings settings, boolean state); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/ShowIgnoredProjectsAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/ShowIgnoredProjectsAction.java index 29c469c0bc..653adbe82b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/ShowIgnoredProjectsAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/action/ShowIgnoredProjectsAction.java @@ -1,13 +1,13 @@ package org.jetbrains.idea.maven.navigator.action; -import org.jetbrains.idea.maven.navigator.PomTreeViewSettings; +import org.jetbrains.idea.maven.navigator.MavenProjectsNavigatorSettings; public class ShowIgnoredProjectsAction extends MavenProjectsNavigatorAction { - public boolean isSelected(PomTreeViewSettings settings) { + public boolean isSelected(MavenProjectsNavigatorSettings settings) { return settings.showIgnored; } - public void setSelected(PomTreeViewSettings settings, boolean state) { + public void setSelected(MavenProjectsNavigatorSettings settings, boolean state) { settings.showIgnored = state; } } \ No newline at end of file diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java index 3901d06b4f..6a79fe6e4d 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java @@ -16,8 +16,8 @@ import com.intellij.ui.treeStructure.SimpleNode; import com.intellij.util.PathUtil; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.events.MavenEventsManager; -import org.jetbrains.idea.maven.navigator.MavenTreeStructure; -import org.jetbrains.idea.maven.navigator.PomTreeViewSettings; +import org.jetbrains.idea.maven.navigator.MavenProjectsStructure; +import org.jetbrains.idea.maven.navigator.MavenProjectsNavigatorSettings; import org.jetbrains.idea.maven.project.*; import org.jetbrains.idea.maven.runner.MavenEmbeddedExecutor; import org.jetbrains.idea.maven.runner.MavenRunnerParameters; @@ -52,24 +52,24 @@ public abstract class MavenImportingTestCase extends MavenTestCase { return myMavenProjectsManager.getImportingSettings(); } - protected MavenTreeStructure.RootNode createMavenTree() { - MavenTreeStructure s = new MavenTreeStructure(myProject, + protected MavenProjectsStructure.RootNode createMavenTree() { + MavenProjectsStructure s = new MavenProjectsStructure(myProject, myMavenProjectsManager, myProject.getComponent(MavenEventsManager.class)) { { for (MavenProjectModel each : myMavenProjectsManager.getProjects()) { - this.myRoot.addUnder(new MavenTreeStructure.PomNode(each)); + this.myRoot.addUnder(new MavenProjectsStructure.PomNode(each)); } } - protected PomTreeViewSettings getTreeViewSettings() { - return new PomTreeViewSettings(); + protected MavenProjectsNavigatorSettings getTreeViewSettings() { + return new MavenProjectsNavigatorSettings(); } protected void updateTreeFrom(@Nullable SimpleNode node) { } }; - return (MavenTreeStructure.RootNode)s.getRootElement(); + return (MavenProjectsStructure.RootNode)s.getRootElement(); } protected void assertModules(String... expectedNames) { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/StructureImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/StructureImportingTest.java index 5e71342e5e..4447d88ab5 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/StructureImportingTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/StructureImportingTest.java @@ -9,7 +9,7 @@ import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.java.LanguageLevel; import org.apache.maven.project.MavenProject; -import org.jetbrains.idea.maven.navigator.MavenTreeStructure; +import org.jetbrains.idea.maven.navigator.MavenProjectsStructure; import java.io.File; @@ -79,7 +79,7 @@ public class StructureImportingTest extends MavenImportingTestCase { importProject(); assertModules("project", "m1", "m2"); - MavenTreeStructure.RootNode r = createMavenTree(); + MavenProjectsStructure.RootNode r = createMavenTree(); assertEquals(1, r.pomNodes.size()); assertEquals("project", r.pomNodes.get(0).getId()); @@ -228,7 +228,7 @@ public class StructureImportingTest extends MavenImportingTestCase { importProject(); assertModules("project", "m1", "m2"); - MavenTreeStructure.RootNode r = createMavenTree(); + MavenProjectsStructure.RootNode r = createMavenTree(); assertEquals(1, r.pomNodes.size()); assertEquals("project", r.pomNodes.get(0).getId()); @@ -265,7 +265,7 @@ public class StructureImportingTest extends MavenImportingTestCase { importProject(); assertModules("project", "m1"); - MavenTreeStructure.RootNode r = createMavenTree(); + MavenProjectsStructure.RootNode r = createMavenTree(); assertEquals(1, r.pomNodes.size()); assertEquals("project", r.pomNodes.get(0).getId()); @@ -301,7 +301,7 @@ public class StructureImportingTest extends MavenImportingTestCase { importProject(); assertModules("project", "m1"); - MavenTreeStructure.RootNode r = createMavenTree(); + MavenProjectsStructure.RootNode r = createMavenTree(); assertEquals(1, r.pomNodes.size()); assertEquals("project", r.pomNodes.get(0).getId()); -- 2.11.4.GIT