Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2017-08-22T22:26:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate all Main logging methods and introduce suitable replacements in Logging for most of them

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (4 diffs)
• SearchCompiler.java (modified) (4 diffs)

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

@@ -62 +62 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -416 +417 @@
                         super.buttonAction(buttonIndex, evt);
                     } catch (ParseError e) {
-                        Main.debug(e);
+                        Logging.debug(e);
                         JOptionPane.showMessageDialog(
                                 Main.parent,
@@ -825 +826 @@
                 subMonitor.finishTask();
             } catch (ParseError e) {
-                Main.debug(e);
+                Logging.debug(e);
                 JOptionPane.showMessageDialog(
                         Main.parent,
@@ -953 +954 @@
                     break;
                 } else {
-                    Main.warn("Unknown char in SearchSettings: " + s);
+                    Logging.warn("Unknown char in SearchSettings: " + s);
                     break;
                 }

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

@@ -46 +46 @@
 import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.Utils;
@@ -112 +113 @@
                 throw new AssertionError("Unknown match factory");
             if (existing != null) {
-                Main.warn("SearchCompiler: for key ''{0}'', overriding match factory ''{1}'' with ''{2}''", keyword, existing, factory);
+                Logging.warn("SearchCompiler: for key ''{0}'', overriding match factory ''{1}'' with ''{2}''", keyword, existing, factory);
             }
         }
@@ -716 +717 @@
                 }
             } catch (NumberFormatException ignore) {
-                Main.trace(ignore);
+                Logging.trace(ignore);
             }
             this.referenceNumber = v;
@@ -1696 +1697 @@
         if (!tokenizer.readIfEqual(Token.EOF))
             throw new ParseError(tr("Unexpected token: {0}", tokenizer.nextToken()));
-        Main.debug("Parsed search expression is {0}", m);
+        Logging.debug("Parsed search expression is {0}", m);
         return m;
     }