Changeset 2039 in josm

Timestamp:

Sep 3, 2009 3:13:20 PM (4 years ago)

Author:

Gubaer

Message:

applied #3377: patch by xeen: Less warnings for JOSM

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• actions/MergeNodesAction.java (modified) (1 diff)
• actions/ShowStatusReportAction.java (modified) (3 diffs)
• command/DeletedStateConflictResolveCommand.java (modified) (1 diff)
• data/APIDataSet.java (modified) (1 diff)
• gui/FileDrop.java (modified) (3 diffs)
• gui/MapStatus.java (modified) (1 diff)
• gui/conflict/pair/ListMergeModel.java (modified) (1 diff)
• gui/conflict/pair/ListMerger.java (modified) (1 diff)
• gui/conflict/pair/nodes/NodeListTableCellRenderer.java (modified) (3 diffs)
• gui/dialogs/LayerListDialog.java (modified) (2 diffs)
• io/DiffResultReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -338 +338 @@
         //
         try {
-            CoordinateFormat format = CoordinateFormat.valueOf(Main.pref.get("coordinates"));
+            //CoordinateFormat format = CoordinateFormat.valueOf(Main.pref.get("coordinates"));
             CoordinateFormat.setCoordinateFormat(CoordinateFormat.valueOf(Main.pref.get("coordinates")));
         } catch (IllegalArgumentException iae) {
@@ -412 +412 @@
             dialog.setVisible(true);
             switch(dialog.getUserAction()) {
-                case CANCEL: return false;
-                case PROCEED: return true;
-                default: return false;
+            case CANCEL: return false;
+            case PROCEED: return true;
+            default: return false;
             }
         }
@@ -446 +446 @@
                 numUnsavedLayers
         );
-        int result = new ExtendedDialog(parent, tr("Unsaved Changes"),
-                new JLabel(msg),
-                new String[] {tr("Save and Exit"), tr("Discard and Exit"), tr("Cancel")},
-                new String[] {"save.png", "exit.png", "cancel.png"}).getValue();
-
-        switch(result) {
-            case 2: /* discard and exit */ return true;
-            case 3: /* cancel */ return false;
+
+        ExtendedDialog ed = new ExtendedDialog(parent,
+                tr("Unsaved Changes"),
+                new String[] {tr("Save and Exit"), tr("Discard and Exit"), tr("Cancel")});
+        ed.setButtonIcons(new String[] {"save.png", "exit.png", "cancel.png"});
+        ed.setContent(new JLabel(msg));
+        ed.showDialog();
+
+        switch(ed.getValue()) {
+        case 2: /* discard and exit */ return true;
+        case 3: /* cancel */ return false;
         }
         boolean savefailed = false;

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -155 +155 @@
         for (HashSet<Node> nodelinks : backlinks.values()) {
             if (!nodelinks.containsAll(allNodes)) {
-                int option = new ExtendedDialog(Main.parent,
+                ExtendedDialog ed = new ExtendedDialog(Main.parent,
                         tr("Merge nodes with different memberships?"),
-                        tr("The selected nodes have differing relation memberships.  "
-                                + "Do you still want to merge them?"),
-                                new String[] {tr("Merge Anyway"), tr("Cancel")},
-                                new String[] {"mergenodes.png", "cancel.png"}).getValue();
-                if (option == 1) {
+                        new String[] {tr("Merge Anyway"), tr("Cancel")});
+                ed.setButtonIcons(new String[] {"mergenodes.png", "cancel.png"});
+                ed.setContent(tr("The selected nodes have differing relation memberships.  "
+                        + "Do you still want to merge them?"));
+                ed.showDialog();
+
+                if (ed.getValue() == 1) {
                     break;
                 }

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -73 +73 @@
                 while ((line = input.readLine()) != null) {
                     // Skip potential private information
-                    if (line.trim().toLowerCase().startsWith("osm-server.username"))
+                    if (line.trim().toLowerCase().startsWith("osm-server.username")) {
                         continue;
-                    if (line.trim().toLowerCase().startsWith("osm-server.password"))
+                    }
+                    if (line.trim().toLowerCase().startsWith("osm-server.password")) {
                         continue;
-                    if (line.trim().toLowerCase().startsWith("marker.show"))
+                    }
+                    if (line.trim().toLowerCase().startsWith("marker.show")) {
                         continue;
+                    }
 
                     text.append(line);
@@ -97 +100 @@
         sp.setPreferredSize(new Dimension(600, 500));
 
-        int result = new ExtendedDialog(Main.parent, tr(tr("Status Report")), sp,
-                new String[] {tr("Copy to clipboard and close"), tr("Close") },
-                new String[] {"copy.png", "cancel.png" }).getValue();
+        ExtendedDialog ed = new ExtendedDialog(Main.parent,
+                tr("Status Report"),
+                new String[] {tr("Copy to clipboard and close"), tr("Close") });
+        ed.setButtonIcons(new String[] {"copy.png", "cancel.png" });
+        ed.setContent(sp);
+        ed.showDialog();
 
-        if(result != 1) return;
+        if(ed.getValue() != 1) return;
         try {
             Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
@@ -107 +113 @@
                         public void lostOwnership(Clipboard clipboard, Transferable contents) {}
                     }
-             );
+            );
         }
         catch (RuntimeException x) {}

trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

@@ -69 +69 @@
             }
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
-            if (conflict.getTheir().deleted) {
+            if (conflict.getTheir().isDeleted()) {
                 layer.data.unlinkReferencesToPrimitive(conflict.getMy());
                 conflict.getMy().delete(true);
             } else {
-                conflict.getMy().deleted = conflict.getTheir().deleted;
+                conflict.getMy().delete(conflict.getTheir().isDeleted());
             }
         } else

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -40 +40 @@
         toUpdate.clear();
         toDelete.clear();
-        if (ds == null)
-            return;
+
         for (OsmPrimitive osm :ds.allPrimitives()) {
             if (osm.get("josm/ignore") != null) {

trunk/src/org/openstreetmap/josm/gui/FileDrop.java

@@ -9 +9 @@
 import java.io.PrintStream;
 import java.io.Reader;
+import java.util.List;
+
+import javax.swing.BorderFactory;
 
 import org.openstreetmap.josm.actions.OpenFileAction;
@@ -71 +74 @@
             null,  // Logging stream
             c,     // Drop target
-            javax.swing.BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border
+            BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border
             true, // Recursive
             new FileDrop.Listener()
@@ -341 +344 @@
 
                     // Get a useful list
-                    java.util.List fileList = (java.util.List)
+                    List fileList = (java.util.List)
                     tr.getTransferData(java.awt.datatransfer.DataFlavor.javaFileListFlavor);
 
                     // Convert list to array
-                    final java.io.File[] files = (File[]) fileList.toArray();;
+                    final File[] files = (File[]) fileList.toArray();
 
                     // Alert listener to drop.

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -173 +173 @@
                             continue;
                         }
-                        if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers) {
+                        if (osms.equals(osmStatus) && ms.modifiers == oldModifiers) {
                             continue;
                         }

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

@@ -56 +56 @@
  */
 public abstract class ListMergeModel<T> extends Observable {
-    private static final Logger logger = Logger.getLogger(ListMergeModel.class.getName());
+    //private static final Logger logger = Logger.getLogger(ListMergeModel.class.getName());
 
     public static final String FROZEN_PROP = ListMergeModel.class.getName() + ".frozen";

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

@@ -45 +45 @@
  */
 public abstract class ListMerger<T> extends JPanel implements PropertyChangeListener, Observer {
-    private static final Logger logger = Logger.getLogger(ListMerger.class.getName());
+    //private static final Logger logger = Logger.getLogger(ListMerger.class.getName());
 
     protected JTable myEntriesTable;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

@@ -29 +29 @@
  */
 public  class NodeListTableCellRenderer extends JLabel implements TableCellRenderer {
-    static private final Logger logger = Logger.getLogger(NodeListTableCellRenderer.class.getName());
-    private static DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000");
+    //static private final Logger logger = Logger.getLogger(NodeListTableCellRenderer.class.getName());
+    //private static DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000");
     public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
     public final static Color BGCOLOR_EMPTY_ROW = new Color(234,234,234);
@@ -67 +67 @@
         //
         sb.append("<strong>id</strong>=")
-        .append(primitive.id)
+        .append(primitive.getId())
         .append("<br>");
 
@@ -168 +168 @@
         reset();
         switch(column) {
-        case 0:
-            renderRowId(getModel(table),row, isSelected);
-            break;
-        case 1:
-            if (node == null) {
-                renderEmptyRow();
-            } else {
-                renderNode(getModel(table), node, row, isSelected);
-            }
-            break;
-        default:
-            // should not happen
-            throw new RuntimeException(tr("unexpected column index. Got {0}", column));
+            case 0:
+                renderRowId(getModel(table),row, isSelected);
+                break;
+            case 1:
+                if (node == null) {
+                    renderEmptyRow();
+                } else {
+                    renderNode(getModel(table), node, row, isSelected);
+                }
+                break;
+            default:
+                // should not happen
+                throw new RuntimeException(tr("unexpected column index. Got {0}", column));
         }
         return this;

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -62 +62 @@
  */
 public class LayerListDialog extends ToggleDialog {
-    static private final Logger logger = Logger.getLogger(LayerListDialog.class.getName());
+    //static private final Logger logger = Logger.getLogger(LayerListDialog.class.getName());
 
     /** the unique instance of the dialog */
@@ -317 +317 @@
                 dialog.setVisible(true);
                 switch(dialog.getUserAction()) {
-                    case CANCEL: return false;
-                    case PROCEED: return true;
-                    default: return false;
+                case CANCEL: return false;
+                case PROCEED: return true;
+                default: return false;
                 }
             }

trunk/src/org/openstreetmap/josm/io/DiffResultReader.java

@@ -93 +93 @@
 
     public void visit(Node n) {
-        String key = "node:" + (newIdMap.containsKey(n) ? newIdMap.get(n) : n.id);
+        String key = "node:" + (newIdMap.containsKey(n) ? newIdMap.get(n) : n.getId());
         System.out.println("key: "+key);
         Long[] nv = versions.get(key);
         if (nv != null) {
             processed.add(n);
-            if (!n.deleted) {
+            if (!n.isDeleted()) {
                 n.id = nv[0]; n.version = nv[1].intValue();
             }
@@ -104 +104 @@
     }
     public void visit(Way w) {
-        String key = "way:" + (newIdMap.containsKey(w) ? newIdMap.get(w) : w.id);
+        String key = "way:" + (newIdMap.containsKey(w) ? newIdMap.get(w) : w.getId());
         Long[] nv = versions.get(key);
         if (nv != null) {
             processed.add(w);
-            if (!w.deleted) {
+            if (!w.isDeleted()) {
                 w.id = nv[0]; w.version = nv[1].intValue();
             }
@@ -114 +114 @@
     }
     public void visit(Relation r) {
-        String key = "relation:" + (newIdMap.containsKey(r) ? newIdMap.get(r) : r.id);
+        String key = "relation:" + (newIdMap.containsKey(r) ? newIdMap.get(r) : r.getId());
         Long[] nv = versions.get(key);
         if (nv != null) {
             processed.add(r);
-            if (!r.deleted) {
+            if (!r.isDeleted()) {
                 r.id = nv[0]; r.version = nv[1].intValue();
             }