Changeset 2166 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-09-20T11:07:46+02:00 (17 years ago)

Author:

stoecker

Message:

see #3475 - patch by Petr Dlouhý - improve speed

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CreateCircleAction.java (modified) (1 diff)
• search/SearchAction.java (modified) (1 diff)
• search/SearchCompiler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -172 +172 @@
                 // if it is, delete it
                 CollectBackReferencesVisitor refs = new CollectBackReferencesVisitor(getCurrentDataSet());
+                refs.initialize();
                 refs.visit(n1);
-                if (refs.data.isEmpty() || ((refs.data.size() == 1) && (refs.data.contains(existingWay)))) {
+                if (refs.getData().isEmpty() || ((refs.getData().size() == 1) && (refs.getData().contains(existingWay)))) {
                     cmds.add(new DeleteCommand(n1));
                 }

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -182 +182 @@
                searchText = (((Filter)s).inverted ? "-" : "") + "(" +  searchText + ")";
             }
-            System.out.println(searchText);
+            /*System.out.println(searchText);*/
             SearchCompiler.Match matcher = SearchCompiler.compile(searchText, s.caseSensitive, s.regexSearch);
             foundMatches = 0;

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -33 +33 @@
     private String  rxErrorMsg = marktr("The regex \"{0}\" had a parse error at offset {1}, full error:\n\n{2}");
     private PushbackTokenizer tokenizer;
+    private static CollectBackReferencesVisitor childBackRefs;
 
     public SearchCompiler(boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) {
@@ -38 +39 @@
         this.regexSearch = regexSearch;
         this.tokenizer = tokenizer;
+        childBackRefs = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet());
     }
 
@@ -481 +483 @@
 
             boolean isChild = false;
-            CollectBackReferencesVisitor backRefs = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet());
-            osm.visit(backRefs);
-            for (OsmPrimitive p : backRefs.data) {
+            childBackRefs.initialize();
+            osm.visit(childBackRefs);
+            for (OsmPrimitive p : childBackRefs.getData()) {
                 isChild |= parent.match(p);
             }