Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 2039) @@ -338,5 +338,5 @@ // 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,7 +412,7 @@ 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,12 +446,15 @@ 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; Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 2039) @@ -155,11 +155,13 @@ for (HashSet 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; } Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 2039) @@ -73,10 +73,13 @@ 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,9 +100,12 @@ 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,5 +113,5 @@ public void lostOwnership(Clipboard clipboard, Transferable contents) {} } - ); + ); } catch (RuntimeException x) {} Index: trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (revision 2039) @@ -69,9 +69,9 @@ } } 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 Index: trunk/src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 2039) @@ -40,6 +40,5 @@ toUpdate.clear(); toDelete.clear(); - if (ds == null) - return; + for (OsmPrimitive osm :ds.allPrimitives()) { if (osm.get("josm/ignore") != null) { Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 2039) @@ -9,4 +9,7 @@ import java.io.PrintStream; import java.io.Reader; +import java.util.List; + +import javax.swing.BorderFactory; import org.openstreetmap.josm.actions.OpenFileAction; @@ -71,5 +74,5 @@ 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,9 +344,9 @@ // 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. Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 2039) @@ -173,5 +173,5 @@ continue; } - if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers) { + if (osms.equals(osmStatus) && ms.modifiers == oldModifiers) { continue; } Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 2039) @@ -56,5 +56,5 @@ */ public abstract class ListMergeModel 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"; Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 2039) @@ -45,5 +45,5 @@ */ public abstract class ListMerger 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; Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 2039) @@ -29,6 +29,6 @@ */ 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,5 +67,5 @@ // sb.append("id=") - .append(primitive.id) + .append(primitive.getId()) .append("
"); @@ -168,17 +168,17 @@ 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; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 2039) @@ -62,5 +62,5 @@ */ 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,7 +317,7 @@ 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; } } Index: trunk/src/org/openstreetmap/josm/io/DiffResultReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/DiffResultReader.java (revision 2038) +++ trunk/src/org/openstreetmap/josm/io/DiffResultReader.java (revision 2039) @@ -93,10 +93,10 @@ 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,9 +104,9 @@ } 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,9 +114,9 @@ } 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(); }