Index: test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java =================================================================== --- test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java (revision 2034) +++ test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java (working copy) @@ -25,7 +25,7 @@ protected void populate() { Node my = new Node(1); my.setCoor(new LatLon(1,1)); - my.deleted = true; + my.delete(true); Node their = new Node(2); their.setCoor(new LatLon(10,10)); Index: src/org/openstreetmap/josm/io/DiffResultReader.java =================================================================== --- src/org/openstreetmap/josm/io/DiffResultReader.java (revision 2034) +++ src/org/openstreetmap/josm/io/DiffResultReader.java (working copy) @@ -117,7 +117,7 @@ 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(); } } Index: src/org/openstreetmap/josm/actions/ShowStatusReportAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 2034) +++ src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (working copy) @@ -72,12 +72,15 @@ 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); text.append("\n"); @@ -96,17 +99,20 @@ JScrollPane sp = new JScrollPane(ta); 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( new StringSelection(text.toString()), new ClipboardOwner() { public void lostOwnership(Clipboard clipboard, Transferable contents) {} } - ); + ); } catch (RuntimeException x) {} } Index: src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 2034) +++ src/org/openstreetmap/josm/actions/MergeNodesAction.java (working copy) @@ -154,13 +154,15 @@ // Complain to the user if the ways don't have equal memberships. 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; } return null; Index: src/org/openstreetmap/josm/Main.java =================================================================== --- src/org/openstreetmap/josm/Main.java (revision 2034) +++ src/org/openstreetmap/josm/Main.java (working copy) @@ -337,7 +337,7 @@ // init default coordinate format // 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) { CoordinateFormat.setCoordinateFormat(CoordinateFormat.DECIMAL_DEGREES); @@ -411,9 +411,9 @@ dialog.getModel().populate(layersWithUnmodifiedChanges); 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; } } return true; @@ -445,14 +445,17 @@ numUnsavedLayers, 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; for (OsmDataLayer l : map.mapView.getLayersOfType(OsmDataLayer.class)) { Index: src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java =================================================================== --- src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (revision 2034) +++ src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (working copy) @@ -68,11 +68,11 @@ layer.data.unlinkReferencesToPrimitive(conflict.getMy()); } } 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 // should not happen Index: src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- src/org/openstreetmap/josm/data/APIDataSet.java (revision 2034) +++ src/org/openstreetmap/josm/data/APIDataSet.java (working copy) @@ -39,8 +39,7 @@ toAdd.clear(); toUpdate.clear(); toDelete.clear(); - if (ds == null) - return; + for (OsmPrimitive osm :ds.allPrimitives()) { if (osm.get("josm/ignore") != null) { continue; Index: src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 2034) +++ src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (working copy) @@ -55,7 +55,7 @@ * @see ListMerger */ 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: src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 2034) +++ src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (working copy) @@ -44,7 +44,7 @@ * @see ListMergeModel */ 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; protected JTable mergedEntriesTable; Index: src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 2034) +++ src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (working copy) @@ -28,8 +28,8 @@ * */ 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); public final static Color BGCOLOR_FROZEN = new Color(234,234,234); Index: src/org/openstreetmap/josm/gui/FileDrop.java =================================================================== --- src/org/openstreetmap/josm/gui/FileDrop.java (revision 2034) +++ src/org/openstreetmap/josm/gui/FileDrop.java (working copy) @@ -8,6 +8,9 @@ import java.io.IOException; import java.io.PrintStream; import java.io.Reader; +import java.util.List; + +import javax.swing.BorderFactory; import org.openstreetmap.josm.actions.OpenFileAction; @@ -70,7 +73,7 @@ { this( 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() { @@ -340,11 +343,11 @@ log( out, "FileDrop: file list accepted." ); // 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. if( listener != null ) { Index: src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 2034) +++ src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (working copy) @@ -61,7 +61,7 @@ * */ 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 */ static private LayerListDialog instance; @@ -316,9 +316,9 @@ dialog.getModel().populate(layersWithUnmodifiedChanges); 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; } } return true; Index: src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- src/org/openstreetmap/josm/gui/MapStatus.java (revision 2034) +++ src/org/openstreetmap/josm/gui/MapStatus.java (working copy) @@ -172,7 +172,7 @@ if (osms == null) { continue; } - if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers) { + if (osms.equals(osmStatus) && ms.modifiers == oldModifiers) { continue; }