Refactoring

diff --git a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/IllegalStatementsChecker.java b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/IllegalStatementsChecker.java
index a274dd7613c5b4f8981d3192695d8382a77d6243..6312e8e961642b526076d1db624bed8e22aa35f6 100644 (file)
--- a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/IllegalStatementsChecker.java
+++ b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/analyzers/IllegalStatementsChecker.java
@@ -21,16 +21,13 @@ import org.eclipse.jdt.core.dom.WhileStatement;
 public class IllegalStatementsChecker extends PropertyCollector implements Checker {
        // TODO: add checks for break, continue, more?
 
-       private final CompilationUnitTextSelection privateSelection;
-
        public IllegalStatementsChecker(CompilationUnitTextSelection selection) {
                super(selection);
-               privateSelection = selection;
        }
 
        @Override
        public void check() throws IllegalStatementFoundException, IllegalExpressionFoundException {
-               CollectorManager.collectProperties(privateSelection, this);
+               CollectorManager.collectProperties(getSelection(), this);
        }
 
        @Override

diff --git a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/collectors/EveryConditionalBranchEndsInReturnCheckerCollector.java b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/collectors/EveryConditionalBranchEndsInReturnCheckerCollector.java
index 58c9567a446acd9f84df75d02fc2f1676fc40246..2733f6210ce5b231f95b7af54811ac8afd869711 100644 (file)
--- a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/collectors/EveryConditionalBranchEndsInReturnCheckerCollector.java
+++ b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/collectors/EveryConditionalBranchEndsInReturnCheckerCollector.java
@@ -14,11 +14,8 @@ import org.eclipse.jdt.core.dom.SwitchStatement;
 
 public class EveryConditionalBranchEndsInReturnCheckerCollector extends PropertyCollector implements Checker {
 
-       private CompilationUnitTextSelection privateSelection;
-
        public EveryConditionalBranchEndsInReturnCheckerCollector(CompilationUnitTextSelection selection) {
                super(selection);
-               privateSelection = selection;
        }
 
        @Override
@@ -64,6 +61,6 @@ public class EveryConditionalBranchEndsInReturnCheckerCollector extends Property
 
        @Override
        public void check() throws IllegalStatementFoundException, IllegalExpressionFoundException {
-               CollectorManager.collectProperties(privateSelection, this);
+               CollectorManager.collectProperties(getSelection(), this);
        }
 }
\ No newline at end of file

diff --git a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/collectors/HasWhileOrForOrCatchWithReturnInsideCheckerCollector.java b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/collectors/HasWhileOrForOrCatchWithReturnInsideCheckerCollector.java
index 6208b5a0c3fd3dff94fa99e78182a191f01087b0..81733288333be1cf010e4a56b08ba3f80ce4663e 100644 (file)
--- a/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/collectors/HasWhileOrForOrCatchWithReturnInsideCheckerCollector.java
+++ b/software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/analyze/collectors/HasWhileOrForOrCatchWithReturnInsideCheckerCollector.java
@@ -15,17 +15,15 @@ import org.eclipse.jdt.core.dom.WhileStatement;
 public class HasWhileOrForOrCatchWithReturnInsideCheckerCollector extends PropertyCollector implements Checker {
 
        private final IllegalReturnStatementChecker hasReturnStatementChecker;
-       private CompilationUnitTextSelection privateSelection;
 
        public HasWhileOrForOrCatchWithReturnInsideCheckerCollector(CompilationUnitTextSelection selection) {
                super(selection);
-               privateSelection = selection;
                hasReturnStatementChecker = new IllegalReturnStatementChecker();
        }
 
        @Override
        public void check() throws IllegalStatementFoundException, IllegalExpressionFoundException {
-               CollectorManager.collectProperties(privateSelection, this);
+               CollectorManager.collectProperties(getSelection(), this);
        }
        
        @Override