Changeset 2039 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-09-03T15:13:20+02:00 (15 years ago)

Author:

Gubaer

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• FileDrop.java (modified) (3 diffs)
• MapStatus.java (modified) (1 diff)
• conflict/pair/ListMergeModel.java (modified) (1 diff)
• conflict/pair/ListMerger.java (modified) (1 diff)
• conflict/pair/nodes/NodeListTableCellRenderer.java (modified) (3 diffs)
• dialogs/LayerListDialog.java (modified) (2 diffs)

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;
                 }
             }