diff --git a/.idea/icon.png b/.idea/icon.png new file mode 100644 index 000000000000..39205213c3b1 Binary files /dev/null and b/.idea/icon.png differ diff --git a/visualizer/IdealGraphVisualizer/Bytecodes/pom.xml b/visualizer/IdealGraphVisualizer/Bytecodes/pom.xml index 332dcf666dae..e5e17a1c8a97 100644 --- a/visualizer/IdealGraphVisualizer/Bytecodes/pom.xml +++ b/visualizer/IdealGraphVisualizer/Bytecodes/pom.xml @@ -7,24 +7,9 @@ Bytecodes nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -72,7 +57,22 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/BytecodeViewTopComponent.java b/visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/BytecodeViewTopComponent.java index 74e46bd9951a..b9870bec0bfa 100644 --- a/visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/BytecodeViewTopComponent.java +++ b/visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/BytecodeViewTopComponent.java @@ -177,6 +177,7 @@ public void stateChanged(ChangeEvent e) { InputGraphProvider p = viewer.getActiveViewer(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { InputGraph g; if (p != null) { @@ -194,7 +195,7 @@ public void run() { }); } - final static class ResolvableHelper implements Serializable { + static final class ResolvableHelper implements Serializable { private static final long serialVersionUID = 1L; diff --git a/visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/MethodNode.java b/visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/MethodNode.java index bcdac0956a72..433a83a423c8 100644 --- a/visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/MethodNode.java +++ b/visualizer/IdealGraphVisualizer/Bytecodes/src/main/java/org/graalvm/visualizer/bytecodes/MethodNode.java @@ -72,7 +72,7 @@ public void setMethod(InputMethod method, InputGraph graph) { * Creates a new instance of MethodNode */ public MethodNode(InputMethod method, InputGraph graph, String bciString) { - super((method != null && method.getBytecodes().isEmpty()) ? Children.LEAF : new MethodNodeChildren(method, graph, bciString)); + super(method != null && method.getBytecodes().isEmpty() ? Children.LEAF : new MethodNodeChildren(method, graph, bciString)); if (method != null) { this.setDisplayName(method.getName()); } diff --git a/visualizer/IdealGraphVisualizer/ControlFlow/pom.xml b/visualizer/IdealGraphVisualizer/ControlFlow/pom.xml index 5e332656f34b..98dce7462ab9 100644 --- a/visualizer/IdealGraphVisualizer/ControlFlow/pom.xml +++ b/visualizer/IdealGraphVisualizer/ControlFlow/pom.xml @@ -7,24 +7,9 @@ ControlFlow nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -82,7 +67,22 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/BlockConnectionWidget.java b/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/BlockConnectionWidget.java index 5eb9bdcbd0f0..ce81e6bcf9de 100644 --- a/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/BlockConnectionWidget.java +++ b/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/BlockConnectionWidget.java @@ -64,10 +64,12 @@ public InputBlockEdge getEdge() { return edge; } + @Override public Port getTo() { return inputSlot; } + @Override public Port getFrom() { return outputSlot; } @@ -96,6 +98,7 @@ private void updateStroke() { setStroke(stroke); } + @Override public void setControlPoints(List p) { this.points = p; } diff --git a/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/ControlFlowAction.java b/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/ControlFlowAction.java index e14229775779..0d5240e3e02c 100644 --- a/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/ControlFlowAction.java +++ b/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/ControlFlowAction.java @@ -34,6 +34,7 @@ public ControlFlowAction() { super(NbBundle.getMessage(ControlFlowAction.class, "CTL_ControlFlowAction")); } + @Override public void actionPerformed(ActionEvent evt) { TopComponent win = ControlFlowTopComponent.findInstance(); win.open(); diff --git a/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/ControlFlowTopComponent.java b/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/ControlFlowTopComponent.java index 991e5d2816d0..e9775d39c260 100644 --- a/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/ControlFlowTopComponent.java +++ b/visualizer/IdealGraphVisualizer/ControlFlow/src/main/java/org/graalvm/visualizer/controlflow/ControlFlowTopComponent.java @@ -146,7 +146,7 @@ public void requestActive() { scene.getView().requestFocus(); } - final static class ResolvableHelper implements Serializable { + static final class ResolvableHelper implements Serializable { private static final long serialVersionUID = 1L; diff --git a/visualizer/IdealGraphVisualizer/Coordinator/pom.xml b/visualizer/IdealGraphVisualizer/Coordinator/pom.xml index e14e119a607c..d8e2fecab077 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/pom.xml +++ b/visualizer/IdealGraphVisualizer/Coordinator/pom.xml @@ -7,24 +7,9 @@ Coordinator nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -142,7 +127,22 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/DiffGraphCookie.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/DiffGraphCookie.java index c6ebe97e1da1..2c0c6fac0282 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/DiffGraphCookie.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/DiffGraphCookie.java @@ -51,7 +51,7 @@ private InputGraph getCurrentGraph() { public boolean isPossible() { InputGraph cg = getCurrentGraph(); - if (cg == null || cg == graph || !(Objects.equals(cg.getGraphType(), graph.getGraphType()))) { + if (cg == null || cg == graph || !Objects.equals(cg.getGraphType(), graph.getGraphType())) { return false; } Group p1 = graph.getGroup(); diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/ImportAction.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/ImportAction.java index a107cb5018c0..ba4ca0380ef5 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/ImportAction.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/ImportAction.java @@ -42,7 +42,6 @@ import java.io.File; import java.io.IOException; import java.util.Locale; -import java.util.logging.Logger; @ActionID(category = "File", id = "org.graalvm.visualizer.coordinator.actions.ImportAction") @ActionRegistration(iconBase = "org/graalvm/visualizer/coordinator/images/import.png", displayName = "#CTL_ImportAction") @@ -51,7 +50,6 @@ , @ActionReference(path = "Shortcuts", name = "C-O") }) public final class ImportAction extends SystemAction { - private static final Logger LOG = Logger.getLogger(ImportAction.class.getName()); @NbBundle.Messages("MSG_BIGV_Description_ZIP=Compressed dumps (*.zip)") public static FileFilter getZipFilter() { diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveOperation.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveOperation.java index ecf8cc1acb62..81666d39c8be 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveOperation.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveOperation.java @@ -306,7 +306,7 @@ private synchronized void doPrepare() { } else { nonSessionsSelected = true; } - sessionData.computeIfAbsent(gd, (d) -> new ArrayList<>()).add(f); + sessionData.computeIfAbsent(gd, d -> new ArrayList<>()).add(f); } for (List v : sessionData.values()) { retainJustParents(v); @@ -466,7 +466,6 @@ private void createFlatDocument() { for (GraphDocument doc : documentOrder) { for (Folder g : sessionData.get(doc)) { if (g instanceof GraphDocument) { - GraphDocument gd = (GraphDocument) g; g.getElements().forEach(item -> { if (item instanceof Folder) { nd.addElement(item); diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveOptions.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveOptions.java index 5e67d36c7e32..692dc21c8902 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveOptions.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/actions/SaveOptions.java @@ -119,6 +119,7 @@ private void initComponents() { saveStyle.add(optMultipleFiles); org.openide.awt.Mnemonics.setLocalizedText(optMultipleFiles, org.openide.util.NbBundle.getMessage(SaveOptions.class, "SaveOptions.optMultipleFiles.text")); // NOI18N optMultipleFiles.addItemListener(new java.awt.event.ItemListener() { + @Override public void itemStateChanged(java.awt.event.ItemEvent evt) { optMultipleFilesItemStateChanged(evt); } @@ -126,6 +127,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) { org.openide.awt.Mnemonics.setLocalizedText(cbPromptNames, org.openide.util.NbBundle.getMessage(SaveOptions.class, "SaveOptions.cbPromptNames.text")); // NOI18N cbPromptNames.addItemListener(new java.awt.event.ItemListener() { + @Override public void itemStateChanged(java.awt.event.ItemEvent evt) { cbPromptNamesItemStateChanged(evt); } diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/AbstractOutlineNode.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/AbstractOutlineNode.java index d22c7e8c1ab4..b574e4a44d30 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/AbstractOutlineNode.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/AbstractOutlineNode.java @@ -60,7 +60,7 @@ protected String getUserName() { @Override public boolean canRename() { - return (item instanceof Properties.MutableOwner); + return item instanceof Properties.MutableOwner; } @Override diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/BinaryGraphDataObject.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/BinaryGraphDataObject.java index 904cc35beb12..a6801591668e 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/BinaryGraphDataObject.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/BinaryGraphDataObject.java @@ -36,7 +36,6 @@ import java.io.File; import java.io.IOException; -import java.util.logging.Logger; /** * DataObject that represents a .BGV file. This object is NOT designed for presentation @@ -66,7 +65,6 @@ position = 400 ) public class BinaryGraphDataObject extends MultiDataObject { - private static final Logger LOG = Logger.getLogger(BinaryGraphDataObject.class.getName()); /** * MIME type for BGV dumps */ diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/FolderNode.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/FolderNode.java index 58ed1c1886e6..ecf8870e2c47 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/FolderNode.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/FolderNode.java @@ -335,7 +335,7 @@ protected Sheet createSheet() { versions.setName("versions"); // NOI18N versions.setDisplayName(Bundle.TITLE_Versions()); List> versionProps = new ArrayList<>(); - pen.getProperties().forEach((p) -> { + pen.getProperties().forEach(p -> { if (p.getName().startsWith("igv.")) { // NOI18N return; } diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/GraphNode.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/GraphNode.java index 40aba4fe412d..b8320945c87b 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/GraphNode.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/GraphNode.java @@ -38,7 +38,6 @@ import org.openide.util.lookup.AbstractLookup; import org.openide.util.lookup.InstanceContent; -import jdk.graal.compiler.graphio.parsing.model.ChangedListener; import jdk.graal.compiler.graphio.parsing.model.InputGraph; import jdk.graal.compiler.graphio.parsing.model.Properties; @@ -47,13 +46,6 @@ public class GraphNode extends AbstractNode { private boolean error; private Image baseIcon; - private final ChangedListener l = new ChangedListener() { - @Override - public void changed(Object source) { - SwingUtilities.invokeLater(GraphNode.this::refreshError); - } - }; - /** * Creates a new instance of GraphNode */ @@ -153,7 +145,7 @@ public boolean equals(Object obj) { return true; } if (obj instanceof GraphNode) { - return (graph == ((GraphNode) obj).graph); + return graph == ((GraphNode) obj).graph; } return false; } diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/ManagedSessionImpl.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/ManagedSessionImpl.java index 9f76d42581ed..f8ab5b7edbe0 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/ManagedSessionImpl.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/ManagedSessionImpl.java @@ -45,7 +45,7 @@ public class ManagedSessionImpl extends GraphDocument implements Lookup.Provider public ManagedSessionImpl(Object id, Properties initialValues) { this(id, (FileObject) null); - initialValues.iterator().forEachRemaining((p) -> { + initialValues.iterator().forEachRemaining(p -> { if (!KnownPropertyNames.PROPNAME_NAME.equals(p.getName())) { getProperties().setProperty(p.getName(), p.getValue()); } diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/SessionManagerImpl.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/SessionManagerImpl.java index 5bab4582b34a..c791e18d88ce 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/SessionManagerImpl.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/SessionManagerImpl.java @@ -215,6 +215,7 @@ public void run() { } } + @Override public void run() { binaryServer = new SImpl(this, new ParseMonitor() { @Override @@ -248,9 +249,7 @@ public static SessionManagerImpl getInstance() { } public GraphDocument getCurrentDocument() { - boolean a = true; boolean b = false; - a = !b; return singleDocument; } diff --git a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/SessionNode.java b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/SessionNode.java index 509397f4625b..f9a60ccc33a0 100644 --- a/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/SessionNode.java +++ b/visualizer/IdealGraphVisualizer/Coordinator/src/main/java/org/graalvm/visualizer/coordinator/impl/SessionNode.java @@ -44,8 +44,6 @@ public class SessionNode extends FolderNode implements ChangedListener storageResult; - private FileObject file; - public SessionNode(Folder folder) { super(folder); @@ -76,12 +74,10 @@ public void changed(GraphDocument source) { }) private void updateUI() { boolean hasFile; - FileObject f; synchronized (this) { Collection col = storageResult.allInstances(); hasFile = !col.isEmpty(); - f = file = hasFile ? col.iterator().next() : null; } setIconBaseWithExtension(ICON_PREFIX + (hasFile ? "file.png" : "graal.png")); diff --git a/visualizer/IdealGraphVisualizer/Data/pom.xml b/visualizer/IdealGraphVisualizer/Data/pom.xml index 615bc2db1273..999ed59e8dd1 100644 --- a/visualizer/IdealGraphVisualizer/Data/pom.xml +++ b/visualizer/IdealGraphVisualizer/Data/pom.xml @@ -7,6 +7,42 @@ Data nbm + + UTF-8 + + + + ${project.groupId} + Settings + ${project.version} + + + junit + junit + 4.13.2 + + + org.netbeans.api + org-netbeans-api-annotations-common + ${netbeans.version} + + + org.netbeans.api + org-netbeans-modules-nbjunit + ${netbeans.version} + test + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + @@ -45,40 +81,4 @@ - - - ${project.groupId} - Settings - ${project.version} - - - junit - junit - 4.13.2 - - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - org.netbeans.api - org-netbeans-modules-nbjunit - ${netbeans.version} - test - - - org.netbeans.api - org-openide-util - ${netbeans.version} - - - org.netbeans.api - org-openide-util-lookup - ${netbeans.version} - - - - UTF-8 - diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/GraphProtocol.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/GraphProtocol.java index cb57256f714e..a2686a72487f 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/GraphProtocol.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/GraphProtocol.java @@ -922,7 +922,7 @@ private static final class ConstantPool { private static Object getLookupKey(Object key) { // Collections must be converted to a String early since they can be mutated after // being inserted into the map. - return (key instanceof Collection) ? key.toString() : key; + return key instanceof Collection ? key.toString() : key; } Character get(Object initialKey, int type) { diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/BinaryReader.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/BinaryReader.java index 300ac259a2db..b14f5fa4e799 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/BinaryReader.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/BinaryReader.java @@ -962,7 +962,7 @@ private void parseProperties() throws IOException { private void parseProperties(BiConsumer propertyConsumer) throws IOException { int propCount = dataSource.readShort(); if (dataSource.getMajorVersion() > 7) { - propCount = (propCount == Character.MAX_VALUE ? dataSource.readInt() : propCount); + propCount = propCount == Character.MAX_VALUE ? dataSource.readInt() : propCount; } builder.setPropertySize(propCount); for (int j = 0; j < propCount; j++) { diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/ModelBuilder.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/ModelBuilder.java index d13062bdf003..0b47421551b7 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/ModelBuilder.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/ModelBuilder.java @@ -357,7 +357,7 @@ protected void connectModifiedProperties(FolderElement g) { public static String makeGraphName(int dumpId, String format, Object[] args) { assert format != null && args != null; if (args.length == 0) { - return (dumpId < 0) ? format : (dumpId + ": " + format); + return dumpId < 0 ? format : (dumpId + ": " + format); } Object[] tmpArgs = args.clone(); for (int i = 0; i < args.length; ++i) { @@ -376,7 +376,7 @@ public static String makeGraphName(int dumpId, String format, Object[] args) { tmpArgs[i] = s; } } - return (dumpId < 0) ? String.format(format, tmpArgs) : (dumpId + ": " + String.format(format, tmpArgs)); + return dumpId < 0 ? String.format(format, tmpArgs) : (dumpId + ": " + String.format(format, tmpArgs)); } @SuppressWarnings("unused") diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/model/InputBytecode.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/model/InputBytecode.java index 0e9f6dec1350..5e9aef5223f0 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/model/InputBytecode.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/jdk/graal/compiler/graphio/parsing/model/InputBytecode.java @@ -188,7 +188,7 @@ private static int resolveLength(byte[] code, int startPos, int opcode) { position += padding; int l = intFromRange(code, position + 4, position + 8); if (opcode == 171) { - return 8 + padding + 8 * (l); + return 8 + padding + 8 * l; } int h = intFromRange(code, position + 8, position + 12); return 12 + padding + 4 * (h - l + 1); diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/Pair.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/Pair.java index 98e98478f5db..258cdc4c0c00 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/Pair.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/Pair.java @@ -57,12 +57,12 @@ public boolean equals(Object o) { return false; } Pair obj = (Pair) o; - boolean b1 = (l == obj.l); + boolean b1 = l == obj.l; if (l != null) { b1 = l.equals(obj.l); } - boolean b2 = (r == obj.r); + boolean b2 = r == obj.r; if (r != null) { b2 = r.equals(obj.r); } @@ -72,7 +72,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return ((l == null) ? 0 : l.hashCode()) * 71 + ((r == null) ? 0 : r.hashCode()); + return (l == null ? 0 : l.hashCode()) * 71 + (r == null ? 0 : r.hashCode()); } @Override diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/Source.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/Source.java index e2a637d37331..eec87ed536d8 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/Source.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/Source.java @@ -68,7 +68,7 @@ public boolean isEmpty() { private List list() { assert hasMany(); - return ((List) sources); + return (List) sources; } /** diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/BinaryMap.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/BinaryMap.java index 1d2032fb8a4d..d1e13679c6c6 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/BinaryMap.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/BinaryMap.java @@ -91,8 +91,8 @@ private Cache cache() { List files = new ArrayList<>(); final GraalSettings settings = GraalSettings.obtain(); settings.getFileMap().stream(). - map((s) -> new File(s)). - filter((f) -> f.exists()). + map(s -> new File(s)). + filter(f -> f.exists()). forEach(files::add); try { final String repo = settings.get(String.class, GraalSettings.REPOSITORY); diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/FileContent.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/FileContent.java index be4afaae986d..f37f29dee923 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/FileContent.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/FileContent.java @@ -74,6 +74,7 @@ private synchronized void openDelegate() throws IOException { /** * Does nothing */ + @Override public boolean resetCache(long offset) { return false; } @@ -176,7 +177,6 @@ public boolean isOpen() { @Override public void close() throws IOException { - boolean c = closed; closed = true; if (!closed) { FileContent.this.subchannelClosed(); @@ -188,7 +188,7 @@ public void close() throws IOException { /** * Channel which provides contents from a series of buffers. */ - public final static class BufferListChannel implements ReadableByteChannel { + public static final class BufferListChannel implements ReadableByteChannel { private final Callable closeHandler; private Iterator buffers; private ByteBuffer current; diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/LazyGroup.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/LazyGroup.java index 8bc30fc4f1e9..a125d057120e 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/LazyGroup.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/LazyGroup.java @@ -149,7 +149,7 @@ public List getGraphs() { return l; } List fl = (List) getElementsInternal(); - l = Collections.unmodifiableList((List) fl.stream().filter((e) -> e instanceof InputGraph).collect( + l = Collections.unmodifiableList((List) fl.stream().filter(e -> e instanceof InputGraph).collect( Collectors.toList())); graphs = new WeakReference(l); return l; diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/LoadSupport.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/LoadSupport.java index d77451bd5f88..ad6ce8fb7421 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/LoadSupport.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/LoadSupport.java @@ -105,8 +105,6 @@ public T partialData() { return data; } - private Reference getContentsRef = new WeakReference<>(null); - /** * Returns the lazy-loaded contents, or partial contents. The first call to * getContents will block. Subsequent calls will yield partial results; clients diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/NetworkStreamContent.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/NetworkStreamContent.java index 50d0ca25ef0b..e6e1eda1f069 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/NetworkStreamContent.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/NetworkStreamContent.java @@ -29,6 +29,7 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; +import java.nio.file.Files; import java.nio.file.StandardOpenOption; import java.util.ArrayList; import java.util.Iterator; @@ -61,8 +62,7 @@ public class NetworkStreamContent implements ReadableByteChannel, CachedContent, private static final boolean KEEP_CACHES = Boolean.getBoolean(NetworkStreamContent.class.getName() + ".keepCaches"); // NOI18N private static final String CACHE_FILE_EXT = ".bgv"; // NOI18N - private static final String CACHE_FILE_TEMPLATE = "igvdata_%d"; // NOI18N - private static final String CACHE_DIRECTORY_NAME = "igv"; // NOI18N + private static final String CACHE_FILE_TEMPLATE = "igvdata_%d"; private final int receiveBufferSize = DEFAULT_RECEIVE_BUFFER_SIZE; private final List cacheBuffers = new ArrayList<>(); @@ -76,7 +76,6 @@ public class NetworkStreamContent implements ReadableByteChannel, CachedContent, File dumpFile; private long readBytes; - private static final AtomicInteger contentIdGenerator = new AtomicInteger(); private long receiveBufferOffset; /** @@ -129,9 +128,10 @@ public File getDumpFile() { } private File tempFile() throws IOException { - return File.createTempFile(String.format(CACHE_FILE_TEMPLATE, bufferId.incrementAndGet()), CACHE_FILE_EXT, cacheDir); + return Files.createTempFile(cacheDir.toPath(), String.format(CACHE_FILE_TEMPLATE, bufferId.incrementAndGet()), CACHE_FILE_EXT).toFile(); } + @Override public synchronized boolean resetCache(long offset) { if (KEEP_CACHES || firstBufferOffset > offset) { return false; @@ -376,7 +376,7 @@ private Iterator buffers(long start, long endPos) { if (fromBuffer == toBuffer) { endBuf = startBuf; } else { - endBuf = (fromBuffer == toBuffer) ? startBuf : cacheBuffers.get(toBuffer).asReadOnlyBuffer(); + endBuf = fromBuffer == toBuffer ? startBuf : cacheBuffers.get(toBuffer).asReadOnlyBuffer(); endBuf.flip(); } LOG.log(Level.FINEST, "end in buffer {0}, offset {1}", new Object[]{toBuffer, endAt}); diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ReaderErrors.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ReaderErrors.java index f4ab3e490b94..c80396d6202e 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ReaderErrors.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ReaderErrors.java @@ -38,7 +38,6 @@ * @author sdedic */ public final class ReaderErrors { - private static final ReaderErrors INSTANCE = new ReaderErrors(); /** * For each element, holds list of errors. For group, also references @@ -88,7 +87,7 @@ static void addError(Object el, Folder folder, String error) { static void addError(FolderElement el, Folder folder, String error) { synchronized (errorList) { - ElementData data = errorList.computeIfAbsent(el, (e) -> { + ElementData data = errorList.computeIfAbsent(el, e -> { ElementData ne = new ElementData(e, folder); if (e instanceof InputGraph) { Folder f = el.getParent(); @@ -97,7 +96,7 @@ static void addError(FolderElement el, Folder folder, String error) { } if (f != null) { FolderElement fe = f; - ElementData fed = errorList.computeIfAbsent(fe, (e2) -> new ElementData(fe, null)); + ElementData fed = errorList.computeIfAbsent(fe, e2 -> new ElementData(fe, null)); fed.addGraphError(ne); } } diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ScanningModelBuilder.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ScanningModelBuilder.java index 91554e7f0716..4685865bce91 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ScanningModelBuilder.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ScanningModelBuilder.java @@ -230,9 +230,6 @@ protected StreamPool pool() { return (StreamPool) getConstantPool(); } - private void documentUpdatedExternally() { - } - @Override protected void registerToParent(Folder parent, FolderElement element) { if (!(parent instanceof GraphDocument)) { diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/SingleGroupBuilder.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/SingleGroupBuilder.java index 364abdbf27ac..a7eb4cf63527 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/SingleGroupBuilder.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/SingleGroupBuilder.java @@ -273,7 +273,7 @@ public void startGraphContents(InputGraph g) { return; } super.startGraphContents(g); - nodeProperties = lastTypeProperties.computeIfAbsent(g.getGraphType(), (gt) -> new HashMap<>()); + nodeProperties = lastTypeProperties.computeIfAbsent(g.getGraphType(), gt -> new HashMap<>()); } @Override diff --git a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ZipFileContent.java b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ZipFileContent.java index 7d29bc8cb8ac..b37aacdbb1e0 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ZipFileContent.java +++ b/visualizer/IdealGraphVisualizer/Data/src/main/java/org/graalvm/visualizer/data/serialization/lazy/ZipFileContent.java @@ -356,7 +356,7 @@ public SeekableByteChannel truncate(long size) throws IOException { * Must reference original Path just as weak reference, since ZipPaths reference * ZipFilesystem. */ - final static class ExpandedFile { + static final class ExpandedFile { private final Path expandedPath; private final Path zipPath; private final long cacheMax; @@ -384,7 +384,7 @@ public String toString() { /** * Wrapper channel which limits size of data to the one zip file. */ - final static class LimitedChannel implements SeekableByteChannel { + static final class LimitedChannel implements SeekableByteChannel { private final ReadableByteChannel delegate; private final long limit; private long count; diff --git a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/BinaryReaderTest.java b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/BinaryReaderTest.java index d9470c42fbc0..6873d37aeb18 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/BinaryReaderTest.java +++ b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/BinaryReaderTest.java @@ -105,6 +105,7 @@ public void startGraphContents(InputGraph g) { private boolean countGroups; + @Override protected Builder createScanningTestBuilder() { if (!countGroups) { return super.createScanningTestBuilder(); diff --git a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/DelayedLoadTest.java b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/DelayedLoadTest.java index 41d830db10a8..fe6b46c291fd 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/DelayedLoadTest.java +++ b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/DelayedLoadTest.java @@ -156,6 +156,7 @@ public W(LazyGroup lg, Semaphore inc) { this.inc = inc; } + @Override public void run() { running.release(); List x = lg.getElements(); @@ -282,7 +283,7 @@ public void changed(GraphDocument source) { } }); - mb.groupConsumer = (g) -> { + mb.groupConsumer = g -> { try { // this group SHOULD be already reported AND present, but must wait // until all events arrive @@ -334,7 +335,7 @@ public void testPartialGraphSeriesLoad() throws Exception { }; AtomicInteger itemCount = new AtomicInteger(0); Semaphore sem = new Semaphore(0); - parent.getChangedEvent().addListener((g) -> { + parent.getChangedEvent().addListener(g -> { // should get some change events itemCount.set(g.getElements().size()); sem.release(); @@ -432,7 +433,7 @@ public void testPartialLazyGraphSeriesLoad() throws Exception { AtomicInteger itemCount = new AtomicInteger(0); Semaphore sem = new Semaphore(0); - parent.getChangedEvent().addListener((g) -> { + parent.getChangedEvent().addListener(g -> { // should get some change events itemCount.set(g.getElements().size()); sem.release(); @@ -557,7 +558,7 @@ public void testTailLoadFinishesAtEntryEnd() throws Exception { return freezeChannel; }; Semaphore start = new Semaphore(0); - checkDocument.getChangedEvent().addListener((e) -> start.release()); + checkDocument.getChangedEvent().addListener(e -> start.release()); SingleGroupBuilder.setLargeEntryThreshold(300); Task t = PARALLEL_LOAD.post(() -> { diff --git a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/LazyGroupTest.java b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/LazyGroupTest.java index d3b0b5dfe0d0..563fedd2813f 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/LazyGroupTest.java +++ b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/LazyGroupTest.java @@ -154,8 +154,6 @@ public void testPartialContent() throws Exception { assertEquals(lazyParent.getElements(), lazyParent.partialData()); } - private volatile int changed; - public void testPartialContentUpdates() throws Exception { loadGroupStart(); assertNotNull(lazyParent); diff --git a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/NetworkStreamContentTest.java b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/NetworkStreamContentTest.java index 87a98f72f49c..7da94c0fdeab 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/NetworkStreamContentTest.java +++ b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/NetworkStreamContentTest.java @@ -29,6 +29,7 @@ import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; +import java.nio.file.Files; import java.util.concurrent.Semaphore; import org.netbeans.junit.NbTestCase; @@ -88,7 +89,7 @@ private void testFullReadFromTo(long start, long to) throws IOException { } private void initContent() throws IOException { - File name = File.createTempFile("igvtest_", ""); + File name = Files.createTempFile("igvtest_", "").toFile(); name.delete(); name.mkdirs(); content = new NetworkStreamContent(dataChannel, name); diff --git a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/ScanningBuilderTest.java b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/ScanningBuilderTest.java index 195344878157..4b52c7310eed 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/ScanningBuilderTest.java +++ b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/ScanningBuilderTest.java @@ -26,6 +26,7 @@ import java.io.File; import java.io.IOException; import java.nio.channels.ReadableByteChannel; +import java.nio.file.Files; import java.util.*; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.Semaphore; @@ -90,6 +91,7 @@ public void startRoot() { } } + @Override protected Builder createScanningTestBuilder() { switch (builderType) { case 1: @@ -164,6 +166,7 @@ public VerifyValuePool(int generation, List data) { super(generation, data); } + @Override protected VerifyValuePool create(List data) { return new VerifyValuePool(generation + 1, data); } @@ -245,7 +248,7 @@ public void testBadConstantPool() throws Exception { ReadableByteChannel dataChannel; private void initContent() throws IOException { - File name = File.createTempFile("igvtest_", ""); + File name = Files.createTempFile("igvtest_", "").toFile(); name.delete(); name.mkdirs(); content = new NetworkStreamContent(dataChannel, name); diff --git a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/SingleGroupBuilderTest.java b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/SingleGroupBuilderTest.java index d05f34738574..f981dd8f01d7 100644 --- a/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/SingleGroupBuilderTest.java +++ b/visualizer/IdealGraphVisualizer/Data/src/test/java/org/graalvm/visualizer/data/serialization/lazy/SingleGroupBuilderTest.java @@ -129,25 +129,22 @@ public void testGraphAndGroupCounts() throws Exception { Deque toProcess = new ArrayDeque(); toProcess.addAll((Collection) checkDocument.getElements()); - int processed = 0; while (!toProcess.isEmpty()) { Collection els; - - processed++; Group g = toProcess.poll(); if (g instanceof Group.LazyContent) { els = ((Group.LazyContent>) g).completeContents(null).get(); } else { els = g.getElements(); } - Collection foundGraphs = els.stream().filter((e) -> e instanceof InputGraph).collect(Collectors.toList()); + Collection foundGraphs = els.stream().filter(e -> e instanceof InputGraph).collect(Collectors.toList()); int graphCount = g.getGraphsCount(); Collection graphs = g.getGraphs(); assertEquals(foundGraphs.size(), graphCount); assertEquals(foundGraphs, graphs); - toProcess.addAll((List) els.stream().filter((e) -> !(e instanceof InputGraph)).collect(Collectors.toList())); + toProcess.addAll((List) els.stream().filter(e -> !(e instanceof InputGraph)).collect(Collectors.toList())); } } diff --git a/visualizer/IdealGraphVisualizer/Difference/pom.xml b/visualizer/IdealGraphVisualizer/Difference/pom.xml index 4f1a24ebf11f..9c1b26dff5e1 100644 --- a/visualizer/IdealGraphVisualizer/Difference/pom.xml +++ b/visualizer/IdealGraphVisualizer/Difference/pom.xml @@ -7,6 +7,26 @@ Difference nbm + + UTF-8 + + + + ${project.groupId} + Data + ${project.version} + + + org.netbeans.api + org-netbeans-api-annotations-common + ${netbeans.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + @@ -30,24 +50,4 @@ - - - ${project.groupId} - Data - ${project.version} - - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - org.netbeans.api - org-openide-util - ${netbeans.version} - - - - UTF-8 - diff --git a/visualizer/IdealGraphVisualizer/Filter/pom.xml b/visualizer/IdealGraphVisualizer/Filter/pom.xml index c73b69511f59..fc0efe91235f 100644 --- a/visualizer/IdealGraphVisualizer/Filter/pom.xml +++ b/visualizer/IdealGraphVisualizer/Filter/pom.xml @@ -7,30 +7,9 @@ Filter nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.filter - org.graalvm.visualizer.filter.spi - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -89,7 +68,28 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.filter + org.graalvm.visualizer.filter.spi + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/AbstractFilter.java b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/AbstractFilter.java index daa13ea652b4..846b7e882fb0 100644 --- a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/AbstractFilter.java +++ b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/AbstractFilter.java @@ -69,6 +69,7 @@ protected void checkCancelled() { } } + @Override public Lookup getLookup() { return lkp; } diff --git a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/CustomFilter.java b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/CustomFilter.java index f6b5edc0d9f6..ff870adc9a24 100644 --- a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/CustomFilter.java +++ b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/CustomFilter.java @@ -162,11 +162,6 @@ private String loadDefaultScripts() throws ScriptException { return sb.toString(); } - private static final List parameters = Arrays.asList( - PARAM_IO, // NOI18N - PARAM_GRAPH // NOI18N - ); - private static class H extends WeakReference { final PreparedScript prep; diff --git a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/EditFilterDialog.java b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/EditFilterDialog.java index bff96bbd72c9..17b0e3e02ced 100644 --- a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/EditFilterDialog.java +++ b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/EditFilterDialog.java @@ -73,6 +73,7 @@ private void initComponents() { okButton.setText(org.openide.util.NbBundle.getMessage(EditFilterDialog.class, "jButton1.text")); // NOI18N okButton.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { cancelButtonClicked(evt); okButtonClicked(evt); @@ -81,6 +82,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { cancelButton.setText(org.openide.util.NbBundle.getMessage(EditFilterDialog.class, "jButton2.text")); // NOI18N cancelButton.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { cancelButtonClicked(evt); } diff --git a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/Filter.java b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/Filter.java index e3d3eedf1329..b6756299870c 100644 --- a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/Filter.java +++ b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/Filter.java @@ -59,7 +59,7 @@ public interface Filter extends Properties.Provider, ChangedEventProvider getChangedEvent() { return changedEvent; } + @Override public void addFilterListener(FilterListener l) { synchronized (listeners) { this.listeners.add(l); } } + @Override public void removeFilterListener(FilterListener l) { synchronized (listeners) { this.listeners.remove(l); @@ -207,6 +209,7 @@ public void moveFilterDown(Filter filter) { changedEvent.fire(); } + @Override public synchronized List getFilters() { return Collections.unmodifiableList(new ArrayList<>(filters)); } diff --git a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterEnvironment.java b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterEnvironment.java index ca078bfa2cc2..ba7863920fb0 100644 --- a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterEnvironment.java +++ b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterEnvironment.java @@ -71,5 +71,6 @@ public Map globals() { return globals; } + @Override public abstract void close() throws IOException; } diff --git a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterExecution.java b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterExecution.java index 3b22ab4bab9b..efbf03689162 100644 --- a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterExecution.java +++ b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterExecution.java @@ -76,11 +76,6 @@ public class FilterExecution { // @GuardedBy(this) private volatile int state; - /** - * Initialization, did not run yet - */ - private static final int INIT = 0; - /** * Running */ @@ -320,7 +315,6 @@ public static FilterExecutionService getExecutionService() { @SuppressFBWarnings(value = "UCF_USELESS_CONTROL_FLOW_NEXT_LINE", justification = "Throws exception when asserts are enabled") void applyFilter(Filter f, FilterChain chain) { final FilterEnvironment env = getEnvironment(); - final FilterExecution exec = this; final Diagram d = getDiagram(); // serviceImpl.runWith(chain, this, () -> { diff --git a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterListener.java b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterListener.java index 84be11928906..efbd73237c8f 100644 --- a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterListener.java +++ b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/FilterListener.java @@ -51,7 +51,7 @@ public default void filterEnd(FilterEvent e) { * * @param e event */ - default public void executionStart(FilterEvent e) { + public default void executionStart(FilterEvent e) { } /** @@ -59,6 +59,6 @@ default public void executionStart(FilterEvent e) { * * @param e */ - default public void executionEnd(FilterEvent e) { + public default void executionEnd(FilterEvent e) { } } diff --git a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/Filters.java b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/Filters.java index dabb25aedbec..7e5dd6839314 100644 --- a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/Filters.java +++ b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/Filters.java @@ -61,8 +61,8 @@ public static FilterExecution applyWithCancel(FilterChain chain, Diagram d, Filt public static FilterProvider locateChainSource(Lookup lkp) { return Lookup.getDefault().lookupAll(GraphFilterLocator.class) .stream().sequential() - .map((gfl) -> gfl.findChain(lkp)) - .filter((i) -> i != null).findFirst().orElse(null); + .map(gfl -> gfl.findChain(lkp)) + .filter(i -> i != null).findFirst().orElse(null); } public static T lookupFilter(Filter f, Class clazz) { diff --git a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/impl/FilterExecutionServiceImpl.java b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/impl/FilterExecutionServiceImpl.java index 42e1fcc11036..0518f0d53dee 100644 --- a/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/impl/FilterExecutionServiceImpl.java +++ b/visualizer/IdealGraphVisualizer/Filter/src/main/java/org/graalvm/visualizer/filter/impl/FilterExecutionServiceImpl.java @@ -38,13 +38,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Logger; /** * @author sdedic */ public class FilterExecutionServiceImpl implements FilterExecutionService { - private static final Logger LOG = Logger.getLogger(FilterExecutionServiceImpl.class.getName()); private final List listeners = new ArrayList<>(); private static FilterExecutionServiceImpl INSTANCE = new FilterExecutionServiceImpl(); diff --git a/visualizer/IdealGraphVisualizer/FilterProfiles/pom.xml b/visualizer/IdealGraphVisualizer/FilterProfiles/pom.xml index f9793833da5e..8c5a2f12c75d 100644 --- a/visualizer/IdealGraphVisualizer/FilterProfiles/pom.xml +++ b/visualizer/IdealGraphVisualizer/FilterProfiles/pom.xml @@ -7,31 +7,9 @@ FilterProfiles nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.filter.profiles - org.graalvm.visualizer.filter.profiles.mgmt - org.graalvm.visualizer.filter.profiles.spi - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -272,7 +250,29 @@ 15.4 - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.filter.profiles + org.graalvm.visualizer.filter.profiles.mgmt + org.graalvm.visualizer.filter.profiles.spi + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/Profiles.java b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/Profiles.java index 230ed5e93fdc..84ab794b4589 100644 --- a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/Profiles.java +++ b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/Profiles.java @@ -94,7 +94,7 @@ public int compare(FilterProfile o1, FilterProfile o2) { */ public static List allProfiles() { return Lookup.getDefault().lookupAll(FilterRegistry.class).stream(). - flatMap((r) -> r.getProfiles().stream()).collect(Collectors.toList()); + flatMap(r -> r.getProfiles().stream()).collect(Collectors.toList()); } /** diff --git a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/BuiltinGraphMatcher.java b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/BuiltinGraphMatcher.java index c9514357c9f0..ccaf67d4582d 100644 --- a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/BuiltinGraphMatcher.java +++ b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/BuiltinGraphMatcher.java @@ -622,7 +622,7 @@ private interface C { private static void filterRegexpProperties(java.util.Properties props, String prefix, C callback) { Set processed = new HashSet<>(); - props.stringPropertyNames().stream().filter((s) -> s.startsWith(prefix)).forEach(s -> { + props.stringPropertyNames().stream().filter(s -> s.startsWith(prefix)).forEach(s -> { String rest = s.substring(prefix.length()); processed.add(s); int i = rest.indexOf(','); diff --git a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterBridge.java b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterBridge.java index d569054bb7e0..57b97be9cb2a 100644 --- a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterBridge.java +++ b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterBridge.java @@ -135,6 +135,7 @@ private Filter delegate() { return changeDelegate(Filter.NONE); } + @Override public int hashCode() { if (hashCode == -1) { return delegate().hashCode(); @@ -236,6 +237,7 @@ public void changed(Object source) { } } + @Override public String toString() { return "FB[" + file.getPath() + ", impl = " + lastDelegate + "]"; } diff --git a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileSelector.java b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileSelector.java index 439522ee45b6..104a76b2a818 100644 --- a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileSelector.java +++ b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileSelector.java @@ -213,6 +213,7 @@ public Key(Group g, String type, TopComponent tc) { public void run() { } + @Override public boolean equals(Object o) { if (!(o instanceof Key)) { return false; diff --git a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileServiceImpl.java b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileServiceImpl.java index 3ffdfaa4b90b..291fde0e2dc0 100644 --- a/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileServiceImpl.java +++ b/visualizer/IdealGraphVisualizer/FilterProfiles/src/main/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileServiceImpl.java @@ -358,6 +358,7 @@ public FileObject getDefaultProfileFolder() { return defaultProfileFolder; } + @Override public FileObject getProfilesRoot() { return profilesRoot; } diff --git a/visualizer/IdealGraphVisualizer/FilterProfiles/src/test/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileServiceImplTest.java b/visualizer/IdealGraphVisualizer/FilterProfiles/src/test/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileServiceImplTest.java index 4aa2afc591ec..4723b067a208 100644 --- a/visualizer/IdealGraphVisualizer/FilterProfiles/src/test/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileServiceImplTest.java +++ b/visualizer/IdealGraphVisualizer/FilterProfiles/src/test/java/org/graalvm/visualizer/filter/profiles/impl/FilterProfileServiceImplTest.java @@ -271,11 +271,11 @@ public void testFindDefaultFilter() throws Exception { } private Filter findFilter(List filters, String name) { - return filters.stream().filter((f) -> f.getName().equals(name)).findFirst().orElse(null); + return filters.stream().filter(f -> f.getName().equals(name)).findFirst().orElse(null); } private FilterProfile findProfile(List profiles, String name) { - return profiles.stream().filter((f) -> f.getName().equals(name)).findFirst().orElse(null); + return profiles.stream().filter(f -> f.getName().equals(name)).findFirst().orElse(null); } @Ignore diff --git a/visualizer/IdealGraphVisualizer/FilterWindow/pom.xml b/visualizer/IdealGraphVisualizer/FilterWindow/pom.xml index ba9fd2815d0c..876e5d2f38bb 100644 --- a/visualizer/IdealGraphVisualizer/FilterWindow/pom.xml +++ b/visualizer/IdealGraphVisualizer/FilterWindow/pom.xml @@ -7,30 +7,9 @@ FilterWindow nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.filterwindow - org.graalvm.visualizer.filterwindow.actions - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -128,7 +107,28 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.filterwindow + org.graalvm.visualizer.filterwindow.actions + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/CheckRenderer.java b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/CheckRenderer.java index 65344dcc17bc..5337270f1279 100644 --- a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/CheckRenderer.java +++ b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/CheckRenderer.java @@ -95,7 +95,7 @@ public void doLayout() { Dimension pDim = toPaint.getPreferredSize(); Insets ins = getInsets(); - size.height -= (ins.top + ins.bottom); + size.height -= ins.top + ins.bottom; int x = ins.left; int y = cDim.height >= size.height ? ins.top : ins.top + ((size.height - cDim.height) / 2); @@ -131,6 +131,7 @@ public void paintComponent(Graphics g) { g.translate(-x, -yLabel); } + @Override public Dimension getPreferredSize() { Dimension cSize = check.getPreferredSize(); Dimension pSize = toPaint == null ? new Dimension(0, 0) : toPaint.getPreferredSize(); diff --git a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/FilterTopComponent.java b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/FilterTopComponent.java index ea3aebad832f..473f1b01372d 100644 --- a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/FilterTopComponent.java +++ b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/FilterTopComponent.java @@ -464,7 +464,7 @@ private Node findProfileNode(FilterProfile p) { return nodes[0]; } - final static class ResolvableHelper implements Serializable { + static final class ResolvableHelper implements Serializable { private static final long serialVersionUID = 1L; diff --git a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/actions/EditProfilePanel.java b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/actions/EditProfilePanel.java index b7e3977892aa..e78545556398 100644 --- a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/actions/EditProfilePanel.java +++ b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/actions/EditProfilePanel.java @@ -63,14 +63,17 @@ public class EditProfilePanel extends javax.swing.JPanel implements ExplorerMana private RequestProcessor.Task delayedInputValidation; private final DocumentListener dl = new DocumentListener() { + @Override public void insertUpdate(DocumentEvent e) { inputChanged(); } + @Override public void removeUpdate(DocumentEvent e) { inputChanged(); } + @Override public void changedUpdate(DocumentEvent e) { } }; @@ -253,6 +256,7 @@ private void initComponents() { priorityNumber.setFont(new java.awt.Font("Dialog", 0, 12)); // NOI18N priorityNumber.setModel(new javax.swing.SpinnerNumberModel(1, 0, null, 1)); priorityNumber.addFocusListener(new java.awt.event.FocusAdapter() { + @Override public void focusLost(java.awt.event.FocusEvent evt) { priorityNumberFocusLost(evt); } @@ -262,6 +266,7 @@ public void focusLost(java.awt.event.FocusEvent evt) { nameText.setText(org.openide.util.NbBundle.getMessage(EditProfilePanel.class, "EditProfilePanel.nameText.text")); // NOI18N nameText.addFocusListener(new java.awt.event.FocusAdapter() { + @Override public void focusLost(java.awt.event.FocusEvent evt) { nameTextFocusLost(evt); } @@ -271,6 +276,7 @@ public void focusLost(java.awt.event.FocusEvent evt) { groupNameText.setText(org.openide.util.NbBundle.getMessage(EditProfilePanel.class, "EditProfilePanel.groupNameText.text")); // NOI18N groupNameText.addFocusListener(new java.awt.event.FocusAdapter() { + @Override public void focusLost(java.awt.event.FocusEvent evt) { groupNameTextFocusLost(evt); } diff --git a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/actions/ManageProfileAction.java b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/actions/ManageProfileAction.java index e7bbceea9a1b..5bb96519775c 100644 --- a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/actions/ManageProfileAction.java +++ b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/actions/ManageProfileAction.java @@ -38,7 +38,6 @@ import org.openide.awt.ActionReferences; import org.openide.awt.ActionRegistration; import org.openide.awt.ActionState; -import org.openide.awt.Actions; import org.openide.awt.Mnemonics; import org.openide.util.ContextAwareAction; import org.openide.util.ImageUtilities; @@ -166,14 +165,6 @@ private void populateMenu(JPopupMenu menu) { ActionUtils.populatePopupMenu(menu, null, "IGV/ContextActions/ManageProfiles", context); } - private Action action(String id) { - Action a = Actions.forID(RemoveFilterAction.CATEGORY, id); - if (a instanceof ContextAwareAction) { - a = ((ContextAwareAction) a).createContextAwareInstance(context); - } - return a; - } - @Override public Action createContextAwareInstance(Lookup lkp) { return new ManageProfileAction(null, lkp); diff --git a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/impl/FilterNode.java b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/impl/FilterNode.java index 79de466e2f82..dcdc5d9e3673 100644 --- a/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/impl/FilterNode.java +++ b/visualizer/IdealGraphVisualizer/FilterWindow/src/main/java/org/graalvm/visualizer/filterwindow/impl/FilterNode.java @@ -73,7 +73,6 @@ "TOOLTIP_FilterClickEdit=Double click to open filter contents" }) public final class FilterNode extends CheckNode implements FilterListener { - private static final String ACTIONS = "IGV/Actions/Filter"; // NOI18N private static final String ICON_NORMAL = "org/graalvm/visualizer/filterwindow/images/filterIcon.png"; // NOI18N private static final String ICON_ERROR = "org/graalvm/visualizer/filterwindow/images/filterIconError.png"; // NOI18N @@ -219,7 +218,7 @@ public void filterEnd(FilterEvent e) { return; } Collection filters = f.getLookup().lookupAll(Filter.class); - if (!filters.stream().anyMatch((t) -> t == this.filter)) { + if (!filters.stream().anyMatch(t -> t == this.filter)) { return; } } diff --git a/visualizer/IdealGraphVisualizer/Graal/pom.xml b/visualizer/IdealGraphVisualizer/Graal/pom.xml index 73a7c121f089..ef5dba2a82c0 100644 --- a/visualizer/IdealGraphVisualizer/Graal/pom.xml +++ b/visualizer/IdealGraphVisualizer/Graal/pom.xml @@ -7,29 +7,9 @@ Graal nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.graal.filters - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -210,7 +190,27 @@ test - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.graal.filters + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/Graph/pom.xml b/visualizer/IdealGraphVisualizer/Graph/pom.xml index 01b7e1365220..67e232c8dfcf 100644 --- a/visualizer/IdealGraphVisualizer/Graph/pom.xml +++ b/visualizer/IdealGraphVisualizer/Graph/pom.xml @@ -7,39 +7,9 @@ Graph nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.graph - org.graalvm.visualizer.graph.services - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - Jar Tests Package - package - - test-jar - - - - - - + + UTF-8 + ${project.groupId} @@ -91,7 +61,37 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.graph + org.graalvm.visualizer.graph.services + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + Jar Tests Package + package + + test-jar + + + + + + diff --git a/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Connection.java b/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Connection.java index 06707dc83664..7bfcea1ca773 100644 --- a/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Connection.java +++ b/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Connection.java @@ -96,10 +96,10 @@ public boolean equals(Object other) { return true; } Connection c = (Connection) other; - return ((inputSlot.getFigure().getId() == c.getInputSlot().getFigure().getId()) + return (inputSlot.getFigure().getId() == c.getInputSlot().getFigure().getId()) && (outputSlot.getFigure().getId() == c.getOutputSlot().getFigure().getId()) && (outputSlot.getPosition() == c.getOutputSlot().getPosition()) - && (inputSlot.getPosition() == c.getInputSlot().getPosition())); + && (inputSlot.getPosition() == c.getInputSlot().getPosition()); } public InputSlot getInputSlot() { diff --git a/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Diagram.java b/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Diagram.java index 238f619c268a..1b12d75be169 100644 --- a/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Diagram.java +++ b/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Diagram.java @@ -321,7 +321,7 @@ public static Diagram createDiagram(InputGraph graph, String nodeText) { public void removeAllFigures(Collection
figuresToRemove) { if (figuresToRemove instanceof Set) { - removeAllFigures(((Set) figuresToRemove)); + removeAllFigures((Set) figuresToRemove); } Set s = new HashSet<>(figuresToRemove); removeAllFigures(s); @@ -512,7 +512,7 @@ private Map> ensureSlotMap() { Stream.of(f), f.getSlots().stream())).forEach(s -> { for (InputNode in : s.getSource().getSourceNodes()) { - m.computeIfAbsent(in.getId(), (id) -> new ArrayList<>(2)).add(s); + m.computeIfAbsent(in.getId(), id -> new ArrayList<>(2)).add(s); } }); return sourceMap = m; diff --git a/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Figure.java b/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Figure.java index e621c39350c2..82318c8f8988 100644 --- a/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Figure.java +++ b/visualizer/IdealGraphVisualizer/Graph/src/main/java/org/graalvm/visualizer/graph/Figure.java @@ -431,10 +431,6 @@ public static final String resolveString(String string, Properties properties) { return sb.toString(); } - private int outputSlotCount() { - return outputSlots == null ? (singleOutput != null ? 1 : 0) : outputSlots.size(); - } - @Override public Dimension getSize() { return new Dimension(getWidth(), getHeight()); diff --git a/visualizer/IdealGraphVisualizer/Graph/src/test/java/org/graalvm/visualizer/graph/GraphTestUtil.java b/visualizer/IdealGraphVisualizer/Graph/src/test/java/org/graalvm/visualizer/graph/GraphTestUtil.java index bafe5268a816..780e3f3ddde5 100644 --- a/visualizer/IdealGraphVisualizer/Graph/src/test/java/org/graalvm/visualizer/graph/GraphTestUtil.java +++ b/visualizer/IdealGraphVisualizer/Graph/src/test/java/org/graalvm/visualizer/graph/GraphTestUtil.java @@ -247,7 +247,7 @@ public static void assertSlotEqualsShallow(Slot a, Slot b) { public static void assertSlotEquals(Slot a, Slot b) { if (checkNotNulls(a, b)) { assertSlotEqualsShallow(a, b); - assertCollections_NoOrder(a.getConnections(), b.getConnections(), GraphTestUtil::assertConnectionEqualsShallow, (c) -> c.getInputSlot().toString() + ">;<" + c.getOutputSlot().toString()); + assertCollections_NoOrder(a.getConnections(), b.getConnections(), GraphTestUtil::assertConnectionEqualsShallow, c -> c.getInputSlot().toString() + ">;<" + c.getOutputSlot().toString()); assertFigureEqualsShallow(a.getFigure(), b.getFigure()); } } @@ -255,7 +255,7 @@ public static void assertSlotEquals(Slot a, Slot b) { public static void assertSlotEqualsDeep(Slot a, Slot b) { if (checkNotNulls(a, b)) { assertSlotEqualsShallow(a, b); - assertCollections_NoOrder(a.getConnections(), b.getConnections(), GraphTestUtil::assertConnectionEquals, (c) -> c.getInputSlot().toString() + ">;<" + c.getOutputSlot().toString()); + assertCollections_NoOrder(a.getConnections(), b.getConnections(), GraphTestUtil::assertConnectionEquals, c -> c.getInputSlot().toString() + ">;<" + c.getOutputSlot().toString()); assertFigureEquals(a.getFigure(), b.getFigure()); } } diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/pom.xml b/visualizer/IdealGraphVisualizer/GraphSearch/pom.xml index 73e3a995eeb3..e0a48d51cc7e 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/pom.xml +++ b/visualizer/IdealGraphVisualizer/GraphSearch/pom.xml @@ -7,29 +7,9 @@ GraphSearch nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.search.* - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -119,7 +99,27 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.search.* + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/GraphItem.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/GraphItem.java index 2274f7d3c4a5..adec11ee23c0 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/GraphItem.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/GraphItem.java @@ -83,6 +83,7 @@ public String getType() { return type; } + @Override public String getDisplayName() { return displayName; } diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/GraphSearchEngine.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/GraphSearchEngine.java index 1a96f36fa8f2..00efdb4e8f92 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/GraphSearchEngine.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/GraphSearchEngine.java @@ -89,10 +89,12 @@ public SearchResultsModel getResults() { return model; } + @Override public GraphContainer getGraphContainer() { return graphList; } + @Override public Set getSearchedGraphs() { Set result = new HashSet<>(); synchronized (this) { @@ -398,6 +400,7 @@ private void processGraph(InputGraph g) { } } + @Override public InputGraph getInitialGraph() { return initialGraph; } diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/SearchEvent.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/SearchEvent.java index 13375ad42c24..6499331bec20 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/SearchEvent.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/SearchEvent.java @@ -77,6 +77,7 @@ public SearchEvent(SearchController source, SearchTask searchTask, SearchResults this.completed = completed; } + @Override public SearchController getSource() { return (SearchController) super.getSource(); } diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/SearchResultsModel.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/SearchResultsModel.java index ac4f53fb1d85..d95d4c55d77b 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/SearchResultsModel.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/SearchResultsModel.java @@ -55,7 +55,7 @@ public void removeSearchResultsListener(SearchResultsListener l) { } public void addParentListener(GraphItem item, SearchResultsListener l) { - graphListeners.computeIfAbsent(item, (i) -> new ArrayList<>()).add(l); + graphListeners.computeIfAbsent(item, i -> new ArrayList<>()).add(l); } public void removeParentListener(GraphItem item, SearchResultsListener l) { @@ -293,6 +293,7 @@ public Collection getParents() { return new ArrayList<>(owners.keySet()); } + @Override public String toString() { return "GraphSearch[nodes = " + items.size() + " graphs = " + owners.keySet().size() + "]"; } diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/AbstractSearchResultsPanelBase.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/AbstractSearchResultsPanelBase.java index a332d5a88a71..c6137d1d058b 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/AbstractSearchResultsPanelBase.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/AbstractSearchResultsPanelBase.java @@ -382,7 +382,7 @@ private Node findShiftNode(int direction, OutlineView outlineView, boolean canExpand) { Node[] selected = getExplorerManager().getSelectedNodes(); Node n = null; - if ((selected == null || selected.length == 0) + if (selected == null || selected.length == 0 /* TODO && getExplorerManager().getRootContext() == resultsOutlineSupport.getRootNode() */) { n = getExplorerManager().getRootContext(); } else if (selected.length == 1) { diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/ResultView.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/ResultView.java index 89d89f31d61b..f26f93534635 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/ResultView.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/ResultView.java @@ -163,7 +163,7 @@ public void stateChanged(ChangeEvent e) { } @Deprecated - final public static class ResolvableHelper implements java.io.Serializable { + public static final class ResolvableHelper implements java.io.Serializable { static final long serialVersionUID = 7398708142639457544L; public Object readResolve() { @@ -238,17 +238,6 @@ private SearchResultsEntry getCurrentResultEntry() { return panel2SearchEntry(comp); } - - private void updateTabTitle(JPanel panel) { - if (getComponentCount() != 0) { - if (tabs.getTabCount() > 0) { - int index = tabs.indexOfComponent(panel); - tabs.setTitleAt(index, panel.getName()); - tabs.setToolTipTextAt(index, panel.getToolTipText()); - } - } - } - private SearchResultsEntry panel2SearchEntry(Component comp) { if (!(comp instanceof JComponent)) { return null; diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/ResultViewPanel.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/ResultViewPanel.java index 10794197e16e..c6d737e3eaae 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/ResultViewPanel.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/ResultViewPanel.java @@ -247,13 +247,10 @@ private void updateTableColumns() { private void seInitialColumnSizes(Collection columnIds) { ETableColumnModel colModel = (ETableColumnModel) outlineView.getOutline().getColumnModel(); - - float totalWidth = 0; for (int i = 0; i < colModel.getColumnCount(); i++) { ETableColumn ecol = (ETableColumn) colModel.getColumn(i); String id = ecol.getIdentifier().toString(); if (!columnIds.contains(id)) { - totalWidth += ecol.getPreferredWidth(); } } diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/RootSwitchNode.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/RootSwitchNode.java index 49c864df2881..ac325097185b 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/RootSwitchNode.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/RootSwitchNode.java @@ -144,6 +144,7 @@ public SynchronizeViewAndSelection(List selectedGraphNodes, Grap this.scrollToView = scrollToView; } + @Override public void run() { expandAndSelect(); } diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/SearchResultOptions.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/SearchResultOptions.java index 1f6e286ff59b..343b835453ce 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/SearchResultOptions.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/main/java/org/graalvm/visualizer/search/ui/SearchResultOptions.java @@ -44,7 +44,7 @@ public void setOpenInCurrentDiagram(boolean openInCurrentDiagram) { propertyChangeSupport.firePropertyChange(PROP_OPEN_IN_CURRENT_DIAGRAM, oldOpenInCurrentDiagram, openInCurrentDiagram); } - private transient final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this); + private final transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this); public void addPropertyChangeListener(PropertyChangeListener listener) { propertyChangeSupport.addPropertyChangeListener(listener); diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/SearchResultsModelTest.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/SearchResultsModelTest.java index 6b90683ff19d..2c545157174e 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/SearchResultsModelTest.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/SearchResultsModelTest.java @@ -318,8 +318,6 @@ public void testRemoveAllItemsParent() throws Exception { private SearchResultsEvent addEvent; private SearchResultsEvent removeEvent; - private SearchResultsEvent parentsEvent; - private SearchResultsEvent propertiesEvent; private final List changedParents = new ArrayList<>(); private final List parents = new ArrayList<>(); diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/quicksearch/MockViewerLocator.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/quicksearch/MockViewerLocator.java index 263606bd5e0b..a26a70a7c9f2 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/quicksearch/MockViewerLocator.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/quicksearch/MockViewerLocator.java @@ -72,7 +72,7 @@ public List getViewers() { @Override public List find(Group g) { - return viewers.stream().filter((v) -> v.getModel().getContainer() == g).collect(Collectors.toList()); + return viewers.stream().filter(v -> v.getModel().getContainer() == g).collect(Collectors.toList()); } @Override @@ -93,8 +93,9 @@ public void addChangeListener(ChangeListener l) { public void removeChangeListener(ChangeListener l) { } + @Override public List find(InputGraph graph) { - return viewers.stream().filter((v) -> v.getModel().getGraphToView() == graph).collect(Collectors.toList()); + return viewers.stream().filter(v -> v.getModel().getGraphToView() == graph).collect(Collectors.toList()); } @Override diff --git a/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/quicksearch/NodeQuickSearchTest.java b/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/quicksearch/NodeQuickSearchTest.java index 00b3bd9dfdb7..6314cc570b92 100644 --- a/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/quicksearch/NodeQuickSearchTest.java +++ b/visualizer/IdealGraphVisualizer/GraphSearch/src/test/java/org/graalvm/visualizer/search/quicksearch/NodeQuickSearchTest.java @@ -29,7 +29,6 @@ import java.lang.reflect.Constructor; import java.util.List; import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; import org.graalvm.visualizer.filter.FilterChain; import org.graalvm.visualizer.settings.layout.LayoutSettings; @@ -144,6 +143,4 @@ public void testMultiLinePartialSearch() throws Exception { assertTrue(foundNodes.first().size() > 0); assertTrue(foundNodes.second().isEmpty()); } - - private final ScheduledExecutorService srv = Executors.newSingleThreadScheduledExecutor(); } diff --git a/visualizer/IdealGraphVisualizer/HierarchicalLayout/pom.xml b/visualizer/IdealGraphVisualizer/HierarchicalLayout/pom.xml index 7a55ac4f27dc..be9844ae0184 100644 --- a/visualizer/IdealGraphVisualizer/HierarchicalLayout/pom.xml +++ b/visualizer/IdealGraphVisualizer/HierarchicalLayout/pom.xml @@ -7,6 +7,26 @@ HierarchicalLayout nbm + + UTF-8 + + + + ${project.groupId} + Layout + ${project.version} + + + ${project.groupId} + Settings + ${project.version} + + + org.netbeans.api + org-netbeans-api-annotations-common + ${netbeans.version} + + @@ -30,24 +50,4 @@ - - - ${project.groupId} - Layout - ${project.version} - - - ${project.groupId} - Settings - ${project.version} - - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - - UTF-8 - diff --git a/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/ClusterNode.java b/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/ClusterNode.java index 15e406ddd65a..287767be8826 100644 --- a/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/ClusterNode.java +++ b/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/ClusterNode.java @@ -73,7 +73,7 @@ public void updateSize(Dimension graphSize) { if (visible && graphSize.width > 0 && graphSize.height > 0) { size = new Dimension(graphSize.width + (2 * BORDER), graphSize.height + (2 * BORDER)); } else { - assert (subNodes.isEmpty() || subNodes.stream().allMatch((n) -> !n.isVisible())) && !visible; + assert (subNodes.isEmpty() || subNodes.stream().allMatch(n -> !n.isVisible())) && !visible; size = new Dimension(3 * BORDER, 3 * BORDER); } diff --git a/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/HierarchicalClusterLayoutManager.java b/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/HierarchicalClusterLayoutManager.java index d62b3ffdbcef..8ac1e742181b 100644 --- a/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/HierarchicalClusterLayoutManager.java +++ b/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/HierarchicalClusterLayoutManager.java @@ -41,7 +41,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Logger; import java.util.stream.Collectors; import static org.graalvm.visualizer.settings.layout.LayoutSettings.BLOCKVIEW_AS_CONTROLFLOW; @@ -54,8 +53,6 @@ public class HierarchicalClusterLayoutManager implements LayoutManager { - private static final Logger LOG = Logger.getLogger(HierarchicalClusterLayoutManager.class.getName()); - private final AtomicBoolean cancelled; @Override @@ -563,8 +560,8 @@ private void resolveReversedEdges(Set links, HashMap usedPorts = new HashMap<>(); for (Link li : links) { Link l = inner.get(li); - inMap.computeIfAbsent(l.getTo().getVertex(), (v) -> new ArrayList<>()).add(l); - outMap.computeIfAbsent(l.getFrom().getVertex(), (v) -> new ArrayList<>()).add(l); + inMap.computeIfAbsent(l.getTo().getVertex(), v -> new ArrayList<>()).add(l); + outMap.computeIfAbsent(l.getFrom().getVertex(), v -> new ArrayList<>()).add(l); } final int offset = HierarchicalLayoutManager.X_OFFSET + layoutSetting.get(Integer.class, DUMMY_WIDTH); for (Map.Entry> entry : outMap.entrySet()) { diff --git a/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/HierarchicalLayoutManager.java b/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/HierarchicalLayoutManager.java index 3aa2a7e98994..28a0129bc2de 100644 --- a/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/HierarchicalLayoutManager.java +++ b/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/HierarchicalLayoutManager.java @@ -53,7 +53,6 @@ import java.util.TreeSet; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.IntUnaryOperator; -import java.util.logging.Logger; import java.util.stream.Collectors; import static org.graalvm.visualizer.settings.layout.LayoutSettings.BOTH_SORT; @@ -96,8 +95,6 @@ public class HierarchicalLayoutManager implements LayoutManager { - private static final Logger LOG = Logger.getLogger(HierarchicalLayoutManager.class.getName()); - public static final boolean TRACE = false; public static final boolean CHECK = false; public static final int SWEEP_ITERATIONS = 1; @@ -179,9 +176,9 @@ public void loadCrossingNumber(boolean up) { public int loadCrossingNumber(boolean up, LayoutNode source) { int count = 0; if (up) { - count = succs.stream().map((e) -> e.loadCrossingNumber(up, source)).reduce(count, Integer::sum); + count = succs.stream().map(e -> e.loadCrossingNumber(up, source)).reduce(count, Integer::sum); } else { - count = preds.stream().map((e) -> e.loadCrossingNumber(up, source)).reduce(count, Integer::sum); + count = preds.stream().map(e -> e.loadCrossingNumber(up, source)).reduce(count, Integer::sum); } return count; } @@ -738,7 +735,7 @@ private Dimension setStandAlones(Rectangle oldSize, Map vertexPos int width = n.getWholeWidth(); if (curX + width > rightSide) { curX = oldSize.x; - curY -= (maxHeight + layerOffset); + curY -= maxHeight + layerOffset; maxHeight = 0; } Vertex v = n.vertex; @@ -1322,7 +1319,7 @@ public boolean isVisible() { @Override public boolean addAll(Collection c) { - c.forEach((n) -> add0(n)); + c.forEach(n -> add0(n)); return super.addAll(c); } @@ -1556,7 +1553,7 @@ private void updateXOfLayer(int index) { updateFromLeft(index); } } else { - int x = (isDefaultLayout || !setting.get(Boolean.class, CENTER_CROSSING_X)) ? 0 : centerDiffs[index]; + int x = isDefaultLayout || !setting.get(Boolean.class, CENTER_CROSSING_X) ? 0 : centerDiffs[index]; for (LayoutNode n : layers[index]) { n.x = x; x += n.getWholeWidth() + offset; @@ -1568,7 +1565,7 @@ private void updateFromMiddle(int index) { LayoutLayer layer = layers[index]; int middleIndex = layer.size() / 2; LayoutNode n = layer.get(middleIndex); - int add = (isDefaultLayout || !setting.get(Boolean.class, CENTER_CROSSING_X)) ? 0 : (centerDiffs[index] / (layer.size() + 1)); + int add = isDefaultLayout || !setting.get(Boolean.class, CENTER_CROSSING_X) ? 0 : (centerDiffs[index] / (layer.size() + 1)); int x = n.x; for (int i = middleIndex - 1; i >= 0; --i) { n = layer.get(i); @@ -1586,7 +1583,7 @@ private void updateFromMiddle(int index) { private void updateFromLeft(int index) { LayoutLayer layer = layers[index]; LayoutNode n = layer.get(0); - int add = (isDefaultLayout || !setting.get(Boolean.class, CENTER_CROSSING_X)) ? 0 : (centerDiffs[index] / (layer.size() + 1)); + int add = isDefaultLayout || !setting.get(Boolean.class, CENTER_CROSSING_X) ? 0 : (centerDiffs[index] / (layer.size() + 1)); int x = n.getRightSide() + offset; for (int i = 0; i < layer.size(); ++i) { n = layer.get(i); @@ -1675,7 +1672,7 @@ private void updateCrossingNumbers(int index, boolean down) { layer = layers[index]; } boolean properCrossing = !isDefaultLayout && setting.get(Boolean.class, PROPER_CROSSING_CLOSEST_NODE); - int diff = (!isDefaultLayout && setting.get(Boolean.class, UNKNOWN_CROSSING_NUMBER)) ? 1 : 0; + int diff = !isDefaultLayout && setting.get(Boolean.class, UNKNOWN_CROSSING_NUMBER) ? 1 : 0; LayoutNode prev; LayoutNode next; for (int i = 0; i < layer.size(); i++) { @@ -1753,10 +1750,10 @@ private class AssignYCoordinates extends AlgorithmPart { protected void run() { final IntUnaryOperator layerDiff; if (isDefaultLayout || !setting.get(Boolean.class, SPAN_BY_ANGLE)) { - layerDiff = (in) -> (int) (Math.sqrt(in) * 2); + layerDiff = in -> (int) (Math.sqrt(in) * 2); } else { final double coef = Math.tan(Math.toRadians(setting.get(Integer.class, MIN_EDGE_ANGLE))); - layerDiff = (in) -> (int) (in * coef); + layerDiff = in -> (int) (in * coef); } int curY = 0; for (LayoutLayer layer : layers) { @@ -2047,7 +2044,7 @@ private void assignLayerDownwards() { layerCount = z - 1; for (LayoutNode n : nodes) { - n.layer = (layerCount - 1 - n.layer); + n.layer = layerCount - 1 - n.layer; } } @@ -2102,7 +2099,7 @@ private void assignLayerUpwards() { layerCount = z - 1; for (LayoutNode n : nodes) { - n.layer = (layerCount - 1 - n.layer); + n.layer = layerCount - 1 - n.layer; } } @@ -2127,7 +2124,6 @@ private void reassignLayers() { lay.addAll(Arrays.asList(HierarchicalLayoutManager.this.layers)); double avg = lay.stream().mapToInt(l -> l.getMinimalWidth()).sum() / layerCount; boolean up, down; - LayoutNode node = null; final boolean isQuick = setting.get(Boolean.class, DECREASE_LAYER_WIDTH_DEVIATION_QUICK); while (!lay.isEmpty()) { if (cancelled.get()) { @@ -2479,11 +2475,11 @@ private void DFS() { nodes.forEach(n -> DFS(n, false)); } else { //first search from vip starting nodes - nodes.stream().filter((n) -> n.preds.stream().allMatch((e) -> !e.vip) && n.succs.stream().anyMatch((e) -> e.vip)) + nodes.stream().filter(n -> n.preds.stream().allMatch(e -> !e.vip) && n.succs.stream().anyMatch(e -> e.vip)) .forEach(n -> DFS(n, true)); if (visited.size() < nodes.size()) { //second look from leftover nodes - nodes.stream().filter((n) -> !visited.contains(n)) + nodes.stream().filter(n -> !visited.contains(n)) .sorted((n1, n2) -> Integer.compare(n1.preds.size(), n2.preds.size())) .forEach(n -> DFS(n, false)); } diff --git a/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/Timing.java b/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/Timing.java index 11415c46cc35..ca0a5d9d2a93 100644 --- a/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/Timing.java +++ b/visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/java/org/graalvm/visualizer/hierarchicallayout/Timing.java @@ -38,7 +38,7 @@ public String toString() { if (lastValue != 0) { // Timer running long newValue = System.nanoTime(); - val += (newValue - lastValue); + val += newValue - lastValue; } return "Timing for " + name + " is: " + val / 1000000 + " ms"; } diff --git a/visualizer/IdealGraphVisualizer/JSONExporter/pom.xml b/visualizer/IdealGraphVisualizer/JSONExporter/pom.xml index 5835f2f0f75c..25c8366a839b 100644 --- a/visualizer/IdealGraphVisualizer/JSONExporter/pom.xml +++ b/visualizer/IdealGraphVisualizer/JSONExporter/pom.xml @@ -7,6 +7,16 @@ JSONExporter nbm + + UTF-8 + + + + ${project.groupId} + Data + ${project.version} + + @@ -25,14 +35,4 @@ - - - ${project.groupId} - Data - ${project.version} - - - - UTF-8 - diff --git a/visualizer/IdealGraphVisualizer/JSONExporter/src/main/java/org/graalvm/visualizer/JSONExporter.java b/visualizer/IdealGraphVisualizer/JSONExporter/src/main/java/org/graalvm/visualizer/JSONExporter.java index fde4941f29fb..6ffbdd155f66 100644 --- a/visualizer/IdealGraphVisualizer/JSONExporter/src/main/java/org/graalvm/visualizer/JSONExporter.java +++ b/visualizer/IdealGraphVisualizer/JSONExporter/src/main/java/org/graalvm/visualizer/JSONExporter.java @@ -199,7 +199,7 @@ private static JSONHelper.JSONObjectBuilder getNode(InputNode node) { if (o != null) { String key = p.getName(); if (o instanceof LocationStackFrame) { - nodeJson.add(key, stacktrace(((LocationStackFrame) o))); + nodeJson.add(key, stacktrace((LocationStackFrame) o)); } else { nodeJson.add(key, o.toString()); } @@ -218,16 +218,16 @@ public static JSONHelper.JSONArrayBuilder getEdge(InputEdge edge) { public static JSONHelper.JSONObjectBuilder getBlock(InputBlock b) { JSONHelper.JSONObjectBuilder block = JSONHelper.object(); JSONHelper.JSONArrayBuilder ids = JSONHelper.array(); - b.getNodes().forEach((bb) -> ids.add(bb.getId())); + b.getNodes().forEach(bb -> ids.add(bb.getId())); block.add(NODES, ids); JSONHelper.JSONArrayBuilder edges = JSONHelper.array(); - b.getSuccessors().forEach((ss) -> edges.add(ss.getName())); + b.getSuccessors().forEach(ss -> edges.add(ss.getName())); block.add(EDGES, edges); return block; } private static String createFileName(String graphType, String graphName, int part) { - String p = (part == -1) ? "" : ("." + part); + String p = part == -1 ? "" : ("." + part); String gt = graphType.replaceAll("[^\\p{Alnum}]", "") + '_'; String gn = graphName.replaceAll("[^\\p{Alnum}]", "_"); return gt + gn + p + ".json"; @@ -245,7 +245,7 @@ private static JSONHelper.JSONObjectBuilder stacktrace(LocationStackFrame lsf) { String methodName = t.getFullMethodName(); boolean isJava = lang.contentEquals(JAVA); ArrayList stack = langStack.getOrDefault(lang, new ArrayList<>()); - methodName = (isJava && methodName != null) ? ("(" + methodName + ") ") : ""; + methodName = isJava && methodName != null ? ("(" + methodName + ") ") : ""; stack.add(methodName + stratumToString(s)); langStack.put(lang, stack); } diff --git a/visualizer/IdealGraphVisualizer/JavaSources/pom.xml b/visualizer/IdealGraphVisualizer/JavaSources/pom.xml index 06618751af2b..cd49fb2e8e87 100644 --- a/visualizer/IdealGraphVisualizer/JavaSources/pom.xml +++ b/visualizer/IdealGraphVisualizer/JavaSources/pom.xml @@ -7,30 +7,9 @@ JavaSources nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.source.java - org.graalvm.visualizer.source.java.ui - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -128,7 +107,28 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.source.java + org.graalvm.visualizer.source.java.ui + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/impl/JavaLocationInfo.java b/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/impl/JavaLocationInfo.java index 4ff5e3b65591..cf235cdf4f67 100644 --- a/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/impl/JavaLocationInfo.java +++ b/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/impl/JavaLocationInfo.java @@ -123,14 +123,17 @@ void referToVariable(String varName) { this.targetClass = null; } + @Override public int getBytecodeIndex() { return bytecodeIndex; } + @Override public String getMethodName() { return methodName; } + @Override public String getClassName() { return className; } @@ -143,18 +146,22 @@ public Location getLocation() { return location; } + @Override public String getMethodSignature() { return methodSignature; } + @Override public String getTargetClass() { return targetClass; } + @Override public String getInvokedMethod() { return invokedMethod; } + @Override public String getVariableName() { return variableName; } @@ -175,6 +182,7 @@ private TreePathHandle setResolvedHandle(TreePathHandle handle) { /** * Attempts to find a handle for the specific tree. Do not call in EDT. */ + @Override public TreePathHandle findTreePath() { synchronized (this) { if (handleResolved) { @@ -295,6 +303,7 @@ public Object visitIdentifier(IdentifierTree node, Object p) { return setResolvedHandle(result[0]); } + @Override public String toString() { return new StringBuilder("javaloc[class = ").append(className). append(", method = ").append(methodName). diff --git a/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/impl/JavaStackProcessor2.java b/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/impl/JavaStackProcessor2.java index 04ce429cd8ac..878729878f82 100644 --- a/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/impl/JavaStackProcessor2.java +++ b/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/impl/JavaStackProcessor2.java @@ -294,7 +294,7 @@ public List process() { } @ServiceProvider(service = StackProcessor.Factory.class, position = 10000) - public final static class Factory implements StackProcessor.Factory { + public static final class Factory implements StackProcessor.Factory { @Override public String[] getLanguageIDs() { return new String[]{"text/x-java"}; // NOI18N diff --git a/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/ui/JavaProjectLocatorUI.java b/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/ui/JavaProjectLocatorUI.java index 9d9dcf2aa482..05fe4d45a5fb 100644 --- a/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/ui/JavaProjectLocatorUI.java +++ b/visualizer/IdealGraphVisualizer/JavaSources/src/main/java/org/graalvm/visualizer/source/java/ui/JavaProjectLocatorUI.java @@ -168,6 +168,7 @@ public void run() { } OpenProjects.getDefault().open(prjs.toArray(new Project[prjs.size()]), true, true); RequestProcessor.getDefault().post(new Runnable() { + @Override public void run() { try { OpenProjects.getDefault().openProjects().get(); diff --git a/visualizer/IdealGraphVisualizer/Layout/pom.xml b/visualizer/IdealGraphVisualizer/Layout/pom.xml index 3db273db8aea..2909c217c918 100644 --- a/visualizer/IdealGraphVisualizer/Layout/pom.xml +++ b/visualizer/IdealGraphVisualizer/Layout/pom.xml @@ -7,6 +7,31 @@ Layout nbm + + UTF-8 + + + + ${project.groupId} + Settings + ${project.version} + + + junit + junit + 4.13.2 + + + org.netbeans.api + org-netbeans-api-annotations-common + ${netbeans.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + @@ -39,29 +64,4 @@ - - - ${project.groupId} - Settings - ${project.version} - - - junit - junit - 4.13.2 - - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - org.netbeans.api - org-openide-util - ${netbeans.version} - - - - UTF-8 - diff --git a/visualizer/IdealGraphVisualizer/NetworkConnection/pom.xml b/visualizer/IdealGraphVisualizer/NetworkConnection/pom.xml index 1e6a06a5c2a1..578c2179a887 100644 --- a/visualizer/IdealGraphVisualizer/NetworkConnection/pom.xml +++ b/visualizer/IdealGraphVisualizer/NetworkConnection/pom.xml @@ -7,29 +7,9 @@ NetworkConnection nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.connection - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -62,7 +42,27 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.connection + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/NetworkConnection/src/main/java/org/graalvm/visualizer/connection/Client.java b/visualizer/IdealGraphVisualizer/NetworkConnection/src/main/java/org/graalvm/visualizer/connection/Client.java index fc1fd47dcbe2..8232fa40872c 100644 --- a/visualizer/IdealGraphVisualizer/NetworkConnection/src/main/java/org/graalvm/visualizer/connection/Client.java +++ b/visualizer/IdealGraphVisualizer/NetworkConnection/src/main/java/org/graalvm/visualizer/connection/Client.java @@ -29,8 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.swing.*; - import org.graalvm.visualizer.data.serialization.lazy.NetworkStreamContent; import org.graalvm.visualizer.data.serialization.lazy.ScanningModelBuilder; import org.openide.modules.Places; @@ -58,15 +56,6 @@ public Client(SocketChannel socket, this.monitor = monitor; } - /** - * Model operations should happen in a dedicated thread, AWT right now. - * - * @param r - */ - private void runInAWT(Runnable r) { - SwingUtilities.invokeLater(r); - } - private static final AtomicInteger clientId = new AtomicInteger(); @Override diff --git a/visualizer/IdealGraphVisualizer/NetworkConnection/src/main/java/org/graalvm/visualizer/connection/Server.java b/visualizer/IdealGraphVisualizer/NetworkConnection/src/main/java/org/graalvm/visualizer/connection/Server.java index d24d819ff403..a7cc9ff1da44 100644 --- a/visualizer/IdealGraphVisualizer/NetworkConnection/src/main/java/org/graalvm/visualizer/connection/Server.java +++ b/visualizer/IdealGraphVisualizer/NetworkConnection/src/main/java/org/graalvm/visualizer/connection/Server.java @@ -95,7 +95,7 @@ private void cleanCacheDir() { Files.list(rootPath) .sorted(Comparator.reverseOrder()) .map(Path::toFile) - .peek((n) -> { + .peek(n -> { LOG.log(Level.FINE, "Deleting {0}", n); // NOI18N }) .forEach(File::delete); @@ -201,6 +201,7 @@ public void run() { f = rootDocumentFactory; } NETWORK_RP.post(new Client(clientSocket, f, monitor, streamLoader) { + @Override public void run() { try { super.run(); diff --git a/visualizer/IdealGraphVisualizer/PolyglotRunner/pom.xml b/visualizer/IdealGraphVisualizer/PolyglotRunner/pom.xml index 6bb4fe5555de..708e4c87b81a 100644 --- a/visualizer/IdealGraphVisualizer/PolyglotRunner/pom.xml +++ b/visualizer/IdealGraphVisualizer/PolyglotRunner/pom.xml @@ -7,31 +7,9 @@ PolyglotRunner nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.script - org.graalvm.visualizer.script.impl - org.graalvm.visualizer.script.js - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + junit @@ -80,7 +58,29 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.script + org.graalvm.visualizer.script.impl + org.graalvm.visualizer.script.js + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/ScriptEnvironment.java b/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/ScriptEnvironment.java index 3d389d70c625..333cae415936 100644 --- a/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/ScriptEnvironment.java +++ b/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/ScriptEnvironment.java @@ -139,6 +139,7 @@ public Set keys() { * * @throws IOException thrown by called close()s */ + @Override public void close() throws IOException { for (Object v : values()) { if (v instanceof Closeable) { diff --git a/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/impl/GraalSDKEngine.java b/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/impl/GraalSDKEngine.java index f13102adb363..6125846fd3bd 100644 --- a/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/impl/GraalSDKEngine.java +++ b/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/impl/GraalSDKEngine.java @@ -40,7 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; import javax.script.Invocable; @@ -133,8 +132,6 @@ public Set supportedLanguages() { return supportedLanguages; } - private static final AtomicInteger uniq = new AtomicInteger(0); - @NbBundle.Messages({ "# {0} - filename with type definitions", "# {1} - exception message", @@ -250,7 +247,6 @@ private static class ContextHolder implements Closeable { private final DelegatingWriter outStream = new DelegatingWriter(defaultOutWriter); private final DelegatingWriter errStream = new DelegatingWriter(defaultErrWriter); private boolean initialized; - private Map types = new HashMap<>(); public ContextHolder(ScriptEngine builder) { @@ -288,10 +284,6 @@ private ContextHolder prepareContext(ScriptEnvironment env) { env.setValue(this, ctx); return ctx; } - - private void clearContext(ScriptEnvironment env) { - env.setValue(this, null); - } /** * Wraps the polyglot execution. Execution of each instance's user code is synchronized on {@link #engineLock}. diff --git a/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/js/JavascriptWrapperImpl.java b/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/js/JavascriptWrapperImpl.java index f8c5005132b4..e5fbbd11849c 100644 --- a/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/js/JavascriptWrapperImpl.java +++ b/visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/java/org/graalvm/visualizer/script/js/JavascriptWrapperImpl.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import java.util.logging.Logger; /** * Provides javascript-specific wrapping around the executing code @@ -39,7 +38,6 @@ */ @MimeRegistration(mimeType = "text/javascript", service = UserScriptProcessor.class) public class JavascriptWrapperImpl implements UserScriptProcessor { - private static final Logger LOG = Logger.getLogger(JavascriptWrapperImpl.class.getName()); private static final AtomicInteger uniq = new AtomicInteger(0); diff --git a/visualizer/IdealGraphVisualizer/SelectionCoordinator/pom.xml b/visualizer/IdealGraphVisualizer/SelectionCoordinator/pom.xml index d962429d0e8a..c90655c07b52 100644 --- a/visualizer/IdealGraphVisualizer/SelectionCoordinator/pom.xml +++ b/visualizer/IdealGraphVisualizer/SelectionCoordinator/pom.xml @@ -7,6 +7,27 @@ SelectionCoordinator nbm + + UTF-8 + + + + ${project.groupId} + Data + ${project.version} + + + org.netbeans.api + org-netbeans-api-annotations-common + ${netbeans.version} + + + org.netbeans.api + org-netbeans-modules-nbjunit + ${netbeans.version} + test + + @@ -30,25 +51,4 @@ - - - ${project.groupId} - Data - ${project.version} - - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - org.netbeans.api - org-netbeans-modules-nbjunit - ${netbeans.version} - test - - - - UTF-8 - diff --git a/visualizer/IdealGraphVisualizer/Settings/pom.xml b/visualizer/IdealGraphVisualizer/Settings/pom.xml index 1d1409d129b9..fc37835c7c1a 100644 --- a/visualizer/IdealGraphVisualizer/Settings/pom.xml +++ b/visualizer/IdealGraphVisualizer/Settings/pom.xml @@ -7,6 +7,26 @@ Settings nbm + + UTF-8 + + + + junit + junit + 4.13.2 + + + org.netbeans.api + org-netbeans-api-annotations-common + ${netbeans.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + @@ -32,24 +52,4 @@ - - - junit - junit - 4.13.2 - - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - org.netbeans.api - org-openide-util - ${netbeans.version} - - - - UTF-8 - diff --git a/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/SettingsStore.java b/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/SettingsStore.java index df7010f9ff26..afb82ecb1fd9 100644 --- a/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/SettingsStore.java +++ b/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/SettingsStore.java @@ -68,7 +68,7 @@ protected SettingsStore() { protected final Preferences PREFERENCES = Preferences.userNodeForPackage(this.getClass()); - private final static class PrefMapper { + private static final class PrefMapper { private final Function>> setter; private final Function>> getter; @@ -126,7 +126,7 @@ public B obtainBean() { public final Map> defaults; private static void def(Map> defs, String propName, Object def) { - defs.computeIfAbsent(def.getClass(), (c) -> new HashMap<>()).put(propName, def); + defs.computeIfAbsent(def.getClass(), c -> new HashMap<>()).put(propName, def); } private static Map> finalize(Map> defs) { @@ -176,7 +176,7 @@ public void store() { bean.store(); } - public static abstract class SettingsBean, B extends SettingsBean> implements Settings { + public abstract static class SettingsBean, B extends SettingsBean> implements Settings { final Map> settings; protected final S store; @@ -243,7 +243,7 @@ public void store() { settings.forEach((t, m) -> { PrefMapper mapper = prefMaps.get(t); if (mapper != null) { - m.entrySet().forEach((e) -> mapper.save(prefs, e)); + m.entrySet().forEach(e -> mapper.save(prefs, e)); } }); } @@ -379,7 +379,7 @@ private SettingsHolder() { private static Map, WeakReference> hold = new HashMap<>(); - private synchronized static void register(SettingsStore store) { + private static synchronized void register(SettingsStore store) { Class type = store.getClass(); WeakReference wk = hold.get(type); if (wk != null && wk.get() != null) { @@ -388,7 +388,7 @@ private synchronized static void register(SettingsStore store) { hold.put(type, new WeakReference<>(store)); } - private synchronized static , B extends SettingsBean> S obtain(Class type) { + private static synchronized , B extends SettingsBean> S obtain(Class type) { WeakReference wk = hold.get(type); if (wk == null) { return null; @@ -396,7 +396,7 @@ private synchronized static , B extends SettingsBe return (S) wk.get(); } - private synchronized static , B extends SettingsBean> S obtain(Class type, Supplier get) { + private static synchronized , B extends SettingsBean> S obtain(Class type, Supplier get) { S settings = obtain(type); if (settings == null) { settings = get.get(); diff --git a/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/TestUtils.java b/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/TestUtils.java index 898326fb0d80..da2a6ce0f5f7 100644 --- a/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/TestUtils.java +++ b/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/TestUtils.java @@ -73,8 +73,8 @@ public static void assertCollections_NoOrder(Collection a, C if (checkNotNulls(a, b)) { assertEquals(a.size(), b.size()); Map objs = new HashMap<>(); - b.forEach((obj) -> objs.put(mapFunc.apply(obj), obj)); - a.forEach((obj) -> assertion.accept(obj, objs.get(mapFunc.apply(obj)))); + b.forEach(obj -> objs.put(mapFunc.apply(obj), obj)); + a.forEach(obj -> assertion.accept(obj, objs.get(mapFunc.apply(obj)))); } } @@ -93,7 +93,7 @@ public static void assertCollections_InOrder(Collection a, Coll public static void assertSetEquals(Set a, Set b) { if (checkNotNulls(a, b)) { assertEquals(a.size(), b.size()); - b.forEach((obj) -> assertTrue(a.contains(obj))); + b.forEach(obj -> assertTrue(a.contains(obj))); } } diff --git a/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/graal/GraalSettings.java b/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/graal/GraalSettings.java index c3ece8cd7bd4..45d912b9a747 100644 --- a/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/graal/GraalSettings.java +++ b/visualizer/IdealGraphVisualizer/Settings/src/main/java/org/graalvm/visualizer/settings/graal/GraalSettings.java @@ -43,21 +43,21 @@ */ public final class GraalSettings extends SettingsStore { - public final static String PORT_BINARY = "portBinary";// NOI18N - public final static int PORT_BINARY_DEFAULT = 4445; - public final static String DIRECTORY = "directory";// NOI18N - public final static String DIRECTORY_DEFAULT = System.getProperty("user.dir"); - public final static String MAP = "map";// NOI18N - public final static String MAP_DEFAULT = "";// NOI18N - public final static String REPOSITORY = "repository";// NOI18N - public final static String REPOSITORY_DEFAULT = NbBundle.getMessage(GraalSettings.class, "DefaultMavenRepository"); - public final static String CLEAN_CACHES = "cleanCaches"; // NOI18N - public final static String ACCEPT_NETWORK = "acceptNetwork"; // NOI18N - public final static boolean ACCEPT_NETWORK_DEFAULT = false; // NOI18 - public final static String SESSION_CLOSE_TIMEOUT = "sessionCloseTimeout"; // NOI18N - public final static int SESSION_CLOSE_TIMEOUT_DEFAULT = 10; // NOI18N - public final static String AUTO_SEPARATE_SESSIONS = "autoSeparateSessions"; // NOI18N - public final static boolean AUTO_SEPARATE_SESSIONS_DEFAULT = false; // NOI18N + public static final String PORT_BINARY = "portBinary";// NOI18N + public static final int PORT_BINARY_DEFAULT = 4445; + public static final String DIRECTORY = "directory";// NOI18N + public static final String DIRECTORY_DEFAULT = System.getProperty("user.dir"); + public static final String MAP = "map";// NOI18N + public static final String MAP_DEFAULT = "";// NOI18N + public static final String REPOSITORY = "repository";// NOI18N + public static final String REPOSITORY_DEFAULT = NbBundle.getMessage(GraalSettings.class, "DefaultMavenRepository"); + public static final String CLEAN_CACHES = "cleanCaches"; // NOI18N + public static final String ACCEPT_NETWORK = "acceptNetwork"; // NOI18N + public static final boolean ACCEPT_NETWORK_DEFAULT = false; // NOI18 + public static final String SESSION_CLOSE_TIMEOUT = "sessionCloseTimeout"; // NOI18N + public static final int SESSION_CLOSE_TIMEOUT_DEFAULT = 10; // NOI18N + public static final String AUTO_SEPARATE_SESSIONS = "autoSeparateSessions"; // NOI18N + public static final boolean AUTO_SEPARATE_SESSIONS_DEFAULT = false; // NOI18N public static GraalSettings obtain() { return SettingsStore.obtain(GraalSettings.class, GraalSettings::new); diff --git a/visualizer/IdealGraphVisualizer/SettingsUI/pom.xml b/visualizer/IdealGraphVisualizer/SettingsUI/pom.xml index 6fd402b57869..e2524dac95c1 100644 --- a/visualizer/IdealGraphVisualizer/SettingsUI/pom.xml +++ b/visualizer/IdealGraphVisualizer/SettingsUI/pom.xml @@ -7,24 +7,9 @@ SettingsUI nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -72,7 +57,22 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/SettingsUI/src/main/java/org/graalvm/visualizer/settings/ui/LayoutPanel.java b/visualizer/IdealGraphVisualizer/SettingsUI/src/main/java/org/graalvm/visualizer/settings/ui/LayoutPanel.java index d9e27815d98f..f8bb7dde8e80 100644 --- a/visualizer/IdealGraphVisualizer/SettingsUI/src/main/java/org/graalvm/visualizer/settings/ui/LayoutPanel.java +++ b/visualizer/IdealGraphVisualizer/SettingsUI/src/main/java/org/graalvm/visualizer/settings/ui/LayoutPanel.java @@ -677,6 +677,7 @@ private void initComponents() { org.openide.awt.Mnemonics.setLocalizedText(resetAdvancedButton, org.openide.util.NbBundle.getMessage(LayoutPanel.class, "LayoutPanel.resetAdvancedButton.text")); // NOI18N resetAdvancedButton.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { resetAdvancedButtonActionPerformed(evt); } @@ -684,6 +685,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { org.openide.awt.Mnemonics.setLocalizedText(advancedAsDefaultButton, org.openide.util.NbBundle.getMessage(LayoutPanel.class, "LayoutPanel.advancedAsDefaultButton.text")); // NOI18N advancedAsDefaultButton.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { advancedToDefault(evt); } diff --git a/visualizer/IdealGraphVisualizer/SettingsUI/src/main/java/org/graalvm/visualizer/settings/ui/SettingsPanel.java b/visualizer/IdealGraphVisualizer/SettingsUI/src/main/java/org/graalvm/visualizer/settings/ui/SettingsPanel.java index e3e2ca13c41f..9306254dee1a 100644 --- a/visualizer/IdealGraphVisualizer/SettingsUI/src/main/java/org/graalvm/visualizer/settings/ui/SettingsPanel.java +++ b/visualizer/IdealGraphVisualizer/SettingsUI/src/main/java/org/graalvm/visualizer/settings/ui/SettingsPanel.java @@ -60,17 +60,17 @@ public abstract class SettingsPanel

, C extends SettingsOptionsPanelController> extends JPanel { protected static final Connector BOOL = new Connector<>(Boolean.class, - (c) -> c.isSelected(), (c, v) -> c.setSelected(v), (c, l) -> c.addActionListener(l)); + c -> c.isSelected(), (c, v) -> c.setSelected(v), (c, l) -> c.addActionListener(l)); protected static final Connector NOT = new Connector<>(Boolean.class, - (c) -> !c.isSelected(), (c, v) -> c.setSelected(!v), (c, l) -> c.addActionListener(l)); + c -> !c.isSelected(), (c, v) -> c.setSelected(!v), (c, l) -> c.addActionListener(l)); protected static final Connector STRING = new Connector<>(String.class, - (c) -> c.getText(), (c, v) -> c.setText(v), (c, l) -> c.addActionListener(l)); + c -> c.getText(), (c, v) -> c.setText(v), (c, l) -> c.addActionListener(l)); protected static final Connector FLOAT = new Connector<>(Float.class, - (c) -> (Float) c.getValue(), (c, v) -> c.setValue(v), (c, l) -> c.addActionListener(l)); + c -> (Float) c.getValue(), (c, v) -> c.setValue(v), (c, l) -> c.addActionListener(l)); protected static final Connector INT_FORM = new Connector<>(Integer.class, - (c) -> (Integer) c.getValue(), (c, v) -> c.setValue(v), (c, l) -> c.addActionListener(l)); + c -> (Integer) c.getValue(), (c, v) -> c.setValue(v), (c, l) -> c.addActionListener(l)); protected static final Connector INT_COMB = new Connector<>(Integer.class, - (c) -> Integer.parseInt(c.getSelectedItem().toString()), (c, v) -> c.setSelectedItem(v), (c, l) -> c.addActionListener(l)); + c -> Integer.parseInt(c.getSelectedItem().toString()), (c, v) -> c.setSelectedItem(v), (c, l) -> c.addActionListener(l)); private final List loads = new ArrayList<>(); private final Map enables = new HashMap<>(); @@ -99,7 +99,7 @@ protected void settingsChanged() { } protected void tie(Connector type, C comp, String name) { - type.attach(comp, (e) -> { + type.attach(comp, e -> { type.save(comp, getSettings(), name); settingsChanged(); }); @@ -224,7 +224,7 @@ public void attach(C comp, ActionListener a) { } } - public static abstract class SettingsOptionsPanelController

, C extends SettingsOptionsPanelController> extends OptionsPanelController { + public abstract static class SettingsOptionsPanelController

, C extends SettingsOptionsPanelController> extends OptionsPanelController { private P panel; private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); diff --git a/visualizer/IdealGraphVisualizer/Shell/pom.xml b/visualizer/IdealGraphVisualizer/Shell/pom.xml index 93610b76f742..3e3602b4f608 100644 --- a/visualizer/IdealGraphVisualizer/Shell/pom.xml +++ b/visualizer/IdealGraphVisualizer/Shell/pom.xml @@ -7,24 +7,9 @@ Shell nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -147,7 +132,22 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/ShellUtils.java b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/ShellUtils.java index 86817e42d7ae..437f8158395e 100644 --- a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/ShellUtils.java +++ b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/ShellUtils.java @@ -341,7 +341,7 @@ public EngineCache() { engines = Lookup.getDefault().lookupResult(UserScriptEngine.class); engines.addLookupListener(WeakListeners.create( LookupListener.class, - ll = (ev) -> invalidate(), + ll = ev -> invalidate(), engines)); } @@ -420,7 +420,7 @@ public static void onScrapMaterialize(FileObject scrap, Consumer scr globalScrapNotifyList.add(scrapCallback); return; } - refs = scrapNotifyList.computeIfAbsent(scrap, (f) -> new ArrayList<>()); + refs = scrapNotifyList.computeIfAbsent(scrap, f -> new ArrayList<>()); } if (refs.isEmpty()) { scrap.addFileChangeListener(SCRAP_SHARED_LISTENER); diff --git a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/actions/EditorContextActionBase.java b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/actions/EditorContextActionBase.java index 7fa8716b2fb9..6260fbb94dbf 100644 --- a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/actions/EditorContextActionBase.java +++ b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/actions/EditorContextActionBase.java @@ -107,7 +107,7 @@ public final void putValue(String key, Object value) { enabled = Boolean.TRUE.equals(value); } else { synchronized (properties) { - oldValue = properties.put(key, (value != null) ? value : MASK_NULL_VALUE); + oldValue = properties.put(key, value != null ? value : MASK_NULL_VALUE); } } firePropertyChange(key, oldValue, value); // Checks whether oldValue.equals(value) diff --git a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/actions/ExecuteIGVShell.java b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/actions/ExecuteIGVShell.java index d09dac4b4748..8bcffd0a545d 100644 --- a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/actions/ExecuteIGVShell.java +++ b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/actions/ExecuteIGVShell.java @@ -102,8 +102,8 @@ public void actionPerformed(ActionEvent ev) { // first try to find a suitable script editor active in some Mode Optional existing = WindowManager.getDefault().getModes().stream() - .map((m) -> m.getSelectedTopComponent()) - .filter((tc) -> containsEditor(tc) && getScriptFile(tc) != null).findAny(); + .map(m -> m.getSelectedTopComponent()) + .filter(tc -> containsEditor(tc) && getScriptFile(tc) != null).findAny(); if (existing.isPresent()) { TopComponent target = existing.get(); target.requestActive(); @@ -129,7 +129,7 @@ public void actionPerformed(ActionEvent ev) { DataObject scrap = ShellUtils.createScrapScript(selected); Openable o = scrap.getLookup().lookup(Openable.class); if (o != null) { - ShellUtils.onScrapMaterialize(scrap.getPrimaryFile(), (f) -> { + ShellUtils.onScrapMaterialize(scrap.getPrimaryFile(), f -> { TopComponent tc = WindowManager.getDefault().findTopComponent(ScriptNavigatorTopComponent.ID); if (tc != null) { tc.open(); diff --git a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/list/NewScriptAction.java b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/list/NewScriptAction.java index a315084a7c57..511a57c461eb 100644 --- a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/list/NewScriptAction.java +++ b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/list/NewScriptAction.java @@ -84,7 +84,7 @@ public void actionPerformed(ActionEvent e) { if (files != null && !files.isEmpty()) { DataObject x = createScriptFolderShadow(files.iterator().next().getPrimaryFile(), scriptRoot); // wait on materialize && show the script list window - ShellUtils.onScrapMaterialize(x.getPrimaryFile(), (f) -> { + ShellUtils.onScrapMaterialize(x.getPrimaryFile(), f -> { TopComponent tc = WindowManager.getDefault().findTopComponent(ScriptNavigatorTopComponent.ID); if (tc != null) { tc.open(); diff --git a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/ui/ScriptNavigatorTopComponent.java b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/ui/ScriptNavigatorTopComponent.java index 2c41817114f2..a4467b0ee558 100644 --- a/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/ui/ScriptNavigatorTopComponent.java +++ b/visualizer/IdealGraphVisualizer/Shell/src/main/java/org/graalvm/visualizer/shell/ui/ScriptNavigatorTopComponent.java @@ -86,7 +86,7 @@ public ScriptNavigatorTopComponent() { associateLookup(ExplorerUtils.createLookup(listMan, map)); ExplorerUtils.activateActions(listMan, true); - listMan.addPropertyChangeListener((e) -> { + listMan.addPropertyChangeListener(e -> { final String n = e.getPropertyName(); if (ExplorerManager.PROP_SELECTED_NODES.equals(n)) { setActivatedNodes((Node[]) e.getNewValue()); diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/pom.xml b/visualizer/IdealGraphVisualizer/SourceRepository/pom.xml index 4f2e2f616441..545e0065dc54 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/pom.xml +++ b/visualizer/IdealGraphVisualizer/SourceRepository/pom.xml @@ -7,30 +7,9 @@ SourceRepository nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.source - org.graalvm.visualizer.source.spi - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -221,7 +200,28 @@ runtime - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.source + org.graalvm.visualizer.source.spi + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/FileKey.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/FileKey.java index b5030d3e962d..71e6078f2cca 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/FileKey.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/FileKey.java @@ -102,7 +102,7 @@ final void setResolvedFile(FileObject f) { @Override public String toString() { - return (resolvedFile != null ? resolvedFile.getPath() : fileSpec); + return resolvedFile != null ? resolvedFile.getPath() : fileSpec; } public static FileKey fromFile(FileObject f) { diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/GraphSource.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/GraphSource.java index c77487d2bbdd..e035e44ac8b7 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/GraphSource.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/GraphSource.java @@ -152,7 +152,7 @@ public Collection getNodesAt(Location l) { return Collections.emptySet(); } if (o instanceof Collection) { - data = ((Collection) o); + data = (Collection) o; } else { data = Collections.singletonList((StackData) o); } @@ -213,7 +213,7 @@ private Loader createLoader(InputGraph g, Collection nodesToLoad) { ids = allIds; } for (String m : ids) { - ProcessorContext ctx = contexts.computeIfAbsent(m, (mime) -> new ProcessorContext(this, g, fileRegistry, mime)); + ProcessorContext ctx = contexts.computeIfAbsent(m, mime -> new ProcessorContext(this, g, fileRegistry, mime)); StackProcessor p = f.createProcessor(ctx); if (p == null) { continue; @@ -277,7 +277,7 @@ private void mergeResults(ProcessorContext ctx) { } Collections.sort(locs, this::compareLine); } else { - keyLocations.computeIfAbsent(f, (x) -> new HashSet()).addAll(l); + keyLocations.computeIfAbsent(f, x -> new HashSet()).addAll(l); } } @@ -639,7 +639,7 @@ private NodeStack getNodeStack(int id, String mime) { } StackData sd = getStackData(id, mime); if (sd == null) { - NodeStack st = nostackMarkers.computeIfAbsent(mime, (m) -> new NodeStack(this, m)); + NodeStack st = nostackMarkers.computeIfAbsent(mime, m -> new NodeStack(this, m)); nodeStacks[id] = new WeakReference<>(st); return null; } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/GraphSourceRegistry.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/GraphSourceRegistry.java index ef672dea2f66..db7684b73c5c 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/GraphSourceRegistry.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/GraphSourceRegistry.java @@ -92,7 +92,7 @@ Lookup providerLookup(String mime) { return lkp; } - synchronized static void _testReset() { + static synchronized void _testReset() { FileRegistry._testReset(); INSTANCE = new GraphSourceRegistry(FileRegistry.getInstance()); } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/Language.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/Language.java index 4e8ee3dccc6b..b8a895b42719 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/Language.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/Language.java @@ -105,6 +105,7 @@ public boolean equals(Object obj) { return true; } + @Override public String toString() { return displayName + "[" + mimeType + " : " + graalID + "]"; } @@ -114,7 +115,7 @@ public static final class Registry { public Language findLanguageByMime(String mimeType) { return getSupportedLanguages().stream().filter( - (l) -> l.getMimeType().equals(mimeType)) + l -> l.getMimeType().equals(mimeType)) .findAny() .orElse(null); } @@ -141,11 +142,11 @@ public Collection getRunnableLanguages() { } public Collection getLanguageIDs() { - return getSupportedLanguages().stream().map((l) -> l.getGraalID()).collect(Collectors.toList()); + return getSupportedLanguages().stream().map(l -> l.getGraalID()).collect(Collectors.toList()); } public Collection getMimeTypes() { - return getSupportedLanguages().stream().map((l) -> l.getMimeType()).collect(Collectors.toList()); + return getSupportedLanguages().stream().map(l -> l.getMimeType()).collect(Collectors.toList()); } } } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/Location.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/Location.java index ac0165b7672f..1252881acc0a 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/Location.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/Location.java @@ -273,7 +273,7 @@ public int compareNesting(Location other) { return this.frameFrom - oF; } - public final static class Line { + public static final class Line { private final FileKey fk; private final int line; diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/NodeLocationContext.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/NodeLocationContext.java index 1e1eab457eb4..b6ce2492f10b 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/NodeLocationContext.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/NodeLocationContext.java @@ -44,7 +44,6 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -import java.util.prefs.Preferences; /** * Represents source location(s) of a Node or a set of nodes. Maintains the current @@ -86,11 +85,6 @@ public class NodeLocationContext { */ private NodeStack.Frame selectedFrame; - /** - * Frames for individual languages for the selected node and frame level. - */ - private Map langFrames = new HashMap<>(); - private final PropertyChangeSupport supp = new PropertyChangeSupport(this); /** @@ -106,8 +100,6 @@ public void filesResolved(FileRegistry.FileRegistryEvent ev) { } }; - private Preferences prefs = NbPreferences.forModule(NodeLocationContext.class); - public void addPropertyChangeListener(PropertyChangeListener l) { supp.addPropertyChangeListener(l); } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/ProcessorContext.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/ProcessorContext.java index 3365733bda95..85520c3f5771 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/ProcessorContext.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/ProcessorContext.java @@ -129,9 +129,9 @@ public boolean isGraphNested() { private Location finishNewLocation(Location l) { if (l.isResolved()) { - fileLocations.computeIfAbsent(l.getOriginFile(), (x) -> new ArrayList<>()).add(l); + fileLocations.computeIfAbsent(l.getOriginFile(), x -> new ArrayList<>()).add(l); } else { - keyLocations.computeIfAbsent(l.getFile(), (x) -> new ArrayList<>()).add(l); + keyLocations.computeIfAbsent(l.getFile(), x -> new ArrayList<>()).add(l); } return l; } @@ -139,7 +139,7 @@ private Location finishNewLocation(Location l) { private Location unique(Location l) { // first look in cache here, since it is unsynchronized. Then look/enter // in the source cache. - return locations.computeIfAbsent(l, (loc) -> { + return locations.computeIfAbsent(l, loc -> { Location srcLoc = source.uniqueLocation(l); return finishNewLocation(srcLoc); }); diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/SourceUtils.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/SourceUtils.java index 8dbe3b2d3e69..bf29883b066e 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/SourceUtils.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/SourceUtils.java @@ -131,7 +131,7 @@ public static Collection findLineNodes(FileObject fo, int lineFrom, i */ public static void resolveSelectableNodes(Collection nodes, DiagramViewer viewer, Consumer> callback, boolean all) { - viewer.getModel().withDiagramToView((dg) -> { + viewer.getModel().withDiagramToView(dg -> { SwingUtilities.invokeLater(() -> { if (nodes == null) { callback.accept(Collections.emptySet()); diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/LocContextSynchronizer.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/LocContextSynchronizer.java index a685a5e6d9d6..2ff535153d71 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/LocContextSynchronizer.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/LocContextSynchronizer.java @@ -257,7 +257,7 @@ public void run() { nodes = new HashSet<>(SourceUtils.findLineNodes(pane, gs, lineLocs, false)); nodes.retainAll(locContext.getContextNodes()); } - SourceUtils.resolveSelectableNodes(nodes, viewer, (nn) -> { + SourceUtils.resolveSelectableNodes(nodes, viewer, nn -> { if (!nn.isEmpty()) { inSync = true; // locContext.setSelectedNodes(nn); diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/SourceRepositoryImpl.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/SourceRepositoryImpl.java index f2bb2f43890e..7c4cb4fab6ee 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/SourceRepositoryImpl.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/SourceRepositoryImpl.java @@ -357,7 +357,7 @@ void fireChange() { static synchronized void _testReset() { if (INSTANCE != null) { INSTANCE.getDefaultGroup().removeRegisteredPath(); - INSTANCE.getGroups().forEach((g) -> g.removeRegisteredPath()); + INSTANCE.getGroups().forEach(g -> g.removeRegisteredPath()); } INSTANCE = null; } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/actions/RemoveSourceRootAction.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/actions/RemoveSourceRootAction.java index 4d84cd0863ad..5c33f26093bb 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/actions/RemoveSourceRootAction.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/actions/RemoveSourceRootAction.java @@ -52,14 +52,17 @@ protected void initialize() { super.initialize(); } + @Override public Object getActionMapKey() { return "delete"; // NOI18N } + @Override public String getName() { return Bundle.ACTION_RemoveSourceRoot(); } + @Override public HelpCtx getHelpCtx() { return new HelpCtx(RemoveSourceRootAction.class); } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/SelectGraphNodesAction.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/SelectGraphNodesAction.java index 33bfce53eb62..ab9a63a29960 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/SelectGraphNodesAction.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/SelectGraphNodesAction.java @@ -151,7 +151,7 @@ protected void refreshUI() { return; } DiagramViewer sel = LookupHistory.getLast(DiagramViewer.class); - SourceUtils.resolveSelectableNodes(nodes, sel, (nn) -> { + SourceUtils.resolveSelectableNodes(nodes, sel, nn -> { lineNodes = new ArrayList<>(nn); Collections.sort(lineNodes, InputNode.COMPARATOR); setEnabled(!lineNodes.isEmpty()); @@ -195,7 +195,7 @@ public void populatePopup(JPopupMenu menu) { DiagramViewer v = LookupHistory.getLast(DiagramViewer.class); if (cancelRefresh()) { Collection nodes = findLineNodes(pane, null); - SourceUtils.resolveSelectableNodes(nodes, v, (nn) -> { + SourceUtils.resolveSelectableNodes(nodes, v, nn -> { lineNodes = new ArrayList<>(nn); Collections.sort(lineNodes, InputNode.COMPARATOR); doPopulateMenu(menu, loc); @@ -253,7 +253,7 @@ private void gotoNode(Location loc, InputNode nodeToSelect) { } ctx.setCurrentNode(nodeToSelect, selFrame); DiagramViewer sel = LookupHistory.getLast(DiagramViewer.class); - SourceUtils.resolveSelectableNodes(Collections.singletonList(nodeToSelect), sel, (nn) -> { + SourceUtils.resolveSelectableNodes(Collections.singletonList(nodeToSelect), sel, nn -> { sel.getSelections().setSelectedNodes(nn); sel.getSelections().scrollToVisible(nn); }, true); diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/SelectOrExtractNodesAction.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/SelectOrExtractNodesAction.java index e4390f63b052..7c02123395cf 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/SelectOrExtractNodesAction.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/SelectOrExtractNodesAction.java @@ -175,10 +175,10 @@ public void actionPerformed(ActionEvent evt, JTextComponent target) { GraphSelections sel = LookupHistory.getLast(GraphSelections.class); DiagramViewer viewer = LookupHistory.getLast(DiagramViewer.class); final Collection fNodes = nodes; - viewer.getModel().withDiagramToView((dg) -> { + viewer.getModel().withDiagramToView(dg -> { SwingUtilities.invokeLater(() -> { if (selection) { - selectFirstOrNext(dg, viewer, fNodes, shiftPressed, false, (ns) -> viewer.getSelections().setSelectedNodes(ns)); + selectFirstOrNext(dg, viewer, fNodes, shiftPressed, false, ns -> viewer.getSelections().setSelectedNodes(ns)); } else { sel.extractNodes(fNodes); } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/TrackNodesAction.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/TrackNodesAction.java index d44547bbacd7..78e137858ca5 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/TrackNodesAction.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/editor/TrackNodesAction.java @@ -123,11 +123,11 @@ public TrackNodesAction() { } JEditorPane getPane() { - return (paneRef != null ? paneRef.get() : null); + return paneRef != null ? paneRef.get() : null; } JToggleButton getToggleButton() { - return (toggleButtonRef != null ? toggleButtonRef.get() : null); + return toggleButtonRef != null ? toggleButtonRef.get() : null; } void updateState() { @@ -235,6 +235,6 @@ private void selectNodesForCurrentLine() { GraphSelections sel = active.getSelections(); SelectOrExtractNodesAction.selectFirstOrNext(active.getModel().getDiagramToView(), active, nodes, false, true, - (newSel) -> active.getSelections().setSelectedNodes(newSel)); + newSel -> active.getSelections().setSelectedNodes(newSel)); } } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/CompactComboRenderer.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/CompactComboRenderer.java index 15afb2b84e6a..a0f875b21dea 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/CompactComboRenderer.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/CompactComboRenderer.java @@ -78,6 +78,7 @@ public ThinPanel() { setBorder(null); } + @Override public Dimension getPreferredSize() { if (lastRenderer == null) { return super.getPreferredSize(); diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/CompactComboUI.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/CompactComboUI.java index e9a0981f010a..9cb9a4367848 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/CompactComboUI.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/CompactComboUI.java @@ -61,7 +61,7 @@ protected Rectangle computePopupBounds(int px, int py, int pw, int ph) { } if ((px + pw) > (r.width - px)) { - px -= (r.width - pw); + px -= r.width - pw; } Rectangle result = new Rectangle(px, py, pw, ph); return result; diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/StackViewTopComponent.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/StackViewTopComponent.java index 5fa9d476a026..2a9d07a9d98b 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/StackViewTopComponent.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/impl/ui/StackViewTopComponent.java @@ -186,17 +186,6 @@ private void addAction(String category, String id, Lookup lkp) { } } - private static String getHTMLColorString(Color color) { - String red = Integer.toHexString(color.getRed()); - String green = Integer.toHexString(color.getGreen()); - String blue = Integer.toHexString(color.getBlue()); - - return "#" // NOI18N - + (red.length() == 1 ? "0" + red : red) // NOI18N - + (green.length() == 1 ? "0" + green : green) // NOI18N - + (blue.length() == 1 ? "0" + blue : blue); // NOI18N - } - @NbBundle.Messages({ "# {0} - node ID", "# {1} - node name", @@ -254,7 +243,7 @@ protected void populatePopup(JPopupMenu menu) { icon = ImageUtilities.image2Icon(ln.getIcon(BeanInfo.ICON_COLOR_16x16)); } JMenuItem mi = new JMenuItem(lng.getDisplayName(), icon); - mi.addActionListener((e) -> { + mi.addActionListener(e -> { NodeStack.Frame frame = findCurrentFrame(); NodeStack.Frame nframe = frame == null ? null : frame.findPeerFrame(l); @@ -324,6 +313,7 @@ private void initComponents() { attach.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); attach.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); attach.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { attachActionPerformed(evt); } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/lang/FileStackProcessor.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/lang/FileStackProcessor.java index dad0ee045757..61733f18ca9d 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/lang/FileStackProcessor.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/main/java/org/graalvm/visualizer/source/lang/FileStackProcessor.java @@ -150,7 +150,7 @@ private Location processFrame() throws IOException, URISyntaxException { } @ServiceProvider(service = StackProcessor.Factory.class, position = Integer.MAX_VALUE) - public final static class RegisteredLangFactory implements StackProcessor.Factory { + public static final class RegisteredLangFactory implements StackProcessor.Factory { @Override public String[] getLanguageIDs() { /* diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/GraphSourceTest.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/GraphSourceTest.java index 5d19808b30c1..2a45a300b61e 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/GraphSourceTest.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/GraphSourceTest.java @@ -147,7 +147,7 @@ public void testUnresolvedLocationsBecomeResolved() throws Exception { FileObject fString = sourcePath.findResource("java/lang/StringBuilder.java"); Semaphore lck = new Semaphore(0); - src.getFileRegistry().addFileRegistryListener((e) -> { + src.getFileRegistry().addFileRegistryListener(e -> { lck.release(); }); // these are tested to fire events elsewhere, so hook at the event @@ -276,7 +276,7 @@ public void testGetNodesPassingThrough() throws Exception { } Set nodesWithPositions = src.getGraph().getNodes() - .stream().filter((n) -> n.getProperties().get(PROPNAME_NODE_SOURCE_POSITION) != null) + .stream().filter(n -> n.getProperties().get(PROPNAME_NODE_SOURCE_POSITION) != null) .collect(Collectors.toSet()); assertTrue(foundNodes.containsAll(nodesWithPositions)); } @@ -350,7 +350,7 @@ public void testFindNodeLocation() throws Exception { } Location loc = src.findNodeLocation(n); assertNotNull(loc); - Collection nodes = foundLocations.computeIfAbsent(loc, (l) -> new ArrayList<>(2)); + Collection nodes = foundLocations.computeIfAbsent(loc, l -> new ArrayList<>(2)); nodes.add(n); } diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/NodeLocationContextTest.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/NodeLocationContextTest.java index 92a56164eced..cf08d6fd71b0 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/NodeLocationContextTest.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/NodeLocationContextTest.java @@ -48,6 +48,7 @@ public NodeLocationContextTest(String name) { NodeLocationListener listener; + @Override protected void setUp() throws Exception { super.setUp(); nctx = Lookup.getDefault().lookup(NodeLocationContext.class); diff --git a/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/impl/SourceRepositoryTestBase.java b/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/impl/SourceRepositoryTestBase.java index 46a0a2393dc1..28c758774459 100644 --- a/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/impl/SourceRepositoryTestBase.java +++ b/visualizer/IdealGraphVisualizer/SourceRepository/src/test/java/org/graalvm/visualizer/source/impl/SourceRepositoryTestBase.java @@ -161,7 +161,7 @@ protected String[] childrenNamesSpi() throws BackingStoreException { @Override protected AbstractPreferences childSpi(String name) { - return nodes.computeIfAbsent(name, (n) -> new TestMemPrefs(this, n)); + return nodes.computeIfAbsent(name, n -> new TestMemPrefs(this, n)); } @Override diff --git a/visualizer/IdealGraphVisualizer/Upgrade/pom.xml b/visualizer/IdealGraphVisualizer/Upgrade/pom.xml index 433fc9ac11b3..8b7f505e0448 100644 --- a/visualizer/IdealGraphVisualizer/Upgrade/pom.xml +++ b/visualizer/IdealGraphVisualizer/Upgrade/pom.xml @@ -7,24 +7,9 @@ Upgrade nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + org.netbeans.api @@ -52,7 +37,22 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/graalvm/visualizer/upgrader/Copy.java b/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/graalvm/visualizer/upgrader/Copy.java index d549c85453fe..93e2fca335ea 100644 --- a/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/graalvm/visualizer/upgrader/Copy.java +++ b/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/graalvm/visualizer/upgrader/Copy.java @@ -104,7 +104,7 @@ private void copyFolderAttributes(FileObject sourceFolder) throws IOException { } private void copyFile(FileObject sourceFile) throws IOException { - String targetPath = (transformation != null) ? transformation.transformPath(sourceFile.getPath()) : sourceFile.getPath(); + String targetPath = transformation != null ? transformation.transformPath(sourceFile.getPath()) : sourceFile.getPath(); boolean isTransformed = !targetPath.equals(sourceFile.getPath()); FileObject tg = targetRoot.getFileObject(targetPath); try { diff --git a/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/graalvm/visualizer/upgrader/impl/UpgradeFromOldDev.java b/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/graalvm/visualizer/upgrader/impl/UpgradeFromOldDev.java index 3295b29269ce..df756f5037ff 100644 --- a/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/graalvm/visualizer/upgrader/impl/UpgradeFromOldDev.java +++ b/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/graalvm/visualizer/upgrader/impl/UpgradeFromOldDev.java @@ -84,7 +84,7 @@ public static void doImport() { line = line.substring(0, valStart) + replacement + line.substring(valEnd); - start += (replacement.length() - val.length()); + start += replacement.length() - val.length(); } // repackage filter references line = line.replaceAll("com.sun.hotspot.igv", "org.graalvm.visualizer"); // NOI18N diff --git a/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/netbeans/util/Util.java b/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/netbeans/util/Util.java index 17db6f93da12..766ea1002d47 100644 --- a/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/netbeans/util/Util.java +++ b/visualizer/IdealGraphVisualizer/Upgrade/src/main/java/org/netbeans/util/Util.java @@ -116,8 +116,8 @@ public static JDialog createJOptionProgressDialog(JOptionPane p, String title, F sourceFolder = source; Object[] options = p.getOptions(); - JButton bYES = ((JButton) options[0]); - JButton bNO = ((JButton) options[1]); + JButton bYES = (JButton) options[0]; + JButton bNO = (JButton) options[1]; OptionsListener listener = new OptionsListener(p, bYES, bNO); bYES.addActionListener(listener); bNO.addActionListener(listener); diff --git a/visualizer/IdealGraphVisualizer/Util/pom.xml b/visualizer/IdealGraphVisualizer/Util/pom.xml index 549e982c457a..7ed266e9c578 100644 --- a/visualizer/IdealGraphVisualizer/Util/pom.xml +++ b/visualizer/IdealGraphVisualizer/Util/pom.xml @@ -7,30 +7,9 @@ Util nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.util - org.graalvm.visualizer.util.swing - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -99,7 +78,28 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.util + org.graalvm.visualizer.util.swing + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/BoundedZoomAction.java b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/BoundedZoomAction.java index 495422689245..d49c735cf9eb 100644 --- a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/BoundedZoomAction.java +++ b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/BoundedZoomAction.java @@ -68,7 +68,7 @@ private JScrollPane findScrollPane(JComponent component) { return null; } if (component instanceof JScrollPane) { - return ((JScrollPane) component); + return (JScrollPane) component; } Container parent = component.getParent(); if (!(parent instanceof JComponent)) { @@ -95,8 +95,8 @@ public State mouseWheelMoved(Widget widget, WidgetMouseWheelEvent event) { if (scrollPane != null) { viewPosition = new Point(scrollPane.getViewport().getViewPosition()); - xOffset = (mouseLocation.x - viewPosition.x); - yOffset = (mouseLocation.y - viewPosition.y); + xOffset = mouseLocation.x - viewPosition.x; + yOffset = mouseLocation.y - viewPosition.y; viewPosition.x += xOffset; viewPosition.y += yOffset; } diff --git a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/ListenerSupport.java b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/ListenerSupport.java index e5d22897e631..1ce5582b1568 100644 --- a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/ListenerSupport.java +++ b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/ListenerSupport.java @@ -91,6 +91,7 @@ public void changed(U eventData) { /** * Unregisters listener from the source. Must synchronize into EDT */ + @Override public void run() { if (SwingUtilities.isEventDispatchThread()) { source.removeListener(this); diff --git a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/RangeSlider.java b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/RangeSlider.java index 123aa6548a07..9f674a231fe6 100644 --- a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/RangeSlider.java +++ b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/RangeSlider.java @@ -132,10 +132,12 @@ private RangeSliderModel getPaintingModel() { * Scrollable * @see JViewport#getPreferredSize */ + @Override public Dimension getPreferredScrollableViewportSize() { return getPreferredSize(); } + @Override public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) { if (orientation == SwingConstants.VERTICAL) { return 1; @@ -144,14 +146,17 @@ public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, in return (int) (BAR_CIRCLE_SIZE + BAR_CIRCLE_CONNECTOR_SIZE); } + @Override public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) { return orientation == SwingConstants.VERTICAL ? visibleRect.height / 2 : visibleRect.width / 2; } + @Override public boolean getScrollableTracksViewportWidth() { return false; } + @Override public boolean getScrollableTracksViewportHeight() { return true; } @@ -220,7 +225,7 @@ private int getSlots() { private float getXOffset() { int size = getSlots(); float width = (float) getPreferredSize().width; - return (width / (size + 1)); + return width / (size + 1); } private float getEndXPosition(int index) { diff --git a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/RangeSliderModel.java b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/RangeSliderModel.java index 6fef45ab27fa..978c0ea9b84e 100644 --- a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/RangeSliderModel.java +++ b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/RangeSliderModel.java @@ -141,7 +141,7 @@ public void setData(RangeSliderModel model) { } } - protected synchronized final boolean getPositionsDiffers(RangeSliderModel model) { + protected final synchronized boolean getPositionsDiffers(RangeSliderModel model) { return getPositionsDiffers(model.firstPosition, model.secondPosition) || !positions.equals(model.positions); } @@ -149,7 +149,7 @@ private boolean getPositionsDiffers(int firstPosition, int secondPosition) { return (firstPosition != this.firstPosition) || (secondPosition != this.secondPosition); } - protected synchronized final boolean getColorsDiffers(RangeSliderModel model) { + protected final synchronized boolean getColorsDiffers(RangeSliderModel model) { return !this.colors.equals(model.colors); } diff --git a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/swing/ActionUtils.java b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/swing/ActionUtils.java index f3742d8ae893..603913678038 100644 --- a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/swing/ActionUtils.java +++ b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/swing/ActionUtils.java @@ -138,12 +138,9 @@ public static ActionMap populatePopupMenu(JPopupMenu menu, ActionMap am, String } a.isEnabled(); } - Object item; if (a instanceof Presenter.Popup) { - item = menu.add(((Presenter.Popup) a).getPopupPresenter()); } else { - item = menu.add(a); } // end diff --git a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/swing/DropdownButton.java b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/swing/DropdownButton.java index 99c6a79b0def..efbaf9c96b2c 100644 --- a/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/swing/DropdownButton.java +++ b/visualizer/IdealGraphVisualizer/Util/src/main/java/org/graalvm/visualizer/util/swing/DropdownButton.java @@ -132,11 +132,13 @@ public DropdownButton(String text, Icon icon, boolean toolbar, Consumer View nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.view.* - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -188,7 +168,27 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.view.* + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/DiagramScene.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/DiagramScene.java index f2268925d0aa..2b18da1bdbf0 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/DiagramScene.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/DiagramScene.java @@ -584,7 +584,7 @@ public DiagramScene(DiagramViewModel model, TopComponent tc) { //--------------- attaches listeners ----------------------------- - updater.addChangeListener((e) -> fogOfWorkWiget.setValidShape(updater.getValidatedShape())); + updater.addChangeListener(e -> fogOfWorkWiget.setValidShape(updater.getValidatedShape())); this.addObjectSceneListener(selectionChangedListener, ObjectSceneEventType.OBJECT_SELECTION_CHANGED, ObjectSceneEventType.OBJECT_HIGHLIGHTING_CHANGED, ObjectSceneEventType.OBJECT_HOVER_CHANGED); @@ -884,7 +884,7 @@ public void gotoNodes(Set ids, boolean select) { } else { Figure f; if (o instanceof Figure) { - f = ((Figure) o); + f = (Figure) o; } else if (o instanceof Slot) { f = ((Slot) o).getFigure(); } else { @@ -1281,7 +1281,7 @@ public Overlay(DiagramScene scene) { addChild(waitWidget); setOpaque(false); - scene.getScrollPane().getViewport().addChangeListener((e) -> { + scene.getScrollPane().getViewport().addChangeListener(e -> { if (blockScene) { Rectangle newViewRect = scene.getScrollPane().getViewport().getViewRect(); if (!oldviewRect.equals(newViewRect)) { diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/DiagramViewModel.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/DiagramViewModel.java index a9f280eed35e..5ad2ab05e68e 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/DiagramViewModel.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/DiagramViewModel.java @@ -133,7 +133,7 @@ public class DiagramViewModel implements ChangedListener, Diag private final ChangedEvent changedEvent = new ChangedEvent<>(this); - private final ChangedListener filtersChanged = (s) -> { + private final ChangedListener filtersChanged = s -> { LOG.log(Level.FINE, "Filters changed."); propSupport.firePropertyChange(PROP_FILTERS, null, null); diagramChanged(true); @@ -244,7 +244,7 @@ public void setData(DiagramViewModel newModel) { newModel, changed, colorChanged, groupChanged, diagramChanged }); boolean[] alreadyFired = new boolean[1]; - ChangedListener cl = (e) -> { + ChangedListener cl = e -> { alreadyFired[0] = true; }; getChangedEvent().addListener(cl); @@ -302,7 +302,7 @@ protected boolean getDiagramsDiffers(DiagramViewModel newModel) { synchronized (newModel.sync) { d2 = newModel.diagram; } - return (d1 != d2); + return d1 != d2; } public boolean getShowBlocks() { @@ -435,7 +435,7 @@ private DiagramViewModel(TimelineModel time, GraphContainer g, FilterSequence(this); - graphPeerModel.addPropertyChangeListener(PROP_SELECTED_GRAPH, (evt) -> { + graphPeerModel.addPropertyChangeListener(PROP_SELECTED_GRAPH, evt -> { if (DiagramViewModel.this.hasScriptFilter()) { LOG.log(Level.FINE, "Graph changed, clearing Scripts."); filters.setScriptFilter(null, null, false); @@ -443,7 +443,7 @@ private DiagramViewModel(TimelineModel time, GraphContainer g, FilterSequence propSupport.firePropertyChange(RangeSliderModel.PROP_POSITIONS, evt.getOldValue(), evt.getNewValue())); } @@ -477,7 +477,7 @@ public Set getHiddenGraphNodes() { return Collections.unmodifiableSet(hiddenCurrentGraphNodes); } final InputGraph currentGraph = getGraphToView(); - return hiddenCurrentGraphNodes = hiddenNodes.stream().map((id) -> currentGraph.getNode(id)).collect(Collectors.toSet()); + return hiddenCurrentGraphNodes = hiddenNodes.stream().map(id -> currentGraph.getNode(id)).collect(Collectors.toSet()); } @Override @@ -534,7 +534,7 @@ public void showOnly(final Collection nodes) { // allNodes.removeAll(nodes.stream().map(n -> n.getId()).collect(Collectors.toList())); Diagram d = getDiagramToView(); - Collection nonRepresentedNodes = nodes.stream().filter((n) -> !d.getFigure(n).isPresent()).collect(Collectors.toList()); + Collection nonRepresentedNodes = nodes.stream().filter(n -> !d.getFigure(n).isPresent()).collect(Collectors.toList()); InputGraph g = getGraphToView(); for (Integer id : nonRepresentedNodes) { InputNode in = g.getNode(id); @@ -549,8 +549,8 @@ public void showOnly(final Collection nodes) { } } - Set aggregatedNodes = nodes.stream().filter((n) -> !d.getFigure(n).isPresent()).flatMap((in) -> { - return d.forSource(in).stream().filter((f) -> f instanceof Slot).flatMap((s) -> ((Slot) s).getFigure().getSource().getSourceNodes().stream().map(n -> n.getId())); + Set aggregatedNodes = nodes.stream().filter(n -> !d.getFigure(n).isPresent()).flatMap(in -> { + return d.forSource(in).stream().filter(f -> f instanceof Slot).flatMap(s -> ((Slot) s).getFigure().getSource().getSourceNodes().stream().map(n -> n.getId())); }).collect(Collectors.toSet()); allNodes.removeAll(aggregatedNodes); setHiddenNodes(allNodes); @@ -884,7 +884,7 @@ private void diagramFinished(Diagram diagram) { private void finalizeTasks(final List tasks, Diagram finishedDiagram, boolean changed) { if (changed) { - tasks.add(new W((d) -> fireDiagramChanged(), true)); + tasks.add(new W(d -> fireDiagramChanged(), true)); } if (tasks.isEmpty()) { LOG.log(Level.FINE, "No Diagram tasks."); diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/EditorTopComponent.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/EditorTopComponent.java index ad560e6f6760..b265e6a056a1 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/EditorTopComponent.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/EditorTopComponent.java @@ -397,6 +397,7 @@ static class FixedToolbar extends Toolbar implements PopupMenuListener { } } + @Override public Dimension getMinimumSize() { Dimension d = super.getMinimumSize(); d.width = 60; @@ -799,7 +800,7 @@ public void changed(DiagramViewModel source) { }; public void setSelection(PropertyMatcher matcher) { - getModel().withDiagramToView((d) -> { + getModel().withDiagramToView(d -> { Properties.PropertySelector
selector = new Properties.PropertySelector<>(d.getFigures()); List
list = selector.selectMultiple(matcher); setSelectedFigures(list); @@ -816,7 +817,7 @@ public void setSelectedFigures(List
list) { } public void setSelectedNodes(Collection nodes) { - getModel().withDiagramToView((d) -> { + getModel().withDiagramToView(d -> { setSelectedFigures(new ArrayList<>(scene.figuresForNodes(nodes))); }); } @@ -887,7 +888,7 @@ public void expandSuccessors() { } public void showAll() { - getModel().showNot(Collections.emptySet()); + getModel().showNot(Collections.emptySet()); } private Diagram getDiagram() { @@ -958,7 +959,6 @@ static class TitleUpdater implements ChangedListener>, PropertyC private final TimelineModel viewModel; private final DiagramViewModel diagramModel; private final EditorTopComponent target; - private final ChangedListener docL = (e) -> refresh(); public TitleUpdater(DiagramViewModel diagramModel, EditorTopComponent target) { this.diagramModel = diagramModel; diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/ExtendedSatelliteComponent.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/ExtendedSatelliteComponent.java index 7320ca147d79..d6f85697b3ca 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/ExtendedSatelliteComponent.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/ExtendedSatelliteComponent.java @@ -90,9 +90,9 @@ public ExtendedSatelliteComponent(DiagramScene scene) { addMouseListener(this); addMouseMotionListener(this); // react on viewport - scene.getScrollPane().getViewport().addChangeListener((e) -> sceneViewportChanged()); + scene.getScrollPane().getViewport().addChangeListener(e -> sceneViewportChanged()); // listen for extraction, compilation phase changes - scene.getModel().getChangedEvent().addListener((e) -> SwingUtilities.invokeLater(this::update)); + scene.getModel().getChangedEvent().addListener(e -> SwingUtilities.invokeLater(this::update)); sceneSize = scene.getSceneSize(); } @@ -314,7 +314,7 @@ private boolean verifyImageScale(boolean invalidate) { return false; } - boolean inv = (imageWidth != vw || imageHeight != vh); + boolean inv = imageWidth != vw || imageHeight != vh; if (image == null || inv) { // do not invalidate during repaint if (inv && invalidate) { diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SceneUpdater.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SceneUpdater.java index 00ab6e06e194..6c1ae8e8b0e1 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SceneUpdater.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SceneUpdater.java @@ -126,8 +126,8 @@ public SceneUpdater(DiagramScene scene) { this.model = scene.getModel(); lastDiagram = model.getDiagramToView(); // PENDING: remove listener, if the scene (topcomponent) closes - scene.getScrollPane().getViewport().addChangeListener((e) -> refreshView(false)); - model.getDiagramChangedEvent().addListener((e) -> SwingUtilities.invokeLater(this::forceViewRefresh)); + scene.getScrollPane().getViewport().addChangeListener(e -> refreshView(false)); + model.getDiagramChangedEvent().addListener(e -> SwingUtilities.invokeLater(this::forceViewRefresh)); String sceneName = model.getContainer().getName(); processor = new RequestProcessor("SceneUpdater - " + sceneName); @@ -135,7 +135,7 @@ public SceneUpdater(DiagramScene scene) { // when the user closes the diagram and then reopens another one. TopComponent.getRegistry().addPropertyChangeListener( WeakListeners.propertyChange( - topRegistryListener = (e) -> { + topRegistryListener = e -> { if (!TopComponent.Registry.PROP_TC_CLOSED.equals(e.getPropertyName())) { return; } @@ -247,8 +247,8 @@ private String makeDiagramLog() { "\tGraph name: " + lastDiagram.getGraph().getName() + ".\n" + "\tnodes count: " + lastDiagram.getGraph().getNodeCount() + ".\n" + "\tfigures count: " + lastDiagram.getFigures().size() + ".\n" + - "\tvisible figures count: " + lastDiagram.getFigures().stream().filter((n) -> n.isVisible()).count() + ".\n" + - "\tboundary figures count: " + lastDiagram.getFigures().stream().filter((n) -> n.isBoundary()).count() + "."; + "\tvisible figures count: " + lastDiagram.getFigures().stream().filter(n -> n.isVisible()).count() + ".\n" + + "\tboundary figures count: " + lastDiagram.getFigures().stream().filter(n -> n.isBoundary()).count() + "."; return sb; } @@ -330,7 +330,7 @@ public boolean refreshView(boolean blockDisplay) { } LOG.log(Level.FINE, "New viewport update task {2}, for rectangle {0}, current view rect {1}", new Object[]{upd.getExtendedBounds(), viewRect, upd}); viewportUpdate = upd; - viewportUpdate.schedule(VIEWPORT_UPDATE_DELAY).onCompletion((e) -> { + viewportUpdate.schedule(VIEWPORT_UPDATE_DELAY).onCompletion(e -> { synchronized (this) { if (upd != viewportUpdate) { return; @@ -364,7 +364,7 @@ void cleanViewport() { } LOG.log(Level.FINE, "Scheduling viewport cleanup task"); SceneUpdaterTask.Cleaner cl = new SceneUpdaterTask.Cleaner(scene, processor, this::limitUpdatedRectangle); - cl.schedule(VIEWPORT_CLEAN_DELAY).onCompletion((e) -> { + cl.schedule(VIEWPORT_CLEAN_DELAY).onCompletion(e -> { synchronized (this) { if (viewportCleanup != cl) { return; diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SceneUpdaterTask.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SceneUpdaterTask.java index 1126390ce0ad..e007751c2667 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SceneUpdaterTask.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SceneUpdaterTask.java @@ -855,7 +855,7 @@ private void moveFigures(Iterable
figs, Iterable blocks) { if (w.isVisible()) { w.setBoundary(f.isBoundary()); Point p2 = p.getLocation(); - if ((visibleFigureCount <= ANIMATION_LIMIT && oldVisibleWidgets != null && oldVisibleWidgets.contains(w))) { + if (visibleFigureCount <= ANIMATION_LIMIT && oldVisibleWidgets != null && oldVisibleWidgets.contains(w)) { scene.animateMoveWidget(w, p2); } else { scene.moveWidget(w, p2); @@ -876,7 +876,7 @@ private void moveFigures(Iterable
figs, Iterable blocks) { if (w.isVisible()) { // make a copy Rectangle r = new Rectangle(bounds.getLocation(), bounds.getSize()); - if ((visibleFigureCount <= ANIMATION_LIMIT && oldVisibleWidgets != null && oldVisibleWidgets.contains(w))) { + if (visibleFigureCount <= ANIMATION_LIMIT && oldVisibleWidgets != null && oldVisibleWidgets.contains(w)) { scene.animateBounds(w, r); } else { scene.moveWidget(w, r); @@ -1099,7 +1099,7 @@ private boolean freeWidgets() { protected void processPhase(Phase phase) { switch (phase) { case PREPARE: - allWidgets = scene.getObjects().stream().parallel().map((o) -> scene.getWidget(o)). + allWidgets = scene.getObjects().stream().parallel().map(o -> scene.getWidget(o)). collect(Collectors.toList()); nextPhase = Phase.UPDATE_A; return; diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SliderPanel.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SliderPanel.java index d6d08a8bff2b..6334969db5e3 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SliderPanel.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/SliderPanel.java @@ -77,7 +77,7 @@ public SliderPanel(String primaryType, TimelineModel timeline) { this.graphTypes = Lookup.getDefault().lookup(GraphTypes.class); initComponents(); - timeline.addPropertyChangeListener((pe) -> { + timeline.addPropertyChangeListener(pe -> { if (TimelineModel.PROP_PARTITIONS.equals(pe.getPropertyName())) { updateSliders(); } diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/DiagramCache.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/DiagramCache.java index af297452dd97..02caaa5eaafd 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/DiagramCache.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/DiagramCache.java @@ -129,7 +129,7 @@ public synchronized DiagramCacheBase makeCache(DiagramViewModel model, Diagram b return inputGraphDiagramCache; } - private final static class GraphTextKey { + private static final class GraphTextKey { final InputGraph graph; final String nodeText; final int hash; @@ -404,7 +404,7 @@ public void run() { } } - private final static class HiddenNodesSet extends HashSet { + private static final class HiddenNodesSet extends HashSet { final int hash; final boolean showNodeHull; diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/FilterView.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/FilterView.java index 91206feb8438..263a00db0200 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/FilterView.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/FilterView.java @@ -77,7 +77,7 @@ private Optional
find(int id) { } public void select(int nodeID) { - find(nodeID).ifPresent((f) -> select(f)); + find(nodeID).ifPresent(f -> select(f)); } @@ -99,12 +99,12 @@ public Collection
getSelected() { } public void extract(int nodeID) { - find(nodeID).ifPresent((f) -> extract(f)); + find(nodeID).ifPresent(f -> extract(f)); } public void addExtract(int nodeID) { - find(nodeID).ifPresent((f) -> addExtract(f)); + find(nodeID).ifPresent(f -> addExtract(f)); } @@ -119,7 +119,7 @@ private Collection
findExtractedFigures() { Collection hidden = model.getHiddenNodes(); Diagram dg = diagram; Collection
figures = dg.forSources(hidden, Figure.class).stream().filter( - (f) -> f.isVisible()).collect(Collectors.toList()); + f -> f.isVisible()).collect(Collectors.toList()); return new HashSet<>(figures); } @@ -145,7 +145,7 @@ private void doSelection() { private void doExtract() { if (showAll) { - model.showNot(Collections.emptySet()); + model.showNot(Collections.emptySet()); return; } if (toExtract == null) { diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/GraphTypeContainer.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/GraphTypeContainer.java index facd5616a6c4..b94135ca2968 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/GraphTypeContainer.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/GraphTypeContainer.java @@ -52,7 +52,7 @@ public class GraphTypeContainer implements GraphContainer { private final Predicate acceptor; private final ChangedEvent changeEvent = new ChangedEvent<>(this); private final String type; - private final ChangedListener refireListener = (e) -> { + private final ChangedListener refireListener = e -> { filteredGraphs = null; changeEvent.fire(); }; @@ -170,12 +170,12 @@ public int getGraphsCount() { @Override public Set getChildNodeIds() { - return getGraphs().parallelStream().flatMap((e) -> e.getNodeIds().stream()).collect(Collectors.toSet()); + return getGraphs().parallelStream().flatMap(e -> e.getNodeIds().stream()).collect(Collectors.toSet()); } @Override public Set getChildNodes() { - return getGraphs().parallelStream().flatMap((e) -> e.getNodes().stream()).collect(Collectors.toSet()); + return getGraphs().parallelStream().flatMap(e -> e.getNodes().stream()).collect(Collectors.toSet()); } @Override diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/GraphViewerImplementation.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/GraphViewerImplementation.java index 42db49f2ca89..8ceaa43f6bfc 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/GraphViewerImplementation.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/GraphViewerImplementation.java @@ -260,7 +260,7 @@ private void openSimple(InputGraph graph, boolean activate, BiConsumer { + tc.getModel().withDiagramToView(dg -> { InputGraph g = dg.getGraph(); ArrayList ids = new ArrayList<>(g.getNodeIds()); Collections.sort(ids);//Ids aren't sorted in graph @@ -425,12 +425,12 @@ protected Stream viewers() { @Override public List find(Group g) { - return viewers().filter((v) -> v.getModel().getContainer().getContentOwner() == g).collect(Collectors.toList()); + return viewers().filter(v -> v.getModel().getContainer().getContentOwner() == g).collect(Collectors.toList()); } @Override public List find(InputGraph g) { - return viewers().filter((v) -> v.getModel().getGraphToView() == g).collect(Collectors.toList()); + return viewers().filter(v -> v.getModel().getGraphToView() == g).collect(Collectors.toList()); } @Override @@ -440,7 +440,7 @@ public List findCompatible(InputGraph g) { if (gtype == null) { return find(gg); } - return viewers().filter((v) -> { + return viewers().filter(v -> { GraphContainer c = v.getModel().getContainer(); if (c.getContentOwner() != gg) { return false; diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/TimelineModelImpl.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/TimelineModelImpl.java index 58df04d9cb4b..6d5ad8405def 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/TimelineModelImpl.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/impl/TimelineModelImpl.java @@ -340,7 +340,7 @@ void refresh(List contents) { continue; } usedTypes.add(t); - indices.computeIfAbsent(t, (k) -> new ArrayList<>(els.size())).add(b); + indices.computeIfAbsent(t, k -> new ArrayList<>(els.size())).add(b); b++; } ncmap.keySet().retainAll(usedTypes); diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/widgets/actions/BoundedZoomAction.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/widgets/actions/BoundedZoomAction.java index 5d5be72bd26c..42f4dc29f215 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/widgets/actions/BoundedZoomAction.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/widgets/actions/BoundedZoomAction.java @@ -69,7 +69,7 @@ private JScrollPane findScrollPane(JComponent component) { return null; } if (component instanceof JScrollPane) { - return ((JScrollPane) component); + return (JScrollPane) component; } Container parent = component.getParent(); if (!(parent instanceof JComponent)) { @@ -98,8 +98,8 @@ public State mouseWheelMoved(Widget widget, WidgetMouseWheelEvent event) { Dimension componentSize = new Dimension(scene.getView().getPreferredSize()); if (scrollPane != null) { viewPosition = scrollPane.getViewport().getViewPosition(); - xOffset = (mouseLocation.x - viewPosition.x); - yOffset = (mouseLocation.y - viewPosition.y); + xOffset = mouseLocation.x - viewPosition.x; + yOffset = mouseLocation.y - viewPosition.y; viewPosition.x += xOffset; viewPosition.y += yOffset; } diff --git a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/widgets/actions/CustomizablePanAction.java b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/widgets/actions/CustomizablePanAction.java index 07638e8d7733..ae0f4ea7cfab 100644 --- a/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/widgets/actions/CustomizablePanAction.java +++ b/visualizer/IdealGraphVisualizer/View/src/main/java/org/graalvm/visualizer/view/widgets/actions/CustomizablePanAction.java @@ -87,7 +87,7 @@ private JScrollPane findScrollPane(JComponent component) { if (component == null) return null; if (component instanceof JScrollPane) - return ((JScrollPane) component); + return (JScrollPane) component; Container parent = component.getParent(); if (!(parent instanceof JComponent)) return null; diff --git a/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/DiagramViewModelTest.java b/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/DiagramViewModelTest.java index 07e0140c0eea..b9d323000147 100644 --- a/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/DiagramViewModelTest.java +++ b/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/DiagramViewModelTest.java @@ -289,7 +289,7 @@ public void testSelected() throws Exception {//changes colors!! Colorizer timelineColorizer = new Colorizer(timeline.getPrimaryPartition(), timeline.getPrimaryRange()); // DiagramViewModel do not directly call the colorizer. instance.addPropertyChangeListener(DiagramViewModel.PROP_SELECTED_NODES, - (e) -> timelineColorizer.setTrackedNodes( + e -> timelineColorizer.setTrackedNodes( instance.getSelectedNodes().stream().map(InputNode::getId).collect(Collectors.toSet()))); Set expResultNodes = new HashSet<>(); Set
expResultFigures = new HashSet<>(); @@ -319,8 +319,8 @@ public void testSelected() throws Exception {//changes colors!! testGetSelectedFigures(expResultFigures); expResultFigures.removeIf(x -> x.getSource().getSourceNodes().contains(N4)); - instance.withDiagramToView((d) -> d.getFigures().stream() - .filter((f) -> (f.getSource().getSourceNodes().contains(N3))) + instance.withDiagramToView(d -> d.getFigures().stream() + .filter(f -> (f.getSource().getSourceNodes().contains(N3))) .forEach(expResultFigures::add)).get(); assertFired(0, 1, 0, 0, 1, 0); diff --git a/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/GraphViewerImplementationTest.java b/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/GraphViewerImplementationTest.java index 141aa1b11eca..52752ace3260 100644 --- a/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/GraphViewerImplementationTest.java +++ b/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/GraphViewerImplementationTest.java @@ -177,6 +177,7 @@ public void addDiagramViewerListener(DiagramViewerListener l) { public void removeDiagramViewerListener(DiagramViewerListener l) { } + @Override public Set nodesForFigure(Figure f) { return Collections.emptySet(); } diff --git a/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/MockViewerLocator.java b/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/MockViewerLocator.java index edbcbdaf1f67..86d57319e25b 100644 --- a/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/MockViewerLocator.java +++ b/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/MockViewerLocator.java @@ -71,7 +71,7 @@ public List getViewers() { @Override public List find(Group g) { - return viewers.stream().filter((v) -> v.getModel().getContainer() == g).collect(Collectors.toList()); + return viewers.stream().filter(v -> v.getModel().getContainer() == g).collect(Collectors.toList()); } @Override @@ -92,8 +92,9 @@ public void addChangeListener(ChangeListener l) { public void removeChangeListener(ChangeListener l) { } + @Override public List find(InputGraph graph) { - return viewers.stream().filter((v) -> v.getModel().getGraphToView() == graph).collect(Collectors.toList()); + return viewers.stream().filter(v -> v.getModel().getGraphToView() == graph).collect(Collectors.toList()); } @Override diff --git a/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/impl/GraphTypeContainerTest.java b/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/impl/GraphTypeContainerTest.java index 583487433258..4a61ddcae107 100644 --- a/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/impl/GraphTypeContainerTest.java +++ b/visualizer/IdealGraphVisualizer/View/src/test/java/org/graalvm/visualizer/view/impl/GraphTypeContainerTest.java @@ -39,9 +39,9 @@ public class GraphTypeContainerTest extends NbTestCase { private final Group topGroup; private static Predicate matcher - = (graph) -> true; + = graph -> true; private static Predicate matcher2 - = (graph) -> graph.getName().contains("init"); + = graph -> graph.getName().contains("init"); public GraphTypeContainerTest(String name) throws Exception { super(name); diff --git a/visualizer/IdealGraphVisualizer/ViewerApi/pom.xml b/visualizer/IdealGraphVisualizer/ViewerApi/pom.xml index 984688f658b1..eb47796b8fa2 100644 --- a/visualizer/IdealGraphVisualizer/ViewerApi/pom.xml +++ b/visualizer/IdealGraphVisualizer/ViewerApi/pom.xml @@ -7,29 +7,9 @@ ViewerApi nbm - - - - org.apache.netbeans.utilities - nbm-maven-plugin - true - - - org.graalvm.visualizer.view.api - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - + + UTF-8 + ${project.groupId} @@ -62,7 +42,27 @@ ${netbeans.version} - - UTF-8 - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + true + + + org.graalvm.visualizer.view.api + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/visualizer/IdealGraphVisualizer/ViewerApi/src/main/java/org/graalvm/visualizer/view/api/DiagramViewer.java b/visualizer/IdealGraphVisualizer/ViewerApi/src/main/java/org/graalvm/visualizer/view/api/DiagramViewer.java index 879799cd58e4..1a2092b0bd7f 100644 --- a/visualizer/IdealGraphVisualizer/ViewerApi/src/main/java/org/graalvm/visualizer/view/api/DiagramViewer.java +++ b/visualizer/IdealGraphVisualizer/ViewerApi/src/main/java/org/graalvm/visualizer/view/api/DiagramViewer.java @@ -56,6 +56,7 @@ enum InteractionMode { public void paint(Graphics2D svgGenerator); + @Override public Lookup getLookup(); public JComponent createSatelliteView(); diff --git a/visualizer/IdealGraphVisualizer/ViewerApi/src/main/java/org/graalvm/visualizer/view/api/DiagramViewerLocator.java b/visualizer/IdealGraphVisualizer/ViewerApi/src/main/java/org/graalvm/visualizer/view/api/DiagramViewerLocator.java index 89260b18a42f..513957c8d175 100644 --- a/visualizer/IdealGraphVisualizer/ViewerApi/src/main/java/org/graalvm/visualizer/view/api/DiagramViewerLocator.java +++ b/visualizer/IdealGraphVisualizer/ViewerApi/src/main/java/org/graalvm/visualizer/view/api/DiagramViewerLocator.java @@ -64,6 +64,7 @@ public default InputGraph getActiveGraph() { * * @return */ + @Override public List getViewers(); /** @@ -74,6 +75,7 @@ public default InputGraph getActiveGraph() { * @param g group which the viewer should display * @return list of viewers */ + @Override public List find(Group g); diff --git a/visualizer/IdealGraphVisualizer/VisualizerUI/pom.xml b/visualizer/IdealGraphVisualizer/VisualizerUI/pom.xml index 851123bf2e9f..d8d288e08da2 100644 --- a/visualizer/IdealGraphVisualizer/VisualizerUI/pom.xml +++ b/visualizer/IdealGraphVisualizer/VisualizerUI/pom.xml @@ -7,6 +7,16 @@ VisualizerUI nbm + + UTF-8 + + + + org.netbeans.api + org-netbeans-api-annotations-common + ${netbeans.version} + + @@ -25,14 +35,4 @@ - - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - - UTF-8 - diff --git a/visualizer/IdealGraphVisualizer/application/pom.xml b/visualizer/IdealGraphVisualizer/application/pom.xml index 73daec8af81d..d3f6b3b9fd42 100644 --- a/visualizer/IdealGraphVisualizer/application/pom.xml +++ b/visualizer/IdealGraphVisualizer/application/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - IdealGraphVisualizer-app org.graalvm.visualizer IdealGraphVisualizer-parent @@ -8,89 +7,11 @@ IdealGraphVisualizer-app nbm-application - - - - org.apache.netbeans.utilities - nbm-maven-plugin - - src/main/resources/${brandingToken}.conf - src/main/resources/${brandingToken}.clusters - src/main/launchers/bin - - - - default-standalone-zip - - standalone-zip - - - ${brandingToken}-${project.version} - - - - - - - maven-resources-plugin - 2.6 - - - install-mac-icon - package - - copy-resources - - - ${basedir}/target/${brandingToken} - UTF-8 - - - ${basedir}/src/main/resources - - ${brandingToken}.icns - - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.6 - - - zip-artifacts - package - - run - - - - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.2 - - - ${all.clusters} - ${brandingToken} - - - - - + IdealGraphVisualizer-app + + UTF-8 + ${project.build.directory}/${brandingToken} + ${project.groupId} @@ -1594,10 +1515,89 @@ 2.8.9 - - UTF-8 - ${project.build.directory}/${brandingToken} - + + + + org.apache.netbeans.utilities + nbm-maven-plugin + + src/main/resources/${brandingToken}.conf + src/main/resources/${brandingToken}.clusters + src/main/launchers/bin + + + + default-standalone-zip + + standalone-zip + + + ${brandingToken}-${project.version} + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + + + install-mac-icon + package + + copy-resources + + + ${project.basedir}/target/${brandingToken} + UTF-8 + + + ${project.basedir}/src/main/resources + + ${brandingToken}.icns + + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.6 + + + zip-artifacts + package + + run + + + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${all.clusters} + ${brandingToken} + + + + + deployment diff --git a/visualizer/IdealGraphVisualizer/branding/pom.xml b/visualizer/IdealGraphVisualizer/branding/pom.xml index 4467beaa0292..3096285e374a 100644 --- a/visualizer/IdealGraphVisualizer/branding/pom.xml +++ b/visualizer/IdealGraphVisualizer/branding/pom.xml @@ -1,6 +1,5 @@ 4.0.0 - IdealGraphVisualizer-branding org.graalvm.visualizer IdealGraphVisualizer-parent @@ -8,16 +7,27 @@ IdealGraphVisualizer-branding nbm + IdealGraphVisualizer-branding + + UTF-8 + + + + org.netbeans.api + org-netbeans-api-annotations-common + ${netbeans.version} + + - ${basedir}/src/main/nbm-branding + ${project.basedir}/src/main/nbm-branding **/* true - ${basedir}/target/filtered-nbm-branding + ${project.basedir}/target/filtered-nbm-branding @@ -38,7 +48,7 @@ nbm-maven-plugin - ${basedir}/target/filtered-nbm-branding + ${project.basedir}/target/filtered-nbm-branding @@ -53,14 +63,4 @@ - - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - - UTF-8 - diff --git a/visualizer/IdealGraphVisualizer/pom.xml b/visualizer/IdealGraphVisualizer/pom.xml index eae0c12566ac..04000b6f49ff 100644 --- a/visualizer/IdealGraphVisualizer/pom.xml +++ b/visualizer/IdealGraphVisualizer/pom.xml @@ -1,19 +1,106 @@ 4.0.0 - IdealGraphVisualizer-parent org.graalvm.visualizer IdealGraphVisualizer-parent 1.23-SNAPSHOT pom + IdealGraphVisualizer-parent + + branding + application + Settings + Data + VisualizerUI + Difference + PolyglotRunner + SettingsUI + Util + HierarchicalLayout + Layout + Bytecodes + ControlFlow + Coordinator + Filter + FilterProfiles + FilterWindow + Graal + Graph + GraphSearch + JSONExporter + JavaSources + NetworkConnection + SelectionCoordinator + Shell + SourceRepository + Upgrade + View + ViewerApi + scm:git:git@github.com:oracle/graal.git - HEAD - + HEAD + + + RELEASE260 + idealgraphvisualizer + 1.0.2 + 4.8 + 3.10.1 + 3.2.2 + 3.1.0 + 4.13.2 + 1.14 + 1.3.29 + 1.5.8 + + + org.openrewrite.maven + rewrite-maven-plugin + 6.15.0 + + + org.openrewrite.maven.BestPractices + org.openrewrite.maven.cleanup.PrefixlessExpressions + org.openrewrite.staticanalysis.JavaApiBestPractices + org.openrewrite.staticanalysis.LowercasePackage + org.openrewrite.staticanalysis.MissingOverrideAnnotation + org.openrewrite.staticanalysis.ModifierOrder + org.openrewrite.staticanalysis.NoFinalizer + org.openrewrite.staticanalysis.RemoveUnusedPrivateFields + org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods + org.openrewrite.staticanalysis.UnnecessaryCloseInTryWithResources + org.openrewrite.staticanalysis.UnnecessaryExplicitTypeArguments + org.openrewrite.staticanalysis.UnnecessaryParentheses + org.openrewrite.staticanalysis.UnnecessaryReturnAsLastStatement + tech.picnic.errorprone.refasterrules.BugCheckerRulesRecipes + tech.picnic.errorprone.refasterrules.FileRulesRecipes + tech.picnic.errorprone.refasterrules.SuggestedFixRulesRecipes + + + + **DiagramCacheTask.java + + true + true + + + + org.openrewrite.recipe + rewrite-third-party + 0.24.3 + + + org.openrewrite.recipe + rewrite-static-analysis + 2.14.0 + + + org.apache.netbeans.utilities nbm-maven-plugin @@ -86,51 +173,22 @@ + + + org.openrewrite.maven + rewrite-maven-plugin + + + + verify + + dryRun + + + + + - - branding - application - Settings - Data - VisualizerUI - Difference - PolyglotRunner - SettingsUI - Util - HierarchicalLayout - Layout - Bytecodes - ControlFlow - Coordinator - Filter - FilterProfiles - FilterWindow - Graal - Graph - GraphSearch - JSONExporter - JavaSources - NetworkConnection - SelectionCoordinator - Shell - SourceRepository - Upgrade - View - ViewerApi - - - RELEASE260 - idealgraphvisualizer - 1.0.2 - 4.8 - 3.10.1 - 3.2.2 - 3.1.0 - 4.13.2 - 1.14 - 1.3.29 - 1.5.8 - jdk-24-workarounds