Skip to content

Commit 6ab518a

Browse files
committed
code simplification
1 parent 28e492d commit 6ab518a

File tree

64 files changed

+129
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+129
-139
lines changed

visualvm/host/src/org/graalvm/visualvm/host/impl/HostCustomizer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@ public void run() {
170170
displaynameField.setEnabled(displaynameCheckbox.isSelected());
171171

172172
boolean hostValid = !hostname.isEmpty() && !displayname.isEmpty();
173-
boolean settingsValid = settingsPanel == null ? true :
174-
settingsPanel.settingsValid();
173+
boolean settingsValid = settingsPanel == null || settingsPanel.settingsValid();
175174

176175
okButton.setEnabled(hostValid && settingsValid);
177176
}

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public int hashCode() {
5454

5555
@Override
5656
public boolean equals(Object o) {
57-
return o instanceof JFRGenericClass ? type.equals(((JFRGenericClass)o).type) : false;
57+
return o instanceof JFRGenericClass && type.equals(((JFRGenericClass) o).type);
5858
}
5959

6060
}

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public int hashCode() {
277277

278278
@Override
279279
public boolean equals(Object o) {
280-
return o instanceof JFRGenericEvent ? item.equals(((JFRGenericEvent)o).item) : false;
280+
return o instanceof JFRGenericEvent && item.equals(((JFRGenericEvent) o).item);
281281
}
282282

283283

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericEventType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public int hashCode() {
105105

106106
@Override
107107
public boolean equals(Object o) {
108-
return o instanceof JFRGenericEventType ? type.equals(((JFRGenericEventType)o).type) : false;
108+
return o instanceof JFRGenericEventType && type.equals(((JFRGenericEventType) o).type);
109109
}
110110

111111
}

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public int hashCode() {
6767

6868
@Override
6969
public boolean equals(Object o) {
70-
return o instanceof JFRGenericMethod ? method.equals(((JFRGenericMethod)o).method) : false;
70+
return o instanceof JFRGenericMethod && method.equals(((JFRGenericMethod) o).method);
7171
}
7272

7373
}

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericStackFrame.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public int hashCode() {
7676

7777
@Override
7878
public boolean equals(Object o) {
79-
return o instanceof JFRGenericStackFrame ? stackFrame.equals(((JFRGenericStackFrame)o).stackFrame) : false;
79+
return o instanceof JFRGenericStackFrame && stackFrame.equals(((JFRGenericStackFrame) o).stackFrame);
8080
}
8181

8282
}

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericStackTrace.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public int hashCode() {
6969

7070
@Override
7171
public boolean equals(Object o) {
72-
return o instanceof JFRGenericStackTrace ? stackTrace.equals(((JFRGenericStackTrace)o).stackTrace) : false;
72+
return o instanceof JFRGenericStackTrace && stackTrace.equals(((JFRGenericStackTrace) o).stackTrace);
7373
}
7474

7575
}

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericThread.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public int hashCode() {
6161

6262
@Override
6363
public boolean equals(Object o) {
64-
return o instanceof JFRGenericThread ? thread.equals(((JFRGenericThread)o).thread) : false;
64+
return o instanceof JFRGenericThread && thread.equals(((JFRGenericThread) o).thread);
6565
}
6666

6767
}

visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/DisplayableSupport.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ final class DisplayableSupport {
7979
new RecordedClassLoaderProcessor()
8080
};
8181

82-
private static final Set<String> PRIMITIVE_NUMERIC = new HashSet<>(Arrays.asList(new String[] {
83-
"byte", "short", "int", "long", "char", "float", "double" // char?
84-
}));
82+
private static final Set<String> PRIMITIVE_NUMERIC = new HashSet<>(Arrays.asList("byte", "short", "int", "long", "char", "float", "double" // char?
83+
));
8584

8685

8786
static Iterator<ValueDescriptor> displayableValueDescriptors(final EventType type, final boolean includeExperimental) {

visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/JFRJDK11Class.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public int hashCode() {
5454

5555
@Override
5656
public boolean equals(Object o) {
57-
return o instanceof JFRJDK11Class ? rclass.equals(((JFRJDK11Class)o).rclass) : false;
57+
return o instanceof JFRJDK11Class && rclass.equals(((JFRJDK11Class) o).rclass);
5858
}
5959

6060
}

0 commit comments

Comments
 (0)