Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer

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/gui/datatransfer

Files:

• AbstractStackTransferHandler.java (modified) (3 diffs)
• ClipboardUtils.java (modified) (5 diffs)
• OsmTransferHandler.java (modified) (3 diffs)
• importers/TextTagPaster.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/datatransfer/AbstractStackTransferHandler.java

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
@@ -51 +52 @@
             if (df.supports(support)) {
                 try {
-                    if (Main.isDebugEnabled()) {
-                        Main.debug("{0} pasting {1} at {2}", df.getClass().getSimpleName(), Arrays.toString(support.getDataFlavors()), center);
+                    if (Logging.isDebugEnabled()) {
+                        Logging.debug("{0} pasting {1} at {2}",
+                                df.getClass().getSimpleName(), Arrays.toString(support.getDataFlavors()), center);
                     }
                     if (df.importData(support, layer, center)) {
@@ -58 +60 @@
                     }
                 } catch (UnsupportedFlavorException | IOException e) {
-                    Main.warn(e);
+                    Logging.warn(e);
                 } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
                     BugReport.intercept(e).put("paster", df).put("flavors", support::getDataFlavors).warn();

trunk/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java

@@ -13 +13 @@
 import java.io.IOException;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -50 +50 @@
                 clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
             } catch (HeadlessException e) {
-                Main.warn("Headless. Using fake clipboard.", e);
+                Logging.warn("Headless. Using fake clipboard.", e);
                 clipboard = new Clipboard("fake");
             }
@@ -83 +83 @@
             }
         } catch (UnsupportedFlavorException | IOException ex) {
-            Main.error(ex);
+            Logging.error(ex);
         }
         return null;
@@ -109 +109 @@
                 // Clipboard currently unavailable.
                 // On some platforms, the system clipboard is unavailable while it is accessed by another application.
-                Main.trace("Clipboard unavailable.", e);
+                Logging.trace("Clipboard unavailable.", e);
                 try {
                     Thread.sleep(1);
                 } catch (InterruptedException ex) {
-                    Main.warn(ex, "InterruptedException in " + Utils.class.getSimpleName()
-                            + " while getting clipboard content");
+                    Logging.log(Logging.LEVEL_WARN, "InterruptedException in " + Utils.class.getSimpleName()
+                            + " while getting clipboard content", ex);
                     Thread.currentThread().interrupt();
                 }
             } catch (NullPointerException e) { // NOPMD
                 // JDK-6322854: On Linux/X11, NPE can happen for unknown reasons, on all versions of Java
-                Main.error(e);
+                Logging.error(e);
             }
         }
@@ -145 +145 @@
                 return Boolean.TRUE;
             } catch (IllegalStateException ex) {
-                Main.error(ex);
+                Logging.error(ex);
                 return Boolean.FALSE;
             }

trunk/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java

@@ -21 +21 @@
 import org.openstreetmap.josm.gui.datatransfer.importers.TextTagPaster;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -47 +48 @@
                     }
                 } catch (UnsupportedFlavorException | IOException e) {
-                    Main.warn(e);
+                    Logging.warn(e);
                 }
             }
@@ -96 +97 @@
             }
         } catch (IllegalStateException e) {
-            Main.debug(e);
+            Logging.debug(e);
         } catch (NullPointerException e) { // NOPMD
             // JDK-6322854: On Linux/X11, NPE can happen for unknown reasons, on all versions of Java
-            Main.error(e);
+            Logging.error(e);
         }
         return false;

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java

@@ -11 +11 @@
 import javax.swing.TransferHandler.TransferSupport;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.TextTagParser;
 
@@ -34 +34 @@
             return super.supports(support) && containsValidTags(support);
         } catch (UnsupportedFlavorException | IOException e) {
-            Main.warn(e);
+            Logging.warn(e);
             return false;
         }