Skip to content

Commit

Permalink
refined code
Browse files Browse the repository at this point in the history
  • Loading branch information
eyalk007 committed Sep 17, 2024
1 parent 25f7f44 commit 14cafd3
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.idea.maven.execution.SoutMavenConsole;

import javax.swing.tree.TreeNode;
import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ List<GroovyPsiElement> parseComponentElements(GrArgumentList element) {

@Override
String createComponentName(PsiElement element) {
//element.getText()
if (isNamedArgumentComponent(element)) {
// implementation group: 'j', name: 'k', version: 'l'
return String.join(":",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@
import com.jfrog.ide.idea.scan.ScannerBase;
import com.jfrog.ide.idea.utils.Descriptor;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.dom.model.MavenDomArtifactCoordinates;
import org.jetbrains.idea.maven.project.MavenProject;

import java.util.Collection;
/**
* @author yahavi
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/jfrog/ide/idea/scan/GradleScanner.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;

import static com.jfrog.ide.common.log.Utils.logError;
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/com/jfrog/ide/idea/ui/ComponentPath.java

This file was deleted.

17 changes: 6 additions & 11 deletions src/main/java/com/jfrog/ide/idea/ui/LocalComponentsTree.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
Expand Down Expand Up @@ -119,7 +118,7 @@ private void handleContextMenu(ComponentsTree tree, MouseEvent e) {

if (selected instanceof DependencyNode) {

this.createNodePopupMenu("asd" ,(DependencyNode) selected);
this.createNodePopupMenu((DependencyNode) selected);
} else if (selected instanceof VulnerabilityNode) {
createIgnoreRuleOption((VulnerabilityNode) selected, e);
} else if (selected instanceof ApplicableIssueNode) {
Expand All @@ -139,19 +138,19 @@ private void createIgnoreRuleOption(VulnerabilityNode selectedIssue, MouseEvent
toolTip.setEnabled(true);
}

private void createNodePopupMenu(String path,DependencyNode selectedNode) {
private void createNodePopupMenu(DependencyNode selectedNode) {
popupMenu.removeAll();
NavigationService navigationService = NavigationService.getInstance(project);
Set<NavigationTarget> navigationCandidates = navigationService.getNavigation(selectedNode);
addNodeNavigation(path,navigationCandidates);
addNodeNavigation(navigationCandidates);
}

private void addNodeNavigation( String parent,Set<NavigationTarget> navigationCandidates) {
private void addNodeNavigation(Set<NavigationTarget> navigationCandidates) {
if (navigationCandidates == null) {
return;
}
if (navigationCandidates.size() > 1) {
addMultiNavigation(parent,navigationCandidates);
addMultiNavigation(navigationCandidates);
} else {
addSingleNavigation(navigationCandidates.iterator().next());
}
Expand All @@ -161,14 +160,10 @@ private void addSingleNavigation(NavigationTarget navigationTarget) {
popupMenu.add(createNavigationMenuItem(navigationTarget, SHOW_IN_PROJECT_DESCRIPTOR + " (" + navigationTarget.getComponentName() + ")"));
}

private void addMultiNavigation(String parentFile,Set<NavigationTarget> navigationCandidates) {
private void addMultiNavigation(Set<NavigationTarget> navigationCandidates) {
JMenu multiMenu = new JBMenu();
multiMenu.setText(SHOW_IN_PROJECT_DESCRIPTOR);
for (NavigationTarget navigationTarget : navigationCandidates) {
// if(parentFile.equals(navigationTarget.getElement().getContainingFile().getName())){
// continue;
// }

multiMenu.add(createNavigationMenuItem(navigationTarget, navigationTarget.getComponentName()));
}
popupMenu.add(multiMenu);
Expand Down

0 comments on commit 14cafd3

Please sign in to comment.