Merging collapsible if statements increases the code's readability

src/main/java/org/ggp/base/apps/kiosk/GameGUI.java

@@ -136,12 +136,10 @@ public void actionPerformed(ActionEvent e) {
 
         if(e.getSource() == clearSelectionButton) {
             theCanvas.clearMoveSelection();
-        } else if(e.getSource() == submitMoveButton) {
-            if(workingMove != null) {
-                moveBeingSubmitted = true;
-                updateControls();
-                notifyObservers(new MoveSelectedEvent(workingMove));
-            }
+        } else if(e.getSource() == submitMoveButton && workingMove != null) {
+            moveBeingSubmitted = true;
+            updateControls();
+            notifyObservers(new MoveSelectedEvent(workingMove));
         }
     }
 

src/main/java/org/ggp/base/apps/server/scheduling/Scheduler.java

@@ -139,11 +139,9 @@ private synchronized void doSchedule(PendingMatch spec) {
                 File matchFile = new File(matchesDir, match.getMatchId() + ".json");
                 gameServer.startSavingToFilename(matchFile.getAbsolutePath());
             }
-            if (spec.shouldPublish) {
-                if (!match.getGame().getRepositoryURL().contains("127.0.0.1")) {
-                    gameServer.startPublishingToSpectatorServer("http://matches.ggp.org/");
-                    gameServer.setForceUsingEntireClock();
-                }
+            if (spec.shouldPublish && !match.getGame().getRepositoryURL().contains("127.0.0.1")) {
+                gameServer.startPublishingToSpectatorServer("http://matches.ggp.org/");
+                gameServer.setForceUsingEntireClock();
             }
 
             gameServers.put(spec.matchID, new WeakReference<GameServer>(gameServer));

src/main/java/org/ggp/base/util/gdl/GdlUtils.java

@@ -205,9 +205,8 @@ private static boolean containsTerm(List<GdlTerm> body, GdlTerm term) {
         for(GdlTerm curTerm : body) {
             if(curTerm.equals(term))
                 return true;
-            if(curTerm instanceof GdlFunction) {
-                if(containsTerm(((GdlFunction) curTerm).getBody(), term))
-                    return true;
+            if(curTerm instanceof GdlFunction && containsTerm(((GdlFunction) curTerm).getBody(), term)) {
+                return true;
             }
         }
         return false;

src/main/java/org/ggp/base/util/gdl/model/assignments/AssignmentsFactory.java

@@ -48,9 +48,8 @@ public static Assignments getAssignmentsWithRecursiveInput(GdlRule rule,
         //literals.
         List<GdlSentence> matchingLiterals = new ArrayList<GdlSentence>();
         for(GdlLiteral literal : rule.getBody())
-            if(literal instanceof GdlSentence)
-                if(form.matches((GdlSentence) literal))
-                    matchingLiterals.add((GdlSentence) literal);
+            if(literal instanceof GdlSentence && form.matches((GdlSentence) literal))
+                matchingLiterals.add((GdlSentence) literal);
 
         List<Assignments> assignmentsList = new ArrayList<Assignments>();
         for(GdlSentence matchingLiteral : matchingLiterals) {

src/main/java/org/ggp/base/util/gdl/model/assignments/IterationOrderCandidate.java

@@ -292,13 +292,11 @@ private List<IterationOrderCandidate> getFunctionAddedChildren(boolean analyticF
             //Non-producible vars get iterated over before we start
             //deciding which functions to add
             for(GdlVariable var : varsToAssign) {
-                if(!varOrdering.contains(var)) {
-                    if(!functionsProducingVars.containsKey(var)) {
-                        //Add var to the ordering
-                        varOrdering.add(var);
-                        functionalConjunctIndices.add(-1);
-                        varSources.add(-1);
-                    }
+                if(!varOrdering.contains(var) && !functionsProducingVars.containsKey(var)) {
+                    //Add var to the ordering
+                    varOrdering.add(var);
+                    functionalConjunctIndices.add(-1);
+                    varSources.add(-1);
                 }
             }
 

src/main/java/org/ggp/base/util/gdl/transforms/CondensationIsolator.java

@@ -360,9 +360,8 @@ else if(literal instanceof GdlDistinct || literal instanceof GdlNot)
             for(GdlVariable varNeeded : varsNeeded) {
                 Set<GdlLiteral> suppliers = new HashSet<GdlLiteral>();
                 for(GdlLiteral literal : rule.getBody())
-                    if(literal instanceof GdlRelation)
-                        if(GdlUtils.getVariables(literal).contains(varNeeded))
-                            suppliers.add(literal);
+                    if(literal instanceof GdlRelation && GdlUtils.getVariables(literal).contains(varNeeded)) 
+                        suppliers.add(literal);
                 candidateSuppliersList.add(suppliers);
             }
 

src/main/java/org/ggp/base/util/propnet/factory/OptimizingPropNetFactory.java

@@ -474,10 +474,8 @@ private static void optimizeAwayFalse(
                     if (pn != null) {
                         pn.removeComponent(or);
                     }
-                } else if (or.getInputs().size() == 0) {
-                    if (pn != null) {
-                        pn.removeComponent(or);
-                    }
+                } else if (or.getInputs().size() == 0 && pn != null) {
+                    pn.removeComponent(or);
                 }
             } else if(output instanceof Not) {
                 Not not = (Not) output;
@@ -584,10 +582,8 @@ private static void optimizeAwayTrue(
                     if (pn != null) {
                         pn.removeComponent(and);
                     }
-                } else if (and.getInputs().size() == 0) {
-                    if (pn != null) {
-                        pn.removeComponent(and);
-                    }
+                } else if (and.getInputs().size() == 0 && pn != null) {
+                    pn.removeComponent(and);
                 }
             } else if(output instanceof Not) {
                 Not not = (Not) output;