Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/io/session

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/io/session

Files:

• GeoImageSessionExporter.java (modified) (2 diffs)
• GeoImageSessionImporter.java (modified) (3 diffs)
• ImagerySessionImporter.java (modified) (3 diffs)
• SessionReader.java (modified) (8 diffs)
• SessionWriter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java

@@ -12 +12 @@
 import javax.swing.SwingConstants;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
 import org.openstreetmap.josm.gui.layer.geoimage.ImageEntry;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Logging;
 import org.w3c.dom.Element;
 
@@ -66 +66 @@
 
             if (entry.getFile() == null) {
-                Main.warn("No file attribute for image - skipping entry");
+                Logging.warn("No file attribute for image - skipping entry");
                 break;
             }

trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java

@@ -10 +10 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -18 +17 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.tools.Logging;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -117 +117 @@
             // TODO: handle thumbnail loading
         } catch (NumberFormatException e) {
-            Main.trace(e);
+            Logging.trace(e);
         }
     }

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java

@@ -8 +8 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -23 +22 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
@@ -50 +50 @@
                 String zoomStr = attributes.get("zoom-level");
                 if (zoomStr != null) {
-                        support.addPostLayersTask(() -> {
-                            try {
-                                tsLayer.setZoomLevel(Integer.parseInt(zoomStr));
-                            } catch (NumberFormatException e) {
-                                Main.warn(e);
-                            }
-                        });
+                    support.addPostLayersTask(() -> {
+                        try {
+                            tsLayer.setZoomLevel(Integer.parseInt(zoomStr));
+                        } catch (NumberFormatException e) {
+                            Logging.warn(e);
+                        }
+                    });
                 }
             }

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -45 +45 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
@@ -447 +448 @@
             active = !activeAtt.isEmpty() ? (Integer.parseInt(activeAtt)-1) : -1;
         } catch (NumberFormatException e) {
-            Main.warn("Unsupported value for 'active' layer attribute. Ignoring it. Error was: "+e.getMessage());
+            Logging.warn("Unsupported value for 'active' layer attribute. Ignoring it. Error was: "+e.getMessage());
             active = -1;
         }
@@ -468 +469 @@
                         idx = Integer.valueOf(e.getAttribute("index"));
                     } catch (NumberFormatException ex) {
-                        Main.warn(ex);
+                        Logging.warn(ex);
                     }
                     if (idx == null) {
@@ -485 +486 @@
                                 d = Integer.valueOf(sd);
                             } catch (NumberFormatException ex) {
-                                Main.warn(ex);
+                                Logging.warn(ex);
                             }
                             if (d != null) {
@@ -567 +568 @@
                 }
                 if (exception != null) {
-                    Main.error(exception);
+                    Logging.error(exception);
                     if (!GraphicsEnvironment.isHeadless()) {
                         CancelOrContinueDialog dialog = new CancelOrContinueDialog();
@@ -607 +608 @@
                     layer.setOpacity(opacity);
                 } catch (NumberFormatException ex) {
-                    Main.warn(ex);
+                    Logging.warn(ex);
                 }
             }
@@ -625 +626 @@
                     Double.parseDouble(centerEl.getAttribute("lon")));
         } catch (NumberFormatException ex) {
-            Main.warn(ex);
+            Logging.warn(ex);
         }
         if (center == null) return null;
@@ -634 +635 @@
             return new SessionViewportData(center, scale);
         } catch (NumberFormatException ex) {
-            Main.warn(ex);
+            Logging.warn(ex);
             return null;
         }

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
@@ -241 +242 @@
                     int depIndex = layers.indexOf(depLayer);
                     if (depIndex == -1) {
-                        Main.warn("Unable to find " + depLayer);
+                        Logging.warn("Unable to find " + depLayer);
                     } else {
                         depsInt.add(depIndex+1);