Changeset 3317 in josm for trunk/src/org

Timestamp:

2010-06-08T15:42:33+02:00 (14 years ago)

Author:

stoecker

Message:

allow to search incomplete elements again

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/search/SearchAction.java (modified) (11 diffs)
• actions/search/SearchCompiler.java (modified) (1 diff)
• command/DeleteCommand.java (modified) (1 diff)
• corrector/ReverseWayTagCorrector.java (modified) (1 diff)
• data/osm/Filter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -477 +477 @@
         if (args.containsKey("selection")) {
             for (String s : args.get("selection")) {
-                SearchAction.search(s, SearchAction.SearchMode.add, false, false);
+                SearchAction.search(s, SearchAction.SearchMode.add);
             }
         }

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

@@ -158 +158 @@
 
         JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), initialValues.caseSensitive);
+        JCheckBox allElements = new JCheckBox(tr("all objects"), initialValues.allElements);
+        allElements.setToolTipText(tr("Also include incomplete and deleted objects in search."));
         JCheckBox regexSearch   = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
 
@@ -168 +170 @@
         left.add(in_selection, GBC.eop());
         left.add(caseSensitive, GBC.eol());
+        left.add(allElements, GBC.eol());
         left.add(regexSearch, GBC.eol());
 
@@ -231 +234 @@
         initialValues.mode = mode;
         initialValues.caseSensitive = caseSensitive.isSelected();
+        initialValues.allElements = allElements.isSelected();
         initialValues.regexSearch = regexSearch.isSelected();
         return initialValues;
@@ -277 +281 @@
             }
 
-            for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives()) {
+            Collection<OsmPrimitive> all;
+            if(s.allElements)
+                all = Main.main.getCurrentDataSet().allPrimitives();
+            else
+                all = Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives();
+            for (OsmPrimitive osm : all) {
                 if (s.mode == SearchMode.replace) {
                     if (matcher.match(osm)) {
@@ -348 +357 @@
     }
 
-    public static void search(String search, SearchMode mode, boolean caseSensitive, boolean regexSearch) {
-        search(new SearchSetting(search, mode, caseSensitive, regexSearch));
+    public static void search(String search, SearchMode mode) {
+        search(new SearchSetting(search, mode, false, false, false));
     }
 
@@ -402 +411 @@
         public boolean caseSensitive;
         public boolean regexSearch;
+        public boolean allElements;
 
         public SearchSetting() {
-            this("", SearchMode.replace, false /* case insensitive */, false /* no regexp */);
-        }
-
-        public SearchSetting(String text, SearchMode mode, boolean caseSensitive, boolean regexSearch) {
+            this("", SearchMode.replace, false /* case insensitive */,
+            false /* no regexp */, false /* only useful primitives */);
+        }
+
+        public SearchSetting(String text, SearchMode mode, boolean caseSensitive,
+        boolean regexSearch, boolean allElements) {
             this.caseSensitive = caseSensitive;
             this.regexSearch = regexSearch;
+            this.allElements = allElements;
             this.mode = mode;
             this.text = text;
@@ -415 +428 @@
 
         public SearchSetting(SearchSetting original) {
-            this(original.text, original.mode, original.caseSensitive, original.regexSearch);
+            this(original.text, original.mode, original.caseSensitive,
+            original.regexSearch, original.allElements);
         }
 
@@ -422 +436 @@
             String cs = caseSensitive ?
                     /*case sensitive*/  trc("search", "CS") :
-                        /*case insensitive*/  trc("search", "CI");
-                    /*regex search*/
-                    String rx = regexSearch ? (", " + trc("search", "RX")) : "";
-                    return "\"" + text + "\" (" + cs + rx + ", " + mode + ")";
+                    /*case insensitive*/  trc("search", "CI");
+            String rx = regexSearch ? (", " +
+                    /*regex search*/ trc("search", "RX")) : "";
+            String all = allElements ? (", " +
+                    /*all elements*/ trc("search", "A")) : "";
+            return "\"" + text + "\" (" + cs + rx + all + ", " + mode + ")";
         }
 
@@ -435 +451 @@
             return (o.caseSensitive == this.caseSensitive
                     && o.regexSearch == this.regexSearch
+                    && o.allElements == this.allElements
                     && o.mode.equals(this.mode)
                     && o.text.equals(this.text));
@@ -463 +480 @@
                 } else if (s.charAt(index) == 'R') {
                     result.regexSearch = true;
+                } else if (s.charAt(index) == 'A') {
+                    result.allElements = true;
                 } else if (s.charAt(index) == ' ') {
                     break;
@@ -493 +512 @@
                 result.append('R');
             }
+            if (allElements) {
+                result.append('A');
+            }
             result.append(' ');
             result.append(text);

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

@@ -583 +583 @@
     private static class Untagged extends Match {
         @Override public boolean match(OsmPrimitive osm) {
-            return !osm.isTagged();
+            return !osm.isTagged() && !osm.isIncomplete();
         }
         @Override public String toString() {return "untagged";}

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -439 +439 @@
     private static boolean checkAndConfirmOutlyingDeletes(OsmDataLayer layer, Collection<OsmPrimitive> primitivesToDelete) {
         Area a = layer.data.getDataSourceArea();
+        boolean outside = false;
+        boolean incomplete = false;
         if (a != null) {
             for (OsmPrimitive osm : primitivesToDelete) {
-                if (osm instanceof Node && !osm.isNew()) {
-                    Node n = (Node) osm;
-                    if (!a.contains(n.getCoor())) {
-                        JPanel msg = new JPanel(new GridBagLayout());
-                        msg.add(new JLabel(
-                                "<html>" +
-                                // leave message in one tr() as there is a grammatical
-                                // connection.
-                                tr("You are about to delete nodes outside of the area you have downloaded."
-                                        + "<br>"
-                                        + "This can cause problems because other objects (that you do not see) might use them."
-                                        + "<br>" + "Do you really want to delete?") + "</html>"));
-                        return ConditionalOptionPaneUtil.showConfirmationDialog(
-                                "delete_outside_nodes",
-                                Main.parent,
-                                msg,
-                                tr("Delete confirmation"),
-                                JOptionPane.YES_NO_OPTION,
-                                JOptionPane.QUESTION_MESSAGE,
-                                JOptionPane.YES_OPTION
-                        );
-                    }
-                }
-            }
+                if (osm.isIncomplete())
+                    incomplete = true;
+                else if (osm instanceof Node && !osm.isNew()
+                && !a.contains(((Node) osm).getCoor()))
+                    outside = true;
+            }
+        }
+        else
+        {
+            for (OsmPrimitive osm : primitivesToDelete)
+                if (osm.isIncomplete())
+                    incomplete = true;
+        }
+        if(outside)
+        {
+            JPanel msg = new JPanel(new GridBagLayout());
+            msg.add(new JLabel(
+                    "<html>" +
+                    // leave message in one tr() as there is a grammatical
+                    // connection.
+                    tr("You are about to delete nodes outside of the area you have downloaded."
+                            + "<br>"
+                            + "This can cause problems because other objects (that you do not see) might use them."
+                            + "<br>" + "Do you really want to delete?") + "</html>"));
+            boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+                    "delete_outside_nodes",
+                    Main.parent,
+                    msg,
+                    tr("Delete confirmation"),
+                    JOptionPane.YES_NO_OPTION,
+                    JOptionPane.QUESTION_MESSAGE,
+                    JOptionPane.YES_OPTION
+            );
+            if(!answer)
+                return false;
+        }
+        if(incomplete)
+        {
+            JPanel msg = new JPanel(new GridBagLayout());
+            msg.add(new JLabel(
+                    "<html>" +
+                    // leave message in one tr() as there is a grammatical
+                    // connection.
+                    tr("You are about to delete incomplete objects."
+                            + "<br>"
+                            + "This will cause problems because you don't see the real object."
+                            + "<br>" + "Do you really want to delete?") + "</html>"));
+            boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+                    "delete_incomplete",
+                    Main.parent,
+                    msg,
+                    tr("Delete confirmation"),
+                    JOptionPane.YES_NO_OPTION,
+                    JOptionPane.QUESTION_MESSAGE,
+                    JOptionPane.YES_OPTION
+            );
+            if(!answer)
+                return false;
         }
         return true;

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -77 +77 @@
         new PrefixSuffixSwitcher("forwards", "backwards"),
         new PrefixSuffixSwitcher("up", "down"),
+        new PrefixSuffixSwitcher("east", "west"),
+        new PrefixSuffixSwitcher("north", "south"),
     };
 

trunk/src/org/openstreetmap/josm/data/osm/Filter.java

@@ -15 +15 @@
     public Boolean inverted = false;
     public Filter() {
-        super("", SearchMode.add, false, false);
+        super("", SearchMode.add, false, false, false);
     }
-    public Filter(String text, SearchMode mode, boolean caseSensitive, boolean regexSearch) {
-        super(text, mode, caseSensitive, regexSearch);
+    public Filter(String text, SearchMode mode, boolean caseSensitive,
+    boolean regexSearch, boolean allElements) {
+        super(text, mode, caseSensitive, regexSearch, allElements);
     }
 
     public Filter(String prefText){
-        super("", SearchMode.add, false, false);
+        super("", SearchMode.add, false, false, false);
         String[] prfs = prefText.split(";");
         if(prfs.length != 10 && !prfs[0].equals(version))