From 187c0fe3fdb816e48f97b7423e0a7d4adcc2b89a Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sat, 20 Jul 2024 16:58:18 -0400 Subject: [PATCH] Code cleanups --- .../config/explorer/BldExplorerTreeStructure.java | 12 ++++++------ ...Descriptor.java => BldNodeDescriptorCommand.java} | 4 ++-- ...eDescriptor.java => BldNodeDescriptorFolder.java} | 6 ++---- ...odeDescriptor.java => BldNodeDescriptorRoot.java} | 4 ++-- ...odeDescriptor.java => BldNodeDescriptorText.java} | 4 ++-- .../java/rife/bld/idea/project/BldProjectWindow.java | 8 ++++---- 6 files changed, 18 insertions(+), 20 deletions(-) rename src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/{BldCommandNodeDescriptor.java => BldNodeDescriptorCommand.java} (94%) rename src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/{BldFolderNodeDescriptor.java => BldNodeDescriptorFolder.java} (90%) rename src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/{BldRootNodeDescriptor.java => BldNodeDescriptorRoot.java} (82%) rename src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/{BldTextNodeDescriptor.java => BldNodeDescriptorText.java} (83%) diff --git a/src/main/java/rife/bld/idea/config/explorer/BldExplorerTreeStructure.java b/src/main/java/rife/bld/idea/config/explorer/BldExplorerTreeStructure.java index 5ad90d1..a0857f7 100644 --- a/src/main/java/rife/bld/idea/config/explorer/BldExplorerTreeStructure.java +++ b/src/main/java/rife/bld/idea/config/explorer/BldExplorerTreeStructure.java @@ -56,25 +56,25 @@ public boolean isAlwaysLeaf(@NotNull Object element) { @NotNull public BldNodeDescriptor createDescriptor(@NotNull Object element, NodeDescriptor parentDescriptor) { if (element == root_) { - return new BldRootNodeDescriptor(project_, parentDescriptor, root_); + return new BldNodeDescriptorRoot(project_, parentDescriptor, root_); } if (element == commandsFolder_) { - return new BldFolderNodeDescriptor(project_, parentDescriptor, commandsFolder_, BldBundle.message("bld.project.commands")); + return new BldNodeDescriptorFolder(project_, parentDescriptor, commandsFolder_, BldBundle.message("bld.project.commands")); } if (element == dependenciesFolder_) { - return new BldFolderNodeDescriptor(project_, parentDescriptor, dependenciesFolder_, BldBundle.message("bld.project.dependencies")); + return new BldNodeDescriptorFolder(project_, parentDescriptor, dependenciesFolder_, BldBundle.message("bld.project.dependencies")); } if (element instanceof BldBuildCommand) { - return new BldCommandNodeDescriptor(project_, parentDescriptor, (BldBuildCommand)element); + return new BldNodeDescriptorCommand(project_, parentDescriptor, (BldBuildCommand)element); } if (element instanceof String) { - return new BldTextNodeDescriptor(project_, parentDescriptor, (String) element); + return new BldNodeDescriptorText(project_, parentDescriptor, (String) element); } LOG.error("Unknown element for this tree structure " + element); - return new BldTextNodeDescriptor(project_, parentDescriptor, String.valueOf(element)); + return new BldNodeDescriptorText(project_, parentDescriptor, String.valueOf(element)); } @Override diff --git a/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldCommandNodeDescriptor.java b/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorCommand.java similarity index 94% rename from src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldCommandNodeDescriptor.java rename to src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorCommand.java index 09be44c..6bdcc8f 100644 --- a/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldCommandNodeDescriptor.java +++ b/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorCommand.java @@ -19,11 +19,11 @@ import java.awt.*; -public final class BldCommandNodeDescriptor extends BldNodeDescriptor { +public final class BldNodeDescriptorCommand extends BldNodeDescriptor { private final BldBuildCommand command_; private CompositeAppearance highlightedText_; - public BldCommandNodeDescriptor(final Project project, final NodeDescriptor parentDescriptor, final BldBuildCommand command) { + public BldNodeDescriptorCommand(final Project project, final NodeDescriptor parentDescriptor, final BldBuildCommand command) { super(project, parentDescriptor); command_ = command; highlightedText_ = new CompositeAppearance(); diff --git a/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldFolderNodeDescriptor.java b/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorFolder.java similarity index 90% rename from src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldFolderNodeDescriptor.java rename to src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorFolder.java index 6d29971..7ea7f21 100644 --- a/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldFolderNodeDescriptor.java +++ b/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorFolder.java @@ -12,20 +12,18 @@ import com.intellij.openapi.roots.ui.CellAppearanceEx; import com.intellij.openapi.roots.ui.util.CompositeAppearance; import com.intellij.openapi.util.Comparing; -import com.intellij.ui.JBColor; import com.intellij.ui.SimpleColoredComponent; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; -import rife.bld.idea.config.BldBuildCommand; import java.awt.*; -public final class BldFolderNodeDescriptor extends BldNodeDescriptor { +public final class BldNodeDescriptorFolder extends BldNodeDescriptor { private final Object folder_; private final String name_; private CompositeAppearance highlightedText_; - public BldFolderNodeDescriptor(final Project project, final NodeDescriptor parentDescriptor, final Object folder, final String name) { + public BldNodeDescriptorFolder(final Project project, final NodeDescriptor parentDescriptor, final Object folder, final String name) { super(project, parentDescriptor); folder_ = folder; name_ = name; diff --git a/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldRootNodeDescriptor.java b/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorRoot.java similarity index 82% rename from src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldRootNodeDescriptor.java rename to src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorRoot.java index 29a48a3..2c086e3 100644 --- a/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldRootNodeDescriptor.java +++ b/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorRoot.java @@ -7,10 +7,10 @@ import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.project.Project; -public final class BldRootNodeDescriptor extends BldNodeDescriptor { +public final class BldNodeDescriptorRoot extends BldNodeDescriptor { private final Object root_; - public BldRootNodeDescriptor(Project project, NodeDescriptor parentDescriptor, Object root) { + public BldNodeDescriptorRoot(Project project, NodeDescriptor parentDescriptor, Object root) { super(project, parentDescriptor); root_ = root; } diff --git a/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldTextNodeDescriptor.java b/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorText.java similarity index 83% rename from src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldTextNodeDescriptor.java rename to src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorText.java index 47355cd..5964b3e 100644 --- a/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldTextNodeDescriptor.java +++ b/src/main/java/rife/bld/idea/config/explorer/nodeDescriptors/BldNodeDescriptorText.java @@ -9,8 +9,8 @@ import com.intellij.ui.JBColor; import org.jetbrains.annotations.Nls; -public final class BldTextNodeDescriptor extends BldNodeDescriptor { - public BldTextNodeDescriptor(Project project, NodeDescriptor parentDescriptor, @Nls String text) { +public final class BldNodeDescriptorText extends BldNodeDescriptor { + public BldNodeDescriptorText(Project project, NodeDescriptor parentDescriptor, @Nls String text) { super(project, parentDescriptor); myName = text; myColor = JBColor.blue; diff --git a/src/main/java/rife/bld/idea/project/BldProjectWindow.java b/src/main/java/rife/bld/idea/project/BldProjectWindow.java index 753980e..5455c8e 100644 --- a/src/main/java/rife/bld/idea/project/BldProjectWindow.java +++ b/src/main/java/rife/bld/idea/project/BldProjectWindow.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; import rife.bld.idea.config.BldBuildCommand; import rife.bld.idea.config.BldConfigurationListener; -import rife.bld.idea.config.explorer.nodeDescriptors.BldCommandNodeDescriptor; +import rife.bld.idea.config.explorer.nodeDescriptors.BldNodeDescriptorCommand; import rife.bld.idea.console.BldConsoleManager; import rife.bld.idea.execution.BldExecution; import rife.bld.idea.config.BldConfiguration; @@ -195,7 +195,7 @@ boolean canRunSelection() { for (final TreePath path : paths) { final DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent(); final Object userObject = node.getUserObject(); - return userObject instanceof BldCommandNodeDescriptor; + return userObject instanceof BldNodeDescriptorCommand; } return true; } @@ -207,10 +207,10 @@ private static List getCommandNamesFromPaths(TreePath[] paths) { final List targets = new ArrayList<>(); for (final TreePath path : paths) { final Object userObject = ((DefaultMutableTreeNode)path.getLastPathComponent()).getUserObject(); - if (!(userObject instanceof BldCommandNodeDescriptor)) { + if (!(userObject instanceof BldNodeDescriptorCommand)) { continue; } - final BldBuildCommand target = ((BldCommandNodeDescriptor)userObject).getCommand(); + final BldBuildCommand target = ((BldNodeDescriptorCommand)userObject).getCommand(); targets.add(target.name()); } return targets;