code style: getters/setters before meaty methods + don't call PhaseSc…

…ope instance phase to avoid confusing with Phase
kiegroup · Jul 20, 2015 · ca3ea59 · ca3ea59
1 parent 378ab85
commit ca3ea59
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/...re/src/test/java/org/optaplanner/core/impl/testdata/util/listeners/PhaseTestListener.java b/...re/src/test/java/org/optaplanner/core/impl/testdata/util/listeners/PhaseTestListener.java
@@ -8,7 +8,11 @@
 
 public class PhaseTestListener extends AbstractPhaseTestListener {
 
-    private List<AbstractPhaseScope> phaseList = new ArrayList<AbstractPhaseScope>();
+    private List<AbstractPhaseScope> phaseScopeList = new ArrayList<AbstractPhaseScope>();
+
+    public List<AbstractPhaseScope> getPhaseScopeList() {
+        return phaseScopeList;
+    }
 
     @Override
     public void phaseStarted(AbstractPhaseScope phaseScope) {
@@ -27,10 +31,7 @@ public void stepEnded(AbstractStepScope stepScope) {
 
     @Override
     public void phaseEnded(AbstractPhaseScope phaseScope) {
-        phaseList.add(phaseScope);
+        phaseScopeList.add(phaseScope);
     }
 
-    public List<AbstractPhaseScope> getPhaseList() {
-        return phaseList;
-    }
 }
diff --git a/...c/test/java/org/optaplanner/examples/common/integration/SolverConfigCombinationsTest.java b/...c/test/java/org/optaplanner/examples/common/integration/SolverConfigCombinationsTest.java
@@ -30,7 +30,7 @@ public void noPhaseConfiguration() {
         solver.addPhaseLifecycleListener(listener);
         Solution planningProblem = new CloudBalancingDao().readSolution(new File("data/cloudbalancing/unsolved/3computers-9processes.xml"));
         solver.solve(planningProblem);
-        assertEquals(2, listener.getPhaseList().size());
+        assertEquals(2, listener.getPhaseScopeList().size());
     }
 
     @Test

diff --git a/...java/org/optaplanner/examples/nqueens/solver/tracking/NQueensLocalSearchTrackingTest.java b/...java/org/optaplanner/examples/nqueens/solver/tracking/NQueensLocalSearchTrackingTest.java
@@ -35,8 +35,8 @@ public class NQueensLocalSearchTrackingTest extends NQueensTrackingTest {
     private final List<NQueensStepTracking> expectedCoordinates;
 
     public NQueensLocalSearchTrackingTest(AcceptorConfig acceptorConfig,
-                                          LocalSearchForagerConfig localSearchForagerConfig,
-                                          List<NQueensStepTracking> expectedCoordinates) {
+            LocalSearchForagerConfig localSearchForagerConfig,
+            List<NQueensStepTracking> expectedCoordinates) {
         this.expectedCoordinates = expectedCoordinates;
         this.localSearchForagerConfig = localSearchForagerConfig;
         this.acceptorConfig = acceptorConfig;
@@ -110,5 +110,4 @@ public static Collection<Object[]> parameters() {
         return params;
     }
 
-
 }
diff --git a/...est/java/org/optaplanner/examples/nqueens/solver/tracking/NQueensSolutionInitializer.java b/...est/java/org/optaplanner/examples/nqueens/solver/tracking/NQueensSolutionInitializer.java
@@ -10,4 +10,5 @@ public static NQueens initialize(NQueens solution) {
         }
         return solution;
     }
+
 }
diff --git a/...es/src/test/java/org/optaplanner/examples/nqueens/solver/tracking/NQueensStepTracker.java b/...es/src/test/java/org/optaplanner/examples/nqueens/solver/tracking/NQueensStepTracker.java
@@ -34,6 +34,10 @@ public NQueensStepTracker(NQueens lastTrackedPlanningProblem) {
         this.lastTrackedPlanningProblem = lastTrackedPlanningProblem;
     }
 
+    public List<NQueensStepTracking> getTrackingList() {
+        return trackingList;
+    }
+
     @Override
     public void stepEnded(AbstractStepScope stepScope) {
         NQueens queens = (NQueens) stepScope.getWorkingSolution();
@@ -49,8 +53,4 @@ public void stepEnded(AbstractStepScope stepScope) {
         lastTrackedPlanningProblem = (NQueens) stepScope.createOrGetClonedSolution();
     }
 
-    public List<NQueensStepTracking> getTrackingList() {
-        return trackingList;
-    }
-
 }
diff --git a/...s/src/test/java/org/optaplanner/examples/nqueens/solver/tracking/NQueensTrackingTest.java b/...s/src/test/java/org/optaplanner/examples/nqueens/solver/tracking/NQueensTrackingTest.java
@@ -13,4 +13,5 @@ protected void assertTrackingList(List<NQueensStepTracking> expected, List<NQuee
             assertEquals(expected.get(i).getRowIndex(), recorded.get(i).getRowIndex());
         }
     }
+
 }