]> git.uio.no Git - ifi-stolz-refaktor.git/commitdiff
comments
authorAnna Eilertsen <anna.eilertsen@student.uib.no>
Fri, 9 Oct 2015 13:37:59 +0000 (15:37 +0200)
committerAnna Eilertsen <anna.eilertsen@student.uib.no>
Fri, 9 Oct 2015 13:37:59 +0000 (15:37 +0200)
software/no.uio.ifi.refaktor/src/no/uio/ifi/refaktor/refactorings/ExtractTempWithAssertsRefactoring.java

index 7d7c56ec14b011a289ceae4bc36746e75afd45cc..316086534ab6dd233078ba7ae4902e3c3fe0d0e7 100644 (file)
@@ -477,24 +477,25 @@ public class ExtractTempWithAssertsRefactoring extends ExtractTempRefactoring {
 //                     
 //                     if(!check)
                                lr.insertBefore(assertStatement, exprstatement, null);
-                       
+
+                               //remove duplicates
+                               List<Statement> ls = lr.getRewrittenList();
+                               for (int j = 0; j < ls.size()-1; j++) {
+                                       Statement statement = ls.get(j);
+                                       Statement nextStatement = ls.get(j+1);
+                                       if(statement.subtreeMatch(new ASTMatcher(), assertStatement) && 
+                                                       nextStatement.subtreeMatch(new ASTMatcher(), assertStatement)){
+                                                       lr.remove(nextStatement, null);
+                                                       break; //TODO unnoticeable increase in performance
+                                       }
+                               }
+                               
                        /*
                         * End of Anna's code 
                         */
                        
                        fragment.replace(rewrite, tempName, description);
                        
-                       //remove duplicates
-                       List<Statement> ls = lr.getRewrittenList();
-                       for (int j = 0; j < ls.size()-1; j++) {
-                               Statement statement = ls.get(j);
-                               Statement nextStatement = ls.get(j+1);
-                               if(statement.subtreeMatch(new ASTMatcher(), assertStatement) && 
-                                               nextStatement.subtreeMatch(new ASTMatcher(), assertStatement)){
-                                               lr.remove(nextStatement, null);
-                                               break; //TODO unnoticeable increase in performance
-                               }
-                       }
                        
                        if (fLinkedProposalModel != null)
                                fLinkedProposalModel.getPositionGroup(KEY_NAME, true).addPosition(rewrite.track(tempName), false);