Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -72 +72 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -662 +663 @@
                     return true;
                 } catch (IOException | UnsupportedFlavorException e) {
-                    Main.error(e);
+                    Logging.error(e);
                 }
                 return false;
@@ -681 +682 @@
                         }
                     } catch (IOException | UnsupportedFlavorException e) {
-                        Main.error(e);
+                        Logging.error(e);
                     }
                     movingComponent = "";
@@ -1022 +1023 @@
                     Object tb = action.getValue("toolbar");
                     if (tb == null) {
-                        Main.info(tr("Toolbar action without name: {0}",
+                        Logging.info(tr("Toolbar action without name: {0}",
                         action.getClass().getName()));
                         continue;
                     } else if (!(tb instanceof String)) {
                         if (!(tb instanceof Boolean) || (Boolean) tb) {
-                            Main.info(tr("Strange toolbar value: {0}",
+                            Logging.info(tr("Strange toolbar value: {0}",
                             action.getClass().getName()));
                         }
@@ -1035 +1036 @@
                         Action r = actions.get(toolbar);
                         if (r != null && r != action && !toolbar.startsWith(IMAGERY_PREFIX)) {
-                            Main.info(tr("Toolbar action {0} overwritten: {1} gets {2}",
+                            Logging.info(tr("Toolbar action {0} overwritten: {1} gets {2}",
                             toolbar, r.getClass().getName(), action.getClass().getName()));
                         }
@@ -1096 +1097 @@
                     result.add(a);
                 } else {
-                    Main.info("Could not load tool definition "+s);
+                    Logging.info("Could not load tool definition "+s);
                 }
             }
@@ -1112 +1113 @@
         String toolbar = (String) action.getValue("toolbar");
         if (toolbar == null) {
-            Main.info(tr("Registered toolbar action without name: {0}",
+            Logging.info(tr("Registered toolbar action without name: {0}",
                 action.getClass().getName()));
         } else {
             Action r = regactions.get(toolbar);
             if (r != null) {
-                Main.info(tr("Registered toolbar action {0} overwritten: {1} gets {2}",
+                Logging.info(tr("Registered toolbar action {0} overwritten: {1} gets {2}",
                     toolbar, r.getClass().getName(), action.getClass().getName()));
             }