Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.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/data/osm/visitor/paint/MapRendererFactory.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

@@ -17 +17 @@
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -138 +139 @@
                 return Class.forName(className, true, cl);
             } catch (final NoClassDefFoundError | ClassNotFoundException e) {
-                Main.trace(e);
+                Logging.trace(e);
             }
         }
-        Main.error(tr("Failed to load map renderer class ''{0}''. The class wasn''t found.", className));
+        Logging.error(tr("Failed to load map renderer class ''{0}''. The class wasn''t found.", className));
         return null;
     }
@@ -161 +162 @@
         Class<?> c = loadRendererClass(rendererClassName);
         if (c == null) {
-            Main.error(tr("Can''t activate map renderer class ''{0}'', because the class wasn''t found.", rendererClassName));
-            Main.error(tr("Activating the standard map renderer instead."));
+            Logging.error(tr("Can''t activate map renderer class ''{0}'', because the class wasn''t found.", rendererClassName));
+            Logging.error(tr("Activating the standard map renderer instead."));
             activateDefault();
         } else if (!AbstractMapRenderer.class.isAssignableFrom(c)) {
-            Main.error(tr("Can''t activate map renderer class ''{0}'', because it isn''t a subclass of ''{1}''.",
+            Logging.error(tr("Can''t activate map renderer class ''{0}'', because it isn''t a subclass of ''{1}''.",
                     rendererClassName, AbstractMapRenderer.class.getName()));
-            Main.error(tr("Activating the standard map renderer instead."));
+            Logging.error(tr("Activating the standard map renderer instead."));
             activateDefault();
         } else {
             Class<? extends AbstractMapRenderer> renderer = c.asSubclass(AbstractMapRenderer.class);
             if (!isRegistered(renderer)) {
-                Main.error(tr("Can''t activate map renderer class ''{0}'', because it isn''t registered as map renderer.", rendererClassName));
-                Main.error(tr("Activating the standard map renderer instead."));
+                Logging.error(tr("Can''t activate map renderer class ''{0}'', because it isn''t registered as map renderer.",
+                        rendererClassName));
+                Logging.error(tr("Activating the standard map renderer instead."));
                 activateDefault();
             } else {
@@ -306 +308 @@
             return AbstractMapRenderer.class.cast(c.newInstance(g, viewport, isInactiveMode));
         } catch (InvocationTargetException e) {
-            Main.debug(e);
+            Logging.debug(e);
             throw new MapRendererFactoryException(e.getCause());
         } catch (ReflectiveOperationException | IllegalArgumentException e) {