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

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/conflict

Files:

• pair/AbstractListMergeModel.java (modified) (2 diffs)
• tags/MultiValueCellEditor.java (modified) (2 diffs)
• tags/MultiValueCellRenderer.java (modified) (3 diffs)
• tags/TagConflictResolutionUtil.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -736 +737 @@
                 return ((RelationMember) value).getMember();
             } else {
-                Main.error("Unknown object type: "+value);
+                Logging.error("Unknown object type: "+value);
                 return null;
             }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

@@ -21 +21 @@
 import javax.swing.table.TableCellEditor;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -167 +167 @@
             break;
         default:
-            Main.error("Unknown decision type in initEditor(): "+decision.getDecisionType());
+            Logging.error("Unknown decision type in initEditor(): "+decision.getDecisionType());
         }
     }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java

@@ -14 +14 @@
 import javax.swing.table.TableCellRenderer;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -71 +71 @@
                         break;
                     default:
-                        Main.error("Unknown decision type in renderColors(): "+decision.getDecisionType());
+                        Logging.error("Unknown decision type in renderColors(): "+decision.getDecisionType());
                     }
                 } else {
@@ -103 +103 @@
             break;
         default:
-            Main.error("Unknown decision type in renderValue(): "+decision.getDecisionType());
+            Logging.error("Unknown decision type in renderValue(): "+decision.getDecisionType());
         }
     }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.TagCollection;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Pair;
 
@@ -216 +217 @@
                     // Can happen if a particular resolver has an invalid regular expression pattern
                     // but it should not stop the other automatic tag conflict resolution.
-                    Main.error(e);
+                    Logging.error(e);
                 }
             }