Switch order of literals to prevent NullPointerException

planetlevel · Feb 13, 2024 · 365d7b6 · 365d7b6
1 parent a4d687b
commit 365d7b6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/org/openolly/MethodLocator.java b/src/main/java/org/openolly/MethodLocator.java
@@ -79,7 +79,7 @@ public String methodName() {
 	}
 
 	public boolean isConstructor() {
-		return method.equals( "<init>" );
+		return "<init>".equals (method );
 	}
 
 	public boolean isNegative() {

diff --git a/src/main/java/org/openolly/config/ConfigReader.java b/src/main/java/org/openolly/config/ConfigReader.java
@@ -68,7 +68,7 @@ public static void load( File yaml ) throws IOException {
 					logger.atWarning().log("[JOT] WARNING: " + entry.name + " from " + yaml + " already loaded. Skipping." );
 				}
 
-				else if ( entry.name.equals("example")) {					
+				else if ( "example".equals(entry.name)) {					
 					//System.err.println( "[JOT] WARNING: Found 'example' JOT in " + yaml + ". Skipping." );
 					logger.atWarning().log("[JOT] WARNING: Found 'example' JOT in " + yaml + ". Skipping." );
 				}

diff --git a/src/main/java/org/openolly/reporting/Report.java b/src/main/java/org/openolly/reporting/Report.java
@@ -244,7 +244,7 @@ public synchronized void dump() {
 		//System.err.print( " " );
 		out += " ";
 		for ( String col : table.columnKeySet() ) {
-			if ( !col.equals("|||" ) ) {
+			if ( !"|||".equals(col ) ) {
 				int colWidth = getMaxWidth( col );
 				String under2 = StringUtils.repeat( "-", colWidth );
 				//System.err.print( under2 );
@@ -258,7 +258,7 @@ public synchronized void dump() {
 
 		// print data
 		for ( String row : table.rowKeySet() ) {
-			if ( !row.equals( "|||" ) ) {
+			if ( !"|||".equals (row ) ) {
 				//System.err.print( StringUtils.rightPad(row,rowNameColWidth," " ).substring(0,rowNameColWidth));
 				out += StringUtils.rightPad(row,rowNameColWidth," " ).substring(0,rowNameColWidth);
 				//System.err.print( " " );

diff --git a/src/main/java/org/openolly/reporting/RouteGraph.java b/src/main/java/org/openolly/reporting/RouteGraph.java
@@ -39,11 +39,11 @@ public static void update(Trace t) {
 
 			Event tail = route;
 			for ( Event event : t.getEvents() ) {
-				if ( !event.getRule().equals( "route" ) ) {
+				if ( !"route".equals (event.getRule() ) ) {
 					event = findExistingEventInRoute( route, event );
 					graph.putEdge( tail, event );
 					tail = event;
-					if ( event.getRule().equals( "forward" ) ) {
+					if ( "forward".equals (event.getRule() ) ) {
 						route = event;
 					}
 				}