Index: src/org/openstreetmap/josm/Main.java =================================================================== --- src/org/openstreetmap/josm/Main.java (revision 6083) +++ src/org/openstreetmap/josm/Main.java (working copy) @@ -572,6 +572,7 @@ protected static int windowState = JFrame.NORMAL; private final CommandQueueListener redoUndoListener = new CommandQueueListener(){ + @Override public void commandChanged(final int queueSize, final int redoSize) { menu.undo.setEnabled(queueSize > 0); menu.redo.setEnabled(redoSize > 0); Index: src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AboutAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/AboutAction.java (working copy) @@ -46,6 +46,7 @@ KeyEvent.VK_F1, Shortcut.SHIFT), true); } + @Override public void actionPerformed(ActionEvent e) { final JTabbedPane about = new JTabbedPane(); Index: src/org/openstreetmap/josm/actions/AbstractInfoAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/AbstractInfoAction.java (working copy) @@ -147,6 +147,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { launchInfoBrowsersForSelectedPrimitives(); } Index: src/org/openstreetmap/josm/actions/AddNodeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/AddNodeAction.java (working copy) @@ -29,6 +29,7 @@ putValue("help", ht("/Action/AddNode")); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/AlignInCircleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/AlignInCircleAction.java (working copy) @@ -84,6 +84,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/AlignInLineAction.java (working copy) @@ -99,6 +99,7 @@ /** * Operation depends on the selected objects: */ + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/AutoScaleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/AutoScaleAction.java (working copy) @@ -165,6 +165,7 @@ putValue("active", true); } + @Override public void actionPerformed(ActionEvent e) { autoScale(); } @@ -301,6 +302,7 @@ * Adapter for zoom change events */ private class ZoomChangeAdapter implements MapView.ZoomChangeListener { + @Override public void zoomChanged() { updateEnabledState(); } Index: src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (working copy) @@ -74,6 +74,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); } Index: src/org/openstreetmap/josm/actions/CloseChangesetAction.java =================================================================== --- src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/CloseChangesetAction.java (working copy) @@ -42,6 +42,7 @@ putValue("help", ht("/Action/CloseChangeset")); } + @Override public void actionPerformed(ActionEvent e) { Main.worker.submit(new DownloadOpenChangesetsTask()); } @@ -91,6 +92,7 @@ protected void finish() { SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { if (lastException != null) { ExceptionDialogUtil.explainException(lastException); Index: src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/CombineWayAction.java (working copy) @@ -190,6 +190,7 @@ return new Pair(targetWay, sequenceCommand); } + @Override public void actionPerformed(ActionEvent event) { if (getCurrentDataSet() == null) return; @@ -219,6 +220,7 @@ if(selectedWay != null) { Runnable guiTask = new Runnable() { + @Override public void run() { getCurrentDataSet().setSelected(selectedWay); } Index: src/org/openstreetmap/josm/actions/CreateCircleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/CreateCircleAction.java (working copy) @@ -74,6 +74,7 @@ return a; } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java =================================================================== --- src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (working copy) @@ -59,6 +59,7 @@ * * @param e Action Event */ + @Override public void actionPerformed(ActionEvent e) { if (Main.main.getEditLayer() == null) { JOptionPane.showMessageDialog(Main.parent, tr("No data loaded.")); @@ -111,6 +112,7 @@ // uses 'SwingUtilities.invokeLater' to fire events so we have to do // the same.) SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { Main.map.relationListDialog.selectRelation(relation); } Index: src/org/openstreetmap/josm/actions/DeleteAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DeleteAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/DeleteAction.java (working copy) @@ -20,6 +20,7 @@ putValue("help", ht("/Action/Delete")); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/DistributeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DistributeAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/DistributeAction.java (working copy) @@ -45,6 +45,7 @@ * that are furthest apart, and then to distribute all other selected * nodes along the straight line between these nodes. */ + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/DownloadAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DownloadAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/DownloadAction.java (working copy) @@ -31,6 +31,7 @@ putValue("help", ht("/Action/Download")); } + @Override public void actionPerformed(ActionEvent e) { DownloadDialog dialog = DownloadDialog.getInstance(); dialog.restoreSettings(); Index: src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (working copy) @@ -51,6 +51,7 @@ putValue("help", ht("/Action/DownloadObject")); } + @Override public void actionPerformed(ActionEvent e) { DownloadObjectDialog dialog = new DownloadObjectDialog(); Index: src/org/openstreetmap/josm/actions/DownloadReferrersAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (working copy) @@ -78,6 +78,7 @@ Main.worker.submit(new DownloadReferrersTask(targetLayer, id, type)); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled() || ! Main.isDisplayingMapView()) return; Index: src/org/openstreetmap/josm/actions/DuplicateAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DuplicateAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/DuplicateAction.java (working copy) @@ -23,6 +23,7 @@ putValue("help", ht("/Action/Duplicate")); } + @Override public void actionPerformed(ActionEvent e) { Main.main.menu.paste.pasteData(new PrimitiveDeepCopy(getCurrentDataSet().getSelected()), getEditLayer(), e); } Index: src/org/openstreetmap/josm/actions/ExitAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ExitAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ExitAction.java (working copy) @@ -25,6 +25,7 @@ putValue("help", ht("/Action/Exit")); } + @Override public void actionPerformed(ActionEvent e) { Main.exitJosm(true); } Index: src/org/openstreetmap/josm/actions/ExpertToggleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ExpertToggleAction.java (working copy) @@ -159,6 +159,7 @@ notifySelectedState(); } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); } Index: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (working copy) @@ -92,6 +92,7 @@ filters, new Comparator() { private AllFormatsImporter all = new AllFormatsImporter(); + @Override public int compare(ExtensionFileFilter o1, ExtensionFileFilter o2) { if (o1.getDescription().equals(all.filter.getDescription())) return 1; if (o2.getDescription().equals(all.filter.getDescription())) return -1; Index: src/org/openstreetmap/josm/actions/FullscreenToggleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (working copy) @@ -120,6 +120,7 @@ frame.getJMenuBar().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0), "none"); } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); } Index: src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/GpxExportAction.java (working copy) @@ -44,6 +44,7 @@ return (layer instanceof GpxLayer || layer instanceof OsmDataLayer) ? layer : null; } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/HelpAction.java =================================================================== --- src/org/openstreetmap/josm/actions/HelpAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/HelpAction.java (working copy) @@ -26,6 +26,7 @@ putValue("toolbar", "help"); } + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand() == null) { String topic; Index: src/org/openstreetmap/josm/actions/JoinNodeWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (working copy) @@ -32,6 +32,7 @@ putValue("help", ht("/Action/JoinNodeWay")); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- src/org/openstreetmap/josm/actions/JosmAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/JosmAction.java (working copy) @@ -230,14 +230,17 @@ } }); } + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { updateEnabledStateInEDT(); } + @Override public void layerAdded(Layer newLayer) { updateEnabledStateInEDT(); } + @Override public void layerRemoved(Layer oldLayer) { updateEnabledStateInEDT(); } @@ -248,6 +251,7 @@ * */ private class SelectionChangeAdapter implements SelectionChangedListener { + @Override public void selectionChanged(Collection newSelection) { updateEnabledState(newSelection); } Index: src/org/openstreetmap/josm/actions/MergeLayerAction.java =================================================================== --- src/org/openstreetmap/josm/actions/MergeLayerAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/MergeLayerAction.java (working copy) @@ -72,6 +72,7 @@ doMerge(targetLayers, Collections.singleton(sourceLayer)); } + @Override public void actionPerformed(ActionEvent e) { Layer sourceLayer = Main.main.getEditLayer(); if (sourceLayer == null) Index: src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/MergeNodesAction.java (working copy) @@ -57,6 +57,7 @@ putValue("help", ht("/Action/MergeNodes")); } + @Override public void actionPerformed(ActionEvent event) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/MergeSelectionAction.java =================================================================== --- src/org/openstreetmap/josm/actions/MergeSelectionAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/MergeSelectionAction.java (working copy) @@ -48,6 +48,7 @@ ((OsmDataLayer)targetLayer).mergeFrom(builder.build()); } + @Override public void actionPerformed(ActionEvent e) { if (getEditLayer() == null || getEditLayer().data.getAllSelected().isEmpty()) return; Index: src/org/openstreetmap/josm/actions/MirrorAction.java =================================================================== --- src/org/openstreetmap/josm/actions/MirrorAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/MirrorAction.java (working copy) @@ -37,6 +37,7 @@ putValue("help", ht("/Action/Mirror")); } + @Override public void actionPerformed(ActionEvent e) { Collection sel = getCurrentDataSet().getSelected(); HashSet nodes = new HashSet(); Index: src/org/openstreetmap/josm/actions/MoveAction.java =================================================================== --- src/org/openstreetmap/josm/actions/MoveAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/MoveAction.java (working copy) @@ -78,6 +78,7 @@ Main.toolbar.register(this); } + @Override public void actionPerformed(ActionEvent event) { if (!Main.isDisplayingMapView()) Index: src/org/openstreetmap/josm/actions/MoveNodeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/MoveNodeAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/MoveNodeAction.java (working copy) @@ -27,6 +27,7 @@ putValue("help", ht("/Action/MoveNode")); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled() || (getCurrentDataSet().getSelectedNodes().size() != 1)) return; Index: src/org/openstreetmap/josm/actions/NewAction.java =================================================================== --- src/org/openstreetmap/josm/actions/NewAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/NewAction.java (working copy) @@ -20,6 +20,7 @@ putValue("help", ht("/Action/NewLayer")); } + @Override public void actionPerformed(ActionEvent e) { Main.main.addLayer(new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null)); } Index: src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/OpenFileAction.java (working copy) @@ -62,6 +62,7 @@ putValue("help", ht("/Action/Open")); } + @Override public void actionPerformed(ActionEvent e) { JFileChooser fc = createAndOpenFileChooser(true, true, null); if (fc == null) @@ -217,6 +218,7 @@ if (!chosenImporter.acceptFile(f)) { if (f.isDirectory()) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(Main.parent, tr( "Cannot open directory ''{0}''.
Please select a file.", Index: src/org/openstreetmap/josm/actions/OpenLocationAction.java =================================================================== --- src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/OpenLocationAction.java (working copy) @@ -86,6 +86,7 @@ Main.pref.putCollection(getClass().getName() + ".uploadAddressHistory", cbHistory.getHistory()); } + @Override public void actionPerformed(ActionEvent e) { JCheckBox layer = new JCheckBox(tr("Separate Layer")); Index: src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (working copy) @@ -91,6 +91,7 @@ Shortcut.SHIFT), true, "action/orthogonalize/undo", true); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; @@ -122,6 +123,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java =================================================================== --- src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java (working copy) @@ -18,24 +18,31 @@ this.parameters = new HashMap(parameters); } + @Override public void addPropertyChangeListener(PropertyChangeListener listener) { action.addPropertyChangeListener(listener); } + @Override public Object getValue(String key) { return action.getValue(key); } + @Override public boolean isEnabled() { return action.isEnabled(); } + @Override public void putValue(String key, Object value) { action.putValue(key, value); } + @Override public void removePropertyChangeListener(PropertyChangeListener listener) { action.removePropertyChangeListener(listener); } + @Override public void setEnabled(boolean b) { action.setEnabled(b); } + @Override public void actionPerformed(ActionEvent e) { action.actionPerformed(e, parameters); } Index: src/org/openstreetmap/josm/actions/PasteAction.java =================================================================== --- src/org/openstreetmap/josm/actions/PasteAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/PasteAction.java (working copy) @@ -46,6 +46,7 @@ Main.pasteBuffer.addPasteBufferChangedListener(this); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/PreferencesAction.java =================================================================== --- src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/PreferencesAction.java (working copy) @@ -30,10 +30,12 @@ /** * Launch the preferences dialog. */ + @Override public void actionPerformed(ActionEvent e) { run(); } + @Override public void run() { new PreferenceDialog(Main.parent).setVisible(true); } Index: src/org/openstreetmap/josm/actions/PurgeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/PurgeAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/PurgeAction.java (working copy) @@ -236,6 +236,7 @@ ImageProvider.get("warning-small"), JLabel.LEFT), GBC.eol().fill(GBC.HORIZONTAL)); Collections.sort(toPurgeAdditionally, new Comparator() { + @Override public int compare(OsmPrimitive o1, OsmPrimitive o2) { int type = o2.getType().compareTo(o1.getType()); if (type != 0) @@ -266,6 +267,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs","select")); } + @Override public void actionPerformed(ActionEvent e) { layer.data.addSelected(toPurgeAdditionally); } Index: src/org/openstreetmap/josm/actions/RedoAction.java =================================================================== --- src/org/openstreetmap/josm/actions/RedoAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/RedoAction.java (working copy) @@ -28,6 +28,7 @@ putValue("help", ht("/Action/Redo")); } + @Override public void actionPerformed(ActionEvent e) { if (Main.map == null) return; Index: src/org/openstreetmap/josm/actions/RenameLayerAction.java =================================================================== --- src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/RenameLayerAction.java (working copy) @@ -41,6 +41,7 @@ this.putValue("help", ht("/Action/RenameLayer")); } + @Override public void actionPerformed(ActionEvent e) { Box panel = Box.createVerticalBox(); final JosmTextField name = new JosmTextField(layer.getName()); Index: src/org/openstreetmap/josm/actions/RestartAction.java =================================================================== --- src/org/openstreetmap/josm/actions/RestartAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/RestartAction.java (working copy) @@ -40,6 +40,7 @@ setEnabled(isRestartSupported()); } + @Override public void actionPerformed(ActionEvent e) { try { restartJOSM(); Index: src/org/openstreetmap/josm/actions/ReverseWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ReverseWayAction.java (working copy) @@ -70,6 +70,7 @@ putValue("help", ht("/Action/ReverseWays")); } + @Override public void actionPerformed(ActionEvent e) { if (! isEnabled()) return; Index: src/org/openstreetmap/josm/actions/SelectAllAction.java =================================================================== --- src/org/openstreetmap/josm/actions/SelectAllAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/SelectAllAction.java (working copy) @@ -17,6 +17,7 @@ putValue("help", ht("/Action/SelectAll")); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/SessionLoadAction.java =================================================================== --- src/org/openstreetmap/josm/actions/SessionLoadAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/SessionLoadAction.java (working copy) @@ -31,6 +31,7 @@ putValue("help", ht("/Action/SessionLoad")); } + @Override public void actionPerformed(ActionEvent e) { ExtensionFileFilter ff = new ExtensionFileFilter("jos,joz", "jos", tr("Session file (*.jos, *.joz)")); JFileChooser fc = createAndOpenFileChooser(true, false, tr("Open session"), Arrays.asList(ff, FileFilterAllFiles.getInstance()), ff, JFileChooser.FILES_ONLY, "lastDirectory"); Index: src/org/openstreetmap/josm/actions/ShowStatusReportAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (working copy) @@ -134,6 +134,7 @@ return text.toString(); } + @Override public void actionPerformed(ActionEvent e) { StringBuilder text = new StringBuilder(); String reportHeader = getReportHeader(); Index: src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/SimplifyWayAction.java (working copy) @@ -84,6 +84,7 @@ return ret == 0; } + @Override public void actionPerformed(ActionEvent e) { DataSet ds = getCurrentDataSet(); ds.beginUpdate(); Index: src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/SplitWayAction.java (working copy) @@ -116,6 +116,7 @@ * This method performs an expensive check whether the selection clearly defines one * of the split actions outlined above, and if yes, calls the splitWay method. */ + @Override public void actionPerformed(ActionEvent e) { Collection selection = getCurrentDataSet().getSelected(); Index: src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java (working copy) @@ -18,6 +18,7 @@ putValue("help", ht("/Action/ToggleGPXLines")); } + @Override public void actionPerformed(ActionEvent e) { Main.pref.put("draw.rawgps.lines", !Main.pref.getBoolean("draw.rawgps.lines", true)); if (Main.isDisplayingMapView()) { Index: src/org/openstreetmap/josm/actions/UndoAction.java =================================================================== --- src/org/openstreetmap/josm/actions/UndoAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/UndoAction.java (working copy) @@ -28,6 +28,7 @@ putValue("help", ht("/Action/Undo")); } + @Override public void actionPerformed(ActionEvent e) { if (Main.map == null) return; Index: src/org/openstreetmap/josm/actions/UnselectAllAction.java =================================================================== --- src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/UnselectAllAction.java (working copy) @@ -19,6 +19,7 @@ putValue("help", ht("/Action/UnselectAll")); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- src/org/openstreetmap/josm/actions/UploadAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/UploadAction.java (working copy) @@ -227,6 +227,7 @@ // after these events. // TODO: find better way to initialize the comment field SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { dialog.setDefaultChangesetTags(layer.data.getChangeSetTags()); } @@ -252,6 +253,7 @@ ); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; Index: src/org/openstreetmap/josm/actions/UploadSelectionAction.java =================================================================== --- src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/UploadSelectionAction.java (working copy) @@ -86,6 +86,7 @@ return ret; } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; @@ -189,6 +190,7 @@ hull = new HashSet(); } + @Override public void visit(Node n) { if (n.isNewOrUndeleted() || n.isModified() || n.isDeleted()) { // upload new nodes as well as modified and deleted ones @@ -196,6 +198,7 @@ } } + @Override public void visit(Way w) { if (w.isNewOrUndeleted() || w.isModified() || w.isDeleted()) { // upload new ways as well as modified and deleted ones @@ -208,6 +211,7 @@ } } + @Override public void visit(Relation r) { if (r.isNewOrUndeleted() || r.isModified() || r.isDeleted()) { hull.add(r); @@ -223,6 +227,7 @@ } } + @Override public void visit(Changeset cs) { // do nothing } @@ -282,6 +287,7 @@ return; } Runnable r = new Runnable() { + @Override public void run() { processPostParentChecker(layer, toUpload); } Index: src/org/openstreetmap/josm/actions/ValidateAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ValidateAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ValidateAction.java (working copy) @@ -48,6 +48,7 @@ KeyEvent.VK_V, Shortcut.SHIFT), true); } + @Override public void actionPerformed(ActionEvent ev) { doValidate(ev, true); } Index: src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java (working copy) @@ -57,6 +57,7 @@ Main.map.mapView.viewportFollowing = selected; notifySelectedState(); } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); } Index: src/org/openstreetmap/josm/actions/WireframeToggleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/WireframeToggleAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/WireframeToggleAction.java (working copy) @@ -71,6 +71,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); } Index: src/org/openstreetmap/josm/actions/ZoomInAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ZoomInAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ZoomInAction.java (working copy) @@ -27,6 +27,7 @@ KeyEvent.VK_ADD, Shortcut.DIRECT)); } + @Override public void actionPerformed(ActionEvent e) { if (!Main.isDisplayingMapView()) return; Main.map.mapView.zoomToFactor(1/Math.sqrt(2)); Index: src/org/openstreetmap/josm/actions/ZoomOutAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ZoomOutAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ZoomOutAction.java (working copy) @@ -22,6 +22,7 @@ KeyEvent.VK_SUBTRACT, Shortcut.DIRECT)); } + @Override public void actionPerformed(ActionEvent e) { if (!Main.isDisplayingMapView()) return; Main.map.mapView.zoomToFactor(Math.sqrt(2)); Index: src/org/openstreetmap/josm/actions/ZoomToAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ZoomToAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/ZoomToAction.java (working copy) @@ -60,6 +60,7 @@ tr("Zooming disabled because there is no selected node")); } + @Override public void actionPerformed(ActionEvent e) { if (! isEnabled()) return; @@ -90,18 +91,22 @@ putValue(SHORT_DESCRIPTION, descriptionNominal); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { updateEnabledState(); } + @Override public void layerAdded(Layer newLayer) { updateEnabledState(); } + @Override public void layerRemoved(Layer oldLayer) { updateEnabledState(); } Index: src/org/openstreetmap/josm/actions/audio/AudioBackAction.java =================================================================== --- src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (working copy) @@ -29,6 +29,7 @@ this.putValue("help", ht("/Action/AudioBack")); } + @Override public void actionPerformed(ActionEvent e) { try { if (AudioPlayer.playing() || AudioPlayer.paused()) Index: src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java =================================================================== --- src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (working copy) @@ -32,6 +32,7 @@ multiplier = 1.0 / multiplier; } + @Override public void actionPerformed(ActionEvent e) { double speed = AudioPlayer.speed(); if (speed * multiplier <= 0.1) Index: src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java =================================================================== --- src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (working copy) @@ -27,6 +27,7 @@ Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", trc("audio", "Forward")), KeyEvent.VK_F7, Shortcut.DIRECT), true); } + @Override public void actionPerformed(ActionEvent e) { try { if (AudioPlayer.playing() || AudioPlayer.paused()) Index: src/org/openstreetmap/josm/actions/audio/AudioNextAction.java =================================================================== --- src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (working copy) @@ -26,6 +26,7 @@ Shortcut.registerShortcut("audio:next", tr("Audio: {0}", trc("audio", "Next Marker")), KeyEvent.VK_F8, Shortcut.DIRECT), true); } + @Override public void actionPerformed(ActionEvent e) { MarkerLayer.playNextMarker(); } Index: src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java =================================================================== --- src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (working copy) @@ -29,6 +29,7 @@ Shortcut.registerShortcut("audio:pause", tr("Audio: {0}", trc("audio", "Play/Pause")), KeyEvent.VK_PERIOD, Shortcut.DIRECT), true); } + @Override public void actionPerformed(ActionEvent e) { URL url = AudioPlayer.url(); try { Index: src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java =================================================================== --- src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (working copy) @@ -26,6 +26,7 @@ Shortcut.registerShortcut("audio:prev", tr("Audio: {0}", trc("audio", "Previous Marker")), KeyEvent.VK_F5, Shortcut.DIRECT), true); } + @Override public void actionPerformed(ActionEvent e) { MarkerLayer.playPreviousMarker(); } Index: src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java =================================================================== --- src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (revision 6083) +++ src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (working copy) @@ -164,6 +164,7 @@ visitor.merge(); SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { targetLayer.onPostDownloadFromServer(); Main.map.mapView.repaint(); Index: src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java =================================================================== --- src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (revision 6083) +++ src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (working copy) @@ -58,6 +58,7 @@ this.futures.addAll(futures); } + @Override public void run() { // wait for all downloads task to finish (by waiting for the futures // to return a value) Index: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (working copy) @@ -396,6 +396,7 @@ /** * This is required to update the cursors when ctrl/shift/alt is pressed */ + @Override public void eventDispatched(AWTEvent e) { if(oldEvent == null) return; Index: src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 6083) +++ src/org/openstreetmap/josm/actions/mapmode/MapMode.java (working copy) @@ -76,6 +76,7 @@ /** * Call selectMapMode(this) on the parent mapFrame. */ + @Override public void actionPerformed(ActionEvent e) { if (Main.isDisplayingMapView()) { Main.map.selectMapMode(this); @@ -109,11 +110,18 @@ } } + @Override public void mouseReleased(MouseEvent e) {requestFocusInMapView();} + @Override public void mouseExited(MouseEvent e) {} + @Override public void mousePressed(MouseEvent e) {requestFocusInMapView();} + @Override public void mouseClicked(MouseEvent e) {} + @Override public void mouseEntered(MouseEvent e) {} + @Override public void mouseMoved(MouseEvent e) {} + @Override public void mouseDragged(MouseEvent e) {} } Index: src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (working copy) @@ -210,6 +210,7 @@ /** * This is called whenever the keyboard modifier status changes */ + @Override public void eventDispatched(AWTEvent e) { if(oldEvent == null) return; @@ -444,6 +445,7 @@ useLastMoveCommandIfPossible(); // Schedule a timer to update status line "initialMoveDelay+1" ms in the future GuiHelper.scheduleTimer(initialMoveDelay+1, new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { updateStatusLine(); } @@ -603,6 +605,7 @@ // We need to do it like this as otherwise drawAction will see a double // click and switch back to SelectMode Main.worker.execute(new Runnable() { + @Override public void run() { Main.map.selectDrawTool(true); } Index: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (working copy) @@ -50,6 +50,7 @@ /** * Zoom to the rectangle on the map. */ + @Override public void selectionEnded(Rectangle r, MouseEvent e) { if (r.width >= 3 && r.height >= 3 && Main.isDisplayingMapView()) { MapView mv = Main.map.mapView; Index: src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 6083) +++ src/org/openstreetmap/josm/actions/search/SearchAction.java (working copy) @@ -125,12 +125,14 @@ putValue("help", ht("/Action/Search")); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; search(); } + @Override public void actionPerformed(ActionEvent e, Map parameters) { if (parameters.get(SEARCH_EXPRESSION) == null) { actionPerformed(e); @@ -725,6 +727,7 @@ setEnabled(getEditLayer() != null); } + @Override public List> getActionParameters() { return Collections.>singletonList(new SearchSettingsActionParameter(SEARCH_EXPRESSION)); } Index: src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java =================================================================== --- src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (revision 6083) +++ src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (working copy) @@ -20,6 +20,7 @@ public class ApiPreconditionCheckerHook implements UploadHook { + @Override public boolean checkUpload(APIDataSet apiData) { OsmApi api = OsmApi.getOsmApi(); try { Index: src/org/openstreetmap/josm/actions/upload/FixDataHook.java =================================================================== --- src/org/openstreetmap/josm/actions/upload/FixDataHook.java (revision 6083) +++ src/org/openstreetmap/josm/actions/upload/FixDataHook.java (working copy) @@ -42,6 +42,7 @@ deprecated.add(new FixDataTag("oneway", "1", "oneway", "yes")); deprecated.add(new FixDataTag("highway", "stile", "barrier", "stile")); deprecated.add(new FixData() { + @Override public boolean fixKeys(Map keys, OsmPrimitive osm) { if(osm instanceof Relation && "multipolygon".equals(keys.get("type")) && "administrative".equals(keys.get("boundary"))) { keys.put("type", "boundary"); Index: src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java =================================================================== --- src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 6083) +++ src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (working copy) @@ -96,6 +96,7 @@ dialog.showDialog(); } + @Override public boolean checkUpload(APIDataSet apiDataSet) { this.data = apiDataSet; try { Index: src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java =================================================================== --- src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (revision 6083) +++ src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (working copy) @@ -42,6 +42,7 @@ /** * Validate the modified data before uploading */ + @Override public boolean checkUpload(APIDataSet apiDataSet) { Collection tests = OsmValidator.getEnabledTests(true); Index: src/org/openstreetmap/josm/command/Command.java =================================================================== --- src/org/openstreetmap/josm/command/Command.java (revision 6083) +++ src/org/openstreetmap/josm/command/Command.java (working copy) @@ -40,12 +40,15 @@ private static final class CloneVisitor extends AbstractVisitor { public final Map orig = new LinkedHashMap(); + @Override public void visit(Node n) { orig.put(n, n.save()); } + @Override public void visit(Way w) { orig.put(w, w.save()); } + @Override public void visit(Relation e) { orig.put(e, e.save()); } Index: src/org/openstreetmap/josm/corrector/CorrectionTable.java =================================================================== --- src/org/openstreetmap/josm/corrector/CorrectionTable.java (revision 6083) +++ src/org/openstreetmap/josm/corrector/CorrectionTable.java (working copy) @@ -17,6 +17,7 @@ public static class BoldRenderer extends JLabel implements TableCellRenderer { + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { @@ -45,6 +46,7 @@ setRowSelectionAllowed(false); } + @Override public TableCellRenderer getCellRenderer(int row, int column) { if (getCorrectionTableModel().isBoldCell(row, column)) { if (boldRenderer == null) Index: src/org/openstreetmap/josm/corrector/CorrectionTableModel.java =================================================================== --- src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 6083) +++ src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (working copy) @@ -23,6 +23,7 @@ applyColumn = getColumnCount() - 1; } + @Override abstract public int getColumnCount(); abstract protected boolean isBoldCell(int row, int column); @@ -41,6 +42,7 @@ return apply[i]; } + @Override public int getRowCount() { return corrections.size(); } @@ -71,6 +73,7 @@ apply[rowIndex] = (Boolean)aValue; } + @Override public Object getValueAt(int rowIndex, int colIndex) { if (colIndex == applyColumn) return apply[rowIndex]; Index: src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java =================================================================== --- src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java (revision 6083) +++ src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java (working copy) @@ -31,6 +31,7 @@ return null; } + @Override public Object getCorrectionValueAt(int rowIndex, int colIndex) { TagCorrection tagCorrection = getCorrections().get(rowIndex); @@ -47,6 +48,7 @@ return null; } + @Override protected boolean isBoldCell(int row, int column) { TagCorrection tagCorrection = getCorrections().get(row); return (column == 2 && tagCorrection.isKeyChanged()) Index: src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- src/org/openstreetmap/josm/data/APIDataSet.java (revision 6083) +++ src/org/openstreetmap/josm/data/APIDataSet.java (working copy) @@ -336,6 +336,7 @@ Collections.sort( ret, new Comparator() { + @Override public int compare(Relation o1, Relation o2) { return Integer.valueOf(uploadOrder.indexOf(o1)).compareTo(uploadOrder.indexOf(o2)); } Index: src/org/openstreetmap/josm/data/AutosaveTask.java =================================================================== --- src/org/openstreetmap/josm/data/AutosaveTask.java (revision 6083) +++ src/org/openstreetmap/josm/data/AutosaveTask.java (working copy) @@ -334,6 +334,7 @@ final OpenFileTask openFileTsk = new OpenFileTask(files, null, tr("Restoring files")); Main.worker.submit(openFileTsk); Main.worker.submit(new Runnable() { + @Override public void run() { for (File f: openFileTsk.getSuccessfullyOpenedFiles()) { moveToDeletedLayersFolder(f); Index: src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 6083) +++ src/org/openstreetmap/josm/data/CustomConfigurator.java (working copy) @@ -329,6 +329,7 @@ final ReadLocalPluginInformationTask task = new ReadLocalPluginInformationTask(); Runnable r = new Runnable() { + @Override public void run() { if (task.isCanceled()) return; synchronized (CustomConfigurator.class) { @@ -337,6 +338,7 @@ } catch (InterruptedException ex) { } SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { List availablePlugins = task.getAvailablePlugins(); List toInstallPlugins = new ArrayList(); Index: src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- src/org/openstreetmap/josm/data/Preferences.java (revision 6083) +++ src/org/openstreetmap/josm/data/Preferences.java (working copy) @@ -261,12 +261,15 @@ this.newValue = newValue; } + @Override public String getKey() { return key; } + @Override public Setting getOldValue() { return oldValue; } + @Override public Setting getNewValue() { return newValue; } @@ -1266,17 +1269,21 @@ if (value == null) return false; class PutVisitor implements SettingVisitor { public boolean changed; + @Override public void visit(StringSetting setting) { changed = put(key, setting.getValue()); } + @Override public void visit(ListSetting setting) { changed = putCollection(key, setting.getValue()); } + @Override public void visit(ListListSetting setting) { @SuppressWarnings("unchecked") boolean changed = putArray(key, (Collection) setting.getValue()); this.changed = changed; } + @Override public void visit(MapListSetting setting) { changed = putListOfStructs(key, setting.getValue()); } @@ -1549,6 +1556,7 @@ this.key = key; } + @Override public void visit(StringSetting setting) { if (noPassword && key.equals("osm-server.password")) return; // do not store plain password. @@ -1564,6 +1572,7 @@ } } + @Override public void visit(ListSetting setting) { b.append(" \n"); for (String s : setting.getValue()) { @@ -1572,6 +1581,7 @@ b.append(" \n"); } + @Override public void visit(ListListSetting setting) { b.append(" \n"); for (List list : setting.getValue()) { @@ -1584,6 +1594,7 @@ b.append(" \n"); } + @Override public void visit(MapListSetting setting) { b.append(" \n"); for (Map struct : setting.getValue()) { Index: src/org/openstreetmap/josm/data/UndoRedoHandler.java =================================================================== --- src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 6083) +++ src/org/openstreetmap/josm/data/UndoRedoHandler.java (working copy) @@ -156,11 +156,14 @@ } } + @Override public void layerRemoved(Layer oldLayer) { clean(oldLayer); } + @Override public void layerAdded(Layer newLayer) {} + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) {} public void removeCommandQueueListener(CommandQueueListener l) { Index: src/org/openstreetmap/josm/data/conflict/ConflictCollection.java =================================================================== --- src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 6083) +++ src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (working copy) @@ -265,6 +265,7 @@ * * @return the iterator */ + @Override public Iterator> iterator() { return conflicts.iterator(); } Index: src/org/openstreetmap/josm/data/coor/Coordinate.java =================================================================== --- src/org/openstreetmap/josm/data/coor/Coordinate.java (revision 6083) +++ src/org/openstreetmap/josm/data/coor/Coordinate.java (working copy) @@ -31,14 +31,17 @@ this.x = x; this.y = y; } + @Override public double getX() { return x; } + @Override public double getY() { return y; } + @Override public void setLocation (double x, double y) { this.x = x; this.y = y; Index: src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java =================================================================== --- src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java (revision 6083) +++ src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java (working copy) @@ -46,6 +46,7 @@ return result; } + @Override public Bounds getBounds() { if (bounds == null) return null; @@ -53,14 +54,17 @@ return new Bounds(bounds); } + @Override public Collection getWayPoints() { return wayPoints; } + @Override public double length() { return length; } + @Override public int getUpdateCount() { return 0; } Index: src/org/openstreetmap/josm/data/gpx/WayPoint.java =================================================================== --- src/org/openstreetmap/josm/data/gpx/WayPoint.java (revision 6083) +++ src/org/openstreetmap/josm/data/gpx/WayPoint.java (working copy) @@ -112,6 +112,7 @@ } } + @Override public int compareTo(WayPoint w) { return Double.compare(time, w.time); } Index: src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java =================================================================== --- src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (working copy) @@ -159,10 +159,12 @@ this.primitive = primitive; } + @Override public ChangesetModificationType getModificationType() { return modificationType; } + @Override public HistoryOsmPrimitive getPrimitive() { return primitive; } @@ -175,10 +177,12 @@ typeIterator = modificationTypes.entrySet().iterator(); } + @Override public boolean hasNext() { return typeIterator.hasNext(); } + @Override public ChangesetDataSetEntry next() { Entry next = typeIterator.next(); ChangesetModificationType type = next.getValue(); @@ -186,6 +190,7 @@ return new DefaultChangesetDataSetEntry(type, primitive); } + @Override public void remove() { throw new UnsupportedOperationException(); } Index: src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java =================================================================== --- src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java (working copy) @@ -20,15 +20,19 @@ removed = new HashSet(); } + @Override public Collection getAddedChangesets() { return Collections.unmodifiableCollection(added); } + @Override public Collection getRemovedChangesets() { return Collections.unmodifiableCollection(removed); } + @Override public ChangesetCache getSource() { return source; } + @Override public Collection getUpdatedChangesets() { return Collections.unmodifiableCollection(modified); } Index: src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java =================================================================== --- src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java (working copy) @@ -54,6 +54,7 @@ return -1; } + @Override public int compare(OsmPrimitive a, OsmPrimitive b) { if (a.getType().equals(b.getType())) return compareName(a, b); Index: src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java =================================================================== --- src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java (working copy) @@ -48,11 +48,13 @@ new AbstractVisitor() { boolean firstIteration; + @Override public void visit(Node n) { if (!visitedNodeIds.add(n.getUniqueId())) return; (firstIteration ? directlyAdded : referenced).add(n.save()); } + @Override public void visit(Way w) { if (!visitedWayIds.add(w.getUniqueId())) return; @@ -62,6 +64,7 @@ visit(n); } } + @Override public void visit(Relation r) { if (!visitedRelationIds.add(r.getUniqueId())) return; Index: src/org/openstreetmap/josm/data/osm/QuadBuckets.java =================================================================== --- src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/QuadBuckets.java (working copy) @@ -507,6 +507,7 @@ { clear(); } + @Override public void clear() { root = new QBLevel(); search_cache = null; @@ -516,12 +517,14 @@ out("root: " + root + " level: " + root.level + " bbox: " + root.bbox()); }*/ } + @Override public boolean add(T n) { root.add(n); size++; return true; } + @Override public boolean retainAll(Collection objects) { for (T o : this) { @@ -533,6 +536,7 @@ } return true; } + @Override public boolean removeAll(Collection objects) { boolean changed = false; @@ -541,6 +545,7 @@ } return changed; } + @Override public boolean addAll(Collection objects) { boolean changed = false; @@ -549,6 +554,7 @@ } return changed; } + @Override public boolean containsAll(Collection objects) { for (Object o : objects) { @@ -557,6 +563,7 @@ } return true; } + @Override public boolean remove(Object o) { @SuppressWarnings("unchecked") T t = (T) o; search_cache = null; // Search cache might point to one of removed buckets @@ -567,6 +574,7 @@ } else return false; } + @Override public boolean contains(Object o) { @SuppressWarnings("unchecked") T t = (T) o; QBLevel bucket = root.findBucket(t.getBBox()); @@ -584,10 +592,12 @@ }*/ return a; } + @Override public Object[] toArray() { return this.toArrayList().toArray(); } + @Override public A[] toArray(A[] template) { return this.toArrayList().toArray(template); @@ -625,6 +635,7 @@ }*/ iterated_over = 0; } + @Override public boolean hasNext() { if (this.peek() == null) @@ -659,6 +670,7 @@ return null; return current_node.content.get(content_index); } + @Override public T next() { T ret = peek(); @@ -674,6 +686,7 @@ } return ret; } + @Override public void remove() { // two uses @@ -685,14 +698,17 @@ current_node.remove_content(object); } } + @Override public Iterator iterator() { return new QuadBucketIterator(this); } + @Override public int size() { return size; } + @Override public boolean isEmpty() { if (this.size() == 0) Index: src/org/openstreetmap/josm/data/osm/RelationMember.java =================================================================== --- src/org/openstreetmap/josm/data/osm/RelationMember.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/RelationMember.java (working copy) @@ -170,6 +170,7 @@ /** * PrimitiveId implementation. Returns the same value as getMember().getType() */ + @Override public OsmPrimitiveType getType() { return member.getType(); } @@ -177,10 +178,12 @@ /** * PrimitiveId implementation. Returns the same value as getMemberType().getUniqueId() */ + @Override public long getUniqueId() { return member.getUniqueId(); } + @Override public boolean isNew() { return member.isNew(); } Index: src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java =================================================================== --- src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java (working copy) @@ -14,14 +14,17 @@ this.type = type; } + @Override public OsmPrimitiveType getType() { return type; } + @Override public long getUniqueId() { return id; } + @Override public boolean isNew() { return id <= 0; } Index: src/org/openstreetmap/josm/data/osm/Storage.java =================================================================== --- src/org/openstreetmap/josm/data/osm/Storage.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/Storage.java (working copy) @@ -89,10 +89,12 @@ public static class PrimitiveIdHash implements Hash { + @Override public int getHashCode(PrimitiveId k) { return (int)k.getUniqueId() ^ k.getType().hashCode(); } + @Override public boolean equals(PrimitiveId key, PrimitiveId value) { if (key == null || value == null) return false; return key.getUniqueId() == value.getUniqueId() && key.getType() == value.getType(); @@ -360,9 +362,11 @@ */ public static Hash defaultHash() { return new Hash() { + @Override public int getHashCode(O t) { return t.hashCode(); } + @Override public boolean equals(O t1, O t2) { return t1.equals(t2); } @@ -388,35 +392,42 @@ fHash = h; } + @Override public int size() { return Storage.this.size(); } + @Override public boolean isEmpty() { return Storage.this.isEmpty(); } + @Override public boolean containsKey(Object o) { @SuppressWarnings("unchecked") K key = (K) o; int bucket = getBucket(fHash, key); return bucket >= 0; } + @Override public boolean containsValue(Object value) { return Storage.this.contains(value); } + @Override public T get(Object o) { @SuppressWarnings("unchecked") K key = (K) o; int bucket = getBucket(fHash, key); return bucket < 0 ? null : data[bucket]; } + @Override public T put(K key, T value) { if (!fHash.equals(key, value)) throw new IllegalArgumentException("inconsistent key"); return Storage.this.put(value); } + @Override public T remove(Object o) { modCount++; @SuppressWarnings("unchecked") K key = (K) o; @@ -425,6 +436,7 @@ return bucket < 0 ? null : doRemove(bucket); } + @Override public void putAll(Map m) { if (m instanceof Storage.FMap) { Storage.this.addAll(((Storage.FMap)m).values()); @@ -435,18 +447,22 @@ } } + @Override public void clear() { Storage.this.clear(); } + @Override public Set keySet() { throw new UnsupportedOperationException(); } + @Override public Collection values() { return Storage.this; } + @Override public Set> entrySet() { throw new UnsupportedOperationException(); } @@ -460,16 +476,19 @@ this.data = data; } + @Override public boolean hasNext() { align(); return slot < data.length; } + @Override public T next() { if (!hasNext()) throw new NoSuchElementException(); return data[slot++]; } + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -491,17 +510,20 @@ mods = modCount; } + @Override public boolean hasNext() { align(); return slot < data.length; } + @Override public T next() { if (!hasNext()) throw new NoSuchElementException(); removeSlot = slot; return data[slot++]; } + @Override public void remove() { if (removeSlot == -1) throw new IllegalStateException(); Index: src/org/openstreetmap/josm/data/osm/TagCollection.java =================================================================== --- src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/TagCollection.java (working copy) @@ -484,6 +484,7 @@ * * @return the iterator */ + @Override public Iterator iterator() { return tags.iterator(); } Index: src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java =================================================================== --- src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java (working copy) @@ -19,34 +19,42 @@ this.listener = listener; } + @Override public void dataChanged(DataChangedEvent event) { listener.processDatasetEvent(event); } + @Override public void nodeMoved(NodeMovedEvent event) { listener.processDatasetEvent(event); } + @Override public void primitivesAdded(PrimitivesAddedEvent event) { listener.processDatasetEvent(event); } + @Override public void primitivesRemoved(PrimitivesRemovedEvent event) { listener.processDatasetEvent(event); } + @Override public void relationMembersChanged(RelationMembersChangedEvent event) { listener.processDatasetEvent(event); } + @Override public void tagsChanged(TagsChangedEvent event) { listener.processDatasetEvent(event); } + @Override public void wayNodesChanged(WayNodesChangedEvent event) { listener.processDatasetEvent(event); } + @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) { listener.processDatasetEvent(event); } Index: src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java =================================================================== --- src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (working copy) @@ -97,6 +97,7 @@ normalListeners.remove(searchListener); } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { if (oldLayer != null) { oldLayer.data.removeDataSetListener(myListener); @@ -126,6 +127,7 @@ } } + @Override public void processDatasetEvent(AbstractDatasetChangedEvent event) { fireEvents(normalListeners, event); eventsInEDT.add(event); @@ -133,6 +135,7 @@ } private final Runnable edtRunnable = new Runnable() { + @Override public void run() { while (!eventsInEDT.isEmpty()) { List events = new ArrayList(); Index: src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java =================================================================== --- src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (working copy) @@ -67,6 +67,7 @@ normalListeners.remove(searchListener); } + @Override public void selectionChanged(Collection newSelection) { fireEvents(normalListeners, newSelection); selection = newSelection; @@ -80,6 +81,7 @@ } private final Runnable edtRunnable = new Runnable() { + @Override public void run() { if (selection != null) { fireEvents(inEDTListeners, selection); Index: src/org/openstreetmap/josm/data/osm/history/History.java =================================================================== --- src/org/openstreetmap/josm/data/osm/history/History.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/history/History.java (working copy) @@ -66,6 +66,7 @@ Collections.sort( copy, new Comparator() { + @Override public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) { return o1.compareTo(o2); } @@ -79,6 +80,7 @@ Collections.sort( copy, new Comparator() { + @Override public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) { return o2.compareTo(o1); } @@ -91,6 +93,7 @@ return filter( this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getTimestamp().compareTo(fromDate) >= 0; } @@ -102,6 +105,7 @@ return filter( this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getTimestamp().compareTo(untilDate) <= 0; } @@ -117,6 +121,7 @@ return filter( this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getVersion() >= fromVersion; } @@ -128,6 +133,7 @@ return filter( this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getVersion() <= untilVersion; } @@ -143,6 +149,7 @@ return filter( this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getUser() != null && primitive.getUser().getId() == uid; } Index: src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java =================================================================== --- src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (working copy) @@ -163,8 +163,11 @@ /* ------------------------------------------------------------------------------ */ /* interface LayerChangeListener */ /* ------------------------------------------------------------------------------ */ + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) {/* irrelevant in this context */} + @Override public void layerAdded(Layer newLayer) {/* irrelevant in this context */} + @Override public void layerRemoved(Layer oldLayer) { if (Main.map == null || Main.map.mapView == null) return; if (Main.map.mapView.getNumLayers() == 0) { Index: src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java =================================================================== --- src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (working copy) @@ -148,6 +148,7 @@ public abstract OsmPrimitiveType getType(); + @Override public int compareTo(HistoryOsmPrimitive o) { if (this.id != o.id) throw new ClassCastException(tr("Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''.", o.id, this.id)); Index: src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java (working copy) @@ -12,6 +12,7 @@ */ public abstract class AbstractVisitor implements Visitor { + @Override public void visit(Changeset cs) { // do nothing } Index: src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (working copy) @@ -25,6 +25,7 @@ /** * Nodes have only itself as nodes. */ + @Override public void visit(Node n) { nodes.add(n); } @@ -32,6 +33,7 @@ /** * Ways have their way nodes. */ + @Override public void visit(Way w) { if (w.isIncomplete()) return; for (Node n : w.getNodes()) @@ -43,6 +45,7 @@ * FIXME: do we want to collect nodes from segs/ways that are relation members? * if so, use AutomatchVisitor! */ + @Override public void visit(Relation e) { for (RelationMember m : e.getMembers()) if (m.isNode()) visit(m.getNode()); Index: src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (working copy) @@ -24,10 +24,12 @@ private ProjectionBounds bounds = null; + @Override public void visit(Node n) { visit(n.getEastNorth()); } + @Override public void visit(Way w) { if (w.isIncomplete()) return; for (Node n : w.getNodes()) { @@ -35,6 +37,7 @@ } } + @Override public void visit(Relation e) { // only use direct members for (RelationMember m : e.getMembers()) { Index: src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (working copy) @@ -125,10 +125,12 @@ mappedPrimitives.put(primitive, clone); } + @Override public void visit(Node n) { rememberNode(n); } + @Override public void visit(Way w) { // remember all nodes this way refers to ... // @@ -139,6 +141,7 @@ rememberWay(w); } + @Override public void visit(Relation r) { // first, remember all primitives members refer to (only if necessary, see // below) Index: src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java (working copy) @@ -102,6 +102,7 @@ } + @Override public void preferenceChanged(PreferenceChangeEvent e) { load(); } Index: src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java (working copy) @@ -38,10 +38,12 @@ private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() { + @Override public void mapPaintStylesUpdated() { backgroundColorCache = null; } + @Override public void mapPaintStyleEntryUpdated(int idx) { mapPaintStylesUpdated(); } Index: src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (working copy) @@ -153,6 +153,7 @@ * @param virtual true if virtual nodes are used * @param bounds display boundaries */ + @Override public void render(DataSet data, boolean virtual, Bounds bounds) { BBox bbox = new BBox(bounds); this.ds = data; Index: src/org/openstreetmap/josm/gui/BookmarkList.java =================================================================== --- src/org/openstreetmap/josm/gui/BookmarkList.java (revision 6083) +++ src/org/openstreetmap/josm/gui/BookmarkList.java (working copy) @@ -66,6 +66,7 @@ return name; } + @Override public int compareTo(Bookmark b) { return name.toLowerCase().compareTo(b.name.toLowerCase()); } @@ -223,6 +224,7 @@ return sb.toString(); } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Index: src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6083) +++ src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (working copy) @@ -137,6 +137,7 @@ * @param node the node * @return the name */ + @Override public String format(Node node) { StringBuilder name = new StringBuilder(); if (node.isIncomplete()) { @@ -202,6 +203,7 @@ } }; + @Override public Comparator getNodeComparator() { return nodeComparator; } @@ -213,6 +215,7 @@ * @param way the way * @return the name */ + @Override public String format(Way way) { StringBuilder name = new StringBuilder(); if (way.isIncomplete()) { @@ -292,6 +295,7 @@ } }; + @Override public Comparator getWayComparator() { return wayComparator; } @@ -303,6 +307,7 @@ * @param relation the relation * @return the name */ + @Override public String format(Relation relation) { StringBuilder name = new StringBuilder(); if (relation.isIncomplete()) { @@ -400,6 +405,7 @@ } }; + @Override public Comparator getRelationComparator() { return relationComparator; } @@ -483,6 +489,7 @@ * @param changeset the changeset * @return the name */ + @Override public String format(Changeset changeset) { return tr("Changeset {0}",changeset.getId()); } @@ -546,6 +553,7 @@ * @param node the node * @return the name */ + @Override public String format(HistoryNode node) { StringBuilder sb = new StringBuilder(); String name; @@ -577,6 +585,7 @@ * @param way the way * @return the name */ + @Override public String format(HistoryWay way) { StringBuilder sb = new StringBuilder(); String name; @@ -618,6 +627,7 @@ * @param relation the relation * @return the name */ + @Override public String format(HistoryRelation relation) { StringBuilder sb = new StringBuilder(); if (relation.get("type") != null) { Index: src/org/openstreetmap/josm/gui/FileDrop.java =================================================================== --- src/org/openstreetmap/josm/gui/FileDrop.java (revision 6083) +++ src/org/openstreetmap/josm/gui/FileDrop.java (working copy) @@ -74,6 +74,7 @@ BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border true, // Recursive new FileDrop.Listener(){ + @Override public void filesDropped( java.io.File[] files ){ // start asynchronous loading of files OpenFileAction.OpenFileTask task = new OpenFileAction.OpenFileTask(Arrays.asList(files), null); @@ -271,7 +272,8 @@ if( supportsDnD() ) { // Make a drop listener dropListener = new java.awt.dnd.DropTargetListener() - { public void dragEnter( java.awt.dnd.DropTargetDragEvent evt ) + { @Override + public void dragEnter( java.awt.dnd.DropTargetDragEvent evt ) { log( out, "FileDrop: dragEnter event." ); // Is this an acceptable drag event? @@ -298,11 +300,13 @@ } // end else: drag not ok } // end dragEnter + @Override public void dragOver( java.awt.dnd.DropTargetDragEvent evt ) { // This is called continually as long as the mouse is // over the drag target. } // end dragOver + @Override public void drop( java.awt.dnd.DropTargetDropEvent evt ) { log( out, "FileDrop: drop event." ); try @@ -388,6 +392,7 @@ } // end finally } // end drop + @Override public void dragExit( java.awt.dnd.DropTargetEvent evt ) { log( out, "FileDrop: dragExit event." ); // If it's a Swing component, reset its border @@ -398,6 +403,7 @@ } // end if: JComponent } // end dragExit + @Override public void dropActionChanged( java.awt.dnd.DropTargetDragEvent evt ) { log( out, "FileDrop: dropActionChanged event." ); // Is this an acceptable drag event? @@ -480,7 +486,8 @@ // Listen for hierarchy changes and remove the drop target when the parent gets cleared out. c.addHierarchyListener( new java.awt.event.HierarchyListener() - { public void hierarchyChanged( java.awt.event.HierarchyEvent evt ) + { @Override + public void hierarchyChanged( java.awt.event.HierarchyEvent evt ) { log( out, "FileDrop: Hierarchy changed." ); java.awt.Component parent = c.getParent(); if( parent == null ) @@ -812,6 +819,7 @@ * @return An array of supported data flavors * @since 1.1 */ + @Override public java.awt.datatransfer.DataFlavor[] getTransferDataFlavors() { if( customFlavor != null ) @@ -838,6 +846,7 @@ * @return The dropped data * @since 1.1 */ + @Override public Object getTransferData( java.awt.datatransfer.DataFlavor flavor ) throws java.awt.datatransfer.UnsupportedFlavorException, java.io.IOException { @@ -861,6 +870,7 @@ * @return Whether or not the flavor is supported * @since 1.1 */ + @Override public boolean isDataFlavorSupported( java.awt.datatransfer.DataFlavor flavor ) { // Native object Index: src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6083) +++ src/org/openstreetmap/josm/gui/GettingStarted.java (working copy) @@ -52,6 +52,7 @@ addHyperlinkListener(this); } + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { OpenBrowser.displayUrl(e.getDescription()); Index: src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java =================================================================== --- src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 6083) +++ src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (working copy) @@ -112,6 +112,7 @@ this.value = value; } + @Override public void actionPerformed(ActionEvent e) { pane.setValue(value); dialog.setVisible(false); @@ -167,6 +168,7 @@ b.setToolTipText(tr("Show help information")); HelpUtil.setHelpContext(b, helpTopic); Action a = new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { HelpBrowser.setUrlForHelpTopic(helpTopic); } @@ -270,6 +272,7 @@ }); dialog.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "close"); dialog.getRootPane().getActionMap().put("close", new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { pane.setValue(JOptionPane.CLOSED_OPTION); dialog.setVisible(false); @@ -323,6 +326,7 @@ */ static public void showMessageDialogInEDT(final Component parentComponent, final Object msg, final String title, final int messageType, final String helpTopic) { GuiHelper.runInEDT(new Runnable() { + @Override public void run() { showOptionDialog(parentComponent, msg, title, messageType, null, null, null, helpTopic); } Index: src/org/openstreetmap/josm/gui/IconToggleButton.java =================================================================== --- src/org/openstreetmap/josm/gui/IconToggleButton.java (revision 6083) +++ src/org/openstreetmap/josm/gui/IconToggleButton.java (working copy) @@ -59,6 +59,7 @@ ExpertToggleAction.addExpertModeChangeListener(this); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals("active")) { setSelected((Boolean)evt.getNewValue()); @@ -68,6 +69,7 @@ } } + @Override public void destroy() { Action action = getAction(); if (action instanceof Destroyable) { Index: src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6083) +++ src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (working copy) @@ -238,6 +238,7 @@ /* ------------------------------------------------------------------- */ /* interface PreferenceChangeListener */ /* ------------------------------------------------------------------- */ + @Override public void preferenceChanged(PreferenceChangeEvent evt) { if (evt.getKey().equals("osm-server.username")) { if (!(evt.getNewValue() instanceof StringSetting)) return; Index: src/org/openstreetmap/josm/gui/MainApplet.java =================================================================== --- src/org/openstreetmap/josm/gui/MainApplet.java (revision 6083) +++ src/org/openstreetmap/josm/gui/MainApplet.java (working copy) @@ -41,6 +41,7 @@ super(tr("Upload Preferences"), "upload-preferences", tr("Upload the current preferences to the server"), Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true); } + @Override public void actionPerformed(ActionEvent e) { ((ServerSidePreferences)Main.pref).upload(); } @@ -163,14 +164,17 @@ MainApplet applet = new MainApplet(); Main.pref = new ServerSidePreferences(applet.getCodeBase()); applet.setStub(new AppletStub() { + @Override public void appletResize(int w, int h) { frame.setSize(w, h); } + @Override public AppletContext getAppletContext() { return null; } + @Override public URL getCodeBase() { try { return new File(".").toURI().toURL(); @@ -180,14 +184,17 @@ } } + @Override public URL getDocumentBase() { return getCodeBase(); } + @Override public String getParameter(String k) { return null; } + @Override public boolean isActive() { return true; } Index: src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- src/org/openstreetmap/josm/gui/MainApplication.java (revision 6083) +++ src/org/openstreetmap/josm/gui/MainApplication.java (working copy) @@ -352,6 +352,7 @@ toolbar.refreshToolbarControl(); GuiHelper.runInEDT(new Runnable() { + @Override public void run() { splash.setVisible(false); splash.dispose(); @@ -380,6 +381,7 @@ final Map> args_final = args; SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (AutosaveTask.PROP_AUTOSAVE_ENABLED.get()) { AutosaveTask autosaveTask = new AutosaveTask(); Index: src/org/openstreetmap/josm/gui/MapMover.java =================================================================== --- src/org/openstreetmap/josm/gui/MapMover.java (revision 6083) +++ src/org/openstreetmap/josm/gui/MapMover.java (working copy) @@ -39,6 +39,7 @@ public ZoomerAction(String action) { this.action = action; } + @Override public void actionPerformed(ActionEvent e) { if (action.equals(".") || action.equals(",")) { Point mouse = nc.getMousePosition(); @@ -120,6 +121,7 @@ /** * If the right (and only the right) mouse button is pressed, move the map */ + @Override public void mouseDragged(MouseEvent e) { int offMask = MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON2_DOWN_MASK; if ((e.getModifiersEx() & (MouseEvent.BUTTON3_DOWN_MASK | offMask)) == MouseEvent.BUTTON3_DOWN_MASK) { @@ -186,6 +188,7 @@ * Zoom the map by 1/5th of current zoom per wheel-delta. * @param e The wheel event. */ + @Override public void mouseWheelMoved(MouseWheelEvent e) { nc.zoomToFactor(e.getX(), e.getY(), Math.pow(Math.sqrt(2), e.getWheelRotation())); } @@ -193,6 +196,7 @@ /** * Emulates dragging on Mac OSX */ + @Override public void mouseMoved(MouseEvent e) { if (!movementInPlace) return; Index: src/org/openstreetmap/josm/gui/MapScaler.java =================================================================== --- src/org/openstreetmap/josm/gui/MapScaler.java (revision 6083) +++ src/org/openstreetmap/josm/gui/MapScaler.java (working copy) @@ -45,6 +45,7 @@ return Main.pref.getColor(marktr("scale"), Color.white); } + @Override public String helpTopic() { return ht("/MapView/Scaler"); } Index: src/org/openstreetmap/josm/gui/MapSlider.java =================================================================== --- src/org/openstreetmap/josm/gui/MapSlider.java (revision 6083) +++ src/org/openstreetmap/josm/gui/MapSlider.java (working copy) @@ -28,6 +28,7 @@ propertyChange(null); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (getModel().getValueIsAdjusting()) return; @@ -53,6 +54,7 @@ preventChange=false; } + @Override public void stateChanged(ChangeEvent e) { if (preventChange) return; @@ -64,6 +66,7 @@ this.mv.zoomTo(new ProjectionBounds(this.mv.getCenter(), es/fact, n/fact)); } + @Override public String helpTopic() { return ht("/MapView/Slider"); } Index: src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- src/org/openstreetmap/josm/gui/MapStatus.java (revision 6083) +++ src/org/openstreetmap/josm/gui/MapStatus.java (working copy) @@ -454,6 +454,7 @@ final Popup staticPopup = popup; popup = null; EventQueue.invokeLater(new Runnable(){ + @Override public void run() { staticPopup.hide(); }}); Index: src/org/openstreetmap/josm/gui/MenuScroller.java =================================================================== --- src/org/openstreetmap/josm/gui/MenuScroller.java (revision 6083) +++ src/org/openstreetmap/josm/gui/MenuScroller.java (working copy) @@ -598,6 +598,7 @@ } private class MouseScrollListener implements MouseWheelListener { + @Override public void mouseWheelMoved(MouseWheelEvent mwe) { if (menu.getComponents().length > scrollCount) { firstIndex += mwe.getWheelRotation(); Index: src/org/openstreetmap/josm/gui/MultiSplitLayout.java =================================================================== --- src/org/openstreetmap/josm/gui/MultiSplitLayout.java (revision 6083) +++ src/org/openstreetmap/josm/gui/MultiSplitLayout.java (working copy) @@ -211,6 +211,7 @@ * @param child the component to be added * @see #removeLayoutComponent */ + @Override public void addLayoutComponent(String name, Component child) { if (name == null) throw new IllegalArgumentException("name not specified"); @@ -223,6 +224,7 @@ * @param child the component to be removed * @see #addLayoutComponent */ + @Override public void removeLayoutComponent(Component child) { String name = child.getName(); if (name != null) { @@ -320,11 +322,13 @@ return new Dimension(width, height); } + @Override public Dimension preferredLayoutSize(Container parent) { Dimension size = preferredNodeSize(getModel()); return sizeWithInsets(parent, size); } + @Override public Dimension minimumLayoutSize(Container parent) { Dimension size = minimumNodeSize(getModel()); return sizeWithInsets(parent, size); @@ -759,6 +763,7 @@ * the layout model, and then set the bounds of each child component * with a matching Leaf Node. */ + @Override public void layoutContainer(Container parent) { checkLayout(getModel()); Insets insets = parent.getInsets(); Index: src/org/openstreetmap/josm/gui/MultiSplitPane.java =================================================================== --- src/org/openstreetmap/josm/gui/MultiSplitPane.java (revision 6083) +++ src/org/openstreetmap/josm/gui/MultiSplitPane.java (working copy) @@ -156,6 +156,7 @@ } private class DefaultDividerPainter extends DividerPainter { + @Override public void paint(Graphics g, Divider divider) { if ((divider == activeDivider()) && !isContinuousLayout()) { Graphics2D g2d = (Graphics2D)g; @@ -201,6 +202,7 @@ *

* {@inheritDoc} */ + @Override protected void paintChildren(Graphics g) { super.paintChildren(g); DividerPainter dp = getDividerPainter(); @@ -352,36 +354,46 @@ private class InputHandler extends MouseInputAdapter implements KeyListener { + @Override public void mouseEntered(MouseEvent e) { updateCursor(e.getX(), e.getY(), true); } + @Override public void mouseMoved(MouseEvent e) { updateCursor(e.getX(), e.getY(), true); } + @Override public void mouseExited(MouseEvent e) { updateCursor(e.getX(), e.getY(), false); } + @Override public void mousePressed(MouseEvent e) { startDrag(e.getX(), e.getY()); } + @Override public void mouseReleased(MouseEvent e) { finishDrag(e.getX(), e.getY()); } + @Override public void mouseDragged(MouseEvent e) { updateDrag(e.getX(), e.getY()); } + @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { cancelDrag(); } } + @Override public void keyReleased(KeyEvent e) { } + @Override public void keyTyped(KeyEvent e) { } } + @Override public AccessibleContext getAccessibleContext() { if( accessibleContext == null ) { accessibleContext = new AccessibleMultiSplitPane(); @@ -390,6 +402,7 @@ } protected class AccessibleMultiSplitPane extends AccessibleJPanel { + @Override public AccessibleRole getAccessibleRole() { return AccessibleRole.SPLIT_PANE; } Index: src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (working copy) @@ -41,6 +41,7 @@ /** * Adapter method supporting the ListCellRenderer interface. */ + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Component def = defaultListCellRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); return renderer(def, (OsmPrimitive) value); @@ -49,6 +50,7 @@ /** * Adapter method supporting the TableCellRenderer interface. */ + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Component def = defaultTableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); if (value instanceof OsmPrimitive) Index: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (working copy) @@ -66,9 +66,13 @@ setCustomText(""); setLocationRelativeTo(getParent()); addComponentListener(new ComponentListener() { + @Override public void componentHidden(ComponentEvent e) {} + @Override public void componentMoved(ComponentEvent e) {} + @Override public void componentShown(ComponentEvent e) {} + @Override public void componentResized(ComponentEvent ev) { int w = getWidth(); if(w > 200) { @@ -87,6 +91,7 @@ initDialog(); } + @Override public void setIndeterminate(boolean newValue) { UIManager.put("ProgressBar.cycleTime", UIManager.getInt("ProgressBar.repaintInterval") * 100); progressBar.setIndeterminate(newValue); @@ -103,6 +108,7 @@ * Sets a custom text line below currentAction. Can be used to display additional information * @param text */ + @Override public void setCustomText(String text) { if(text == null || text.trim().length() == 0) { customText.setVisible(false); @@ -116,6 +122,7 @@ } } + @Override public void setCurrentAction(String text) { currentAction.setText(text); } @@ -126,6 +133,7 @@ * * @param message the message to append to the log. Ignore if null or white space only. */ + @Override public void appendLogMessage(String message) { if (message == null || message.trim().length() ==0 ) return; Index: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java =================================================================== --- src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 6083) +++ src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (working copy) @@ -85,6 +85,7 @@ finish(); } else { EventQueue.invokeAndWait(new Runnable() { + @Override public void run() { finish(); } @@ -102,6 +103,7 @@ afterFinish(); } else { EventQueue.invokeAndWait(new Runnable() { + @Override public void run() { afterFinish(); } @@ -112,6 +114,7 @@ if (!ignoreException) { // Exception has to thrown in EDT to be shown to user SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (e instanceof RuntimeException) { BugReportExceptionHandler.handleException(e); @@ -131,12 +134,14 @@ } + @Override public final void run() { if (canceled) return; // since realRun isn't executed, do not call to finish if (EventQueue.isDispatchThread()) { new Thread(new Runnable() { + @Override public void run() { doRealRun(); } @@ -146,6 +151,7 @@ } } + @Override public void operationCanceled() { cancel(); } Index: src/org/openstreetmap/josm/gui/QuadStateCheckBox.java =================================================================== --- src/org/openstreetmap/josm/gui/QuadStateCheckBox.java (revision 6083) +++ src/org/openstreetmap/josm/gui/QuadStateCheckBox.java (working copy) @@ -40,6 +40,7 @@ // Reset the keyboard action map ActionMap map = new ActionMapUIResource(); map.put("pressed", new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { grabFocus(); model.nextState(); @@ -134,52 +135,74 @@ } } /** Filter: No one may change the armed/selected/pressed status except us. */ + @Override public void setArmed(boolean b) { } + @Override public void setSelected(boolean b) { } + @Override public void setPressed(boolean b) { } /** We disable focusing on the component when it is not * enabled. */ + @Override public void setEnabled(boolean b) { setFocusable(b); other.setEnabled(b); } /** All these methods simply delegate to the "other" model * that is being decorated. */ + @Override public boolean isArmed() { return other.isArmed(); } + @Override public boolean isSelected() { return other.isSelected(); } + @Override public boolean isEnabled() { return other.isEnabled(); } + @Override public boolean isPressed() { return other.isPressed(); } + @Override public boolean isRollover() { return other.isRollover(); } + @Override public void setRollover(boolean b) { other.setRollover(b); } + @Override public void setMnemonic(int key) { other.setMnemonic(key); } + @Override public int getMnemonic() { return other.getMnemonic(); } + @Override public void setActionCommand(String s) { other.setActionCommand(s); } + @Override public String getActionCommand() { return other.getActionCommand(); } + @Override public void setGroup(ButtonGroup group) { other.setGroup(group); } + @Override public void addActionListener(ActionListener l) { other.addActionListener(l); } + @Override public void removeActionListener(ActionListener l) { other.removeActionListener(l); } + @Override public void addItemListener(ItemListener l) { other.addItemListener(l); } + @Override public void removeItemListener(ItemListener l) { other.removeItemListener(l); } + @Override public void addChangeListener(ChangeListener l) { other.addChangeListener(l); } + @Override public void removeChangeListener(ChangeListener l) { other.removeChangeListener(l); } + @Override public Object[] getSelectedObjects() { return other.getSelectedObjects(); } Index: src/org/openstreetmap/josm/gui/ScrollViewport.java =================================================================== --- src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 6083) +++ src/org/openstreetmap/josm/gui/ScrollViewport.java (working copy) @@ -69,6 +69,7 @@ private List buttons = new ArrayList(); private Timer timer = new Timer(100, new ActionListener() { + @Override public void actionPerformed(ActionEvent arg0) { ScrollViewport.this.scroll(); } Index: src/org/openstreetmap/josm/gui/SelectionManager.java =================================================================== --- src/org/openstreetmap/josm/gui/SelectionManager.java (revision 6083) +++ src/org/openstreetmap/josm/gui/SelectionManager.java (working copy) @@ -122,6 +122,7 @@ eventSource.addMouseMotionListener(this); selectionEndedListener.addPropertyChangeListener(this); eventSource.addPropertyChangeListener("scale", new PropertyChangeListener(){ + @Override public void propertyChange(PropertyChangeEvent evt) { if (mousePosStart != null) { paintRect(); @@ -145,6 +146,7 @@ /** * If the correct button, from the "drawing rectangle" mode */ + @Override public void mousePressed(MouseEvent e) { if (e.getButton() == MouseEvent.BUTTON1) { mousePosStart = mousePos = e.getPoint(); @@ -157,6 +159,7 @@ /** * If the correct button is hold, draw the rectangle. */ + @Override public void mouseDragged(MouseEvent e) { int buttonPressed = e.getModifiersEx() & (MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON3_DOWN_MASK); @@ -187,6 +190,7 @@ /** * Check the state of the keys and buttons and set the selection accordingly. */ + @Override public void mouseReleased(MouseEvent e) { if (e.getButton() != MouseEvent.BUTTON1) return; @@ -272,6 +276,7 @@ /** * If the action goes inactive, remove the selection rectangle from screen */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals("active") && !(Boolean)evt.getNewValue() && mousePosStart != null) { paintRect(); @@ -361,8 +366,12 @@ this.lassoMode = lassoMode; } + @Override public void mouseClicked(MouseEvent e) {} + @Override public void mouseEntered(MouseEvent e) {} + @Override public void mouseExited(MouseEvent e) {} + @Override public void mouseMoved(MouseEvent e) {} } Index: src/org/openstreetmap/josm/gui/SplashScreen.java =================================================================== --- src/org/openstreetmap/josm/gui/SplashScreen.java (revision 6083) +++ src/org/openstreetmap/josm/gui/SplashScreen.java (working copy) @@ -153,6 +153,7 @@ build(); } + @Override public void setCustomText(String message) { if(message.isEmpty()) message = " "; /* prevent killing of additional line */ @@ -160,11 +161,13 @@ repaint(); } + @Override public void setIndeterminate(boolean indeterminate) { progressBar.setIndeterminate(indeterminate); repaint(); } + @Override public void setMaximum(int maximum) { progressBar.setMaximum(maximum); repaint(); @@ -178,6 +181,7 @@ * Stores and displays the {@code MAX_NUMBER_OF_MESSAGES} most recent * task titles together with their execution time. */ + @Override public void setTaskTitle(String taskTitle) { while (messages.size() >= MAX_NUMBER_OF_MESSAGES) { @@ -206,6 +210,7 @@ repaint(); } + @Override public void setValue(int value) { progressBar.setValue(value); repaint(); Index: src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (working copy) @@ -174,6 +174,7 @@ super.setVisible(visible); } + @Override public void tableChanged(TableModelEvent e) { updateMessage(); updateTitle(); @@ -204,6 +205,7 @@ data, new Comparator() { private NameFormatter nf = DefaultNameFormatter.getInstance(); + @Override public int compare(RelationToChildReference o1, RelationToChildReference o2) { int cmp = o1.getChild().getDisplayName(nf).compareTo(o2.getChild().getDisplayName(nf)); if (cmp != 0) return cmp; @@ -321,6 +323,7 @@ putValue(SHORT_DESCRIPTION, tr("Click to close the dialog and remove the object from the relations")); } + @Override public void actionPerformed(ActionEvent e) { setCanceled(false); setVisible(false); @@ -334,6 +337,7 @@ putValue(SHORT_DESCRIPTION, tr("Click to close the dialog and to abort deleting the objects")); } + @Override public void actionPerformed(ActionEvent e) { setCanceled(true); setVisible(false); Index: src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 6083) +++ src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (working copy) @@ -339,6 +339,7 @@ PROP_MAPSTYLE.put(tileSource.getName()); // TODO Is name really unique? } + @Override public Bounds getBoundingBox() { return bbox; } @@ -349,6 +350,7 @@ * * @param bbox the bounding box. null to reset the bounding box */ + @Override public void setBoundingBox(Bounds bbox) { if (bbox == null || (bbox.getMin().lat() == 0.0 && bbox.getMin().lon() == 0.0 && bbox.getMax().lat() == 0.0 && bbox.getMax().lon() == 0.0)) { Index: src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java =================================================================== --- src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 6083) +++ src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (working copy) @@ -189,6 +189,7 @@ this.direction = direction; } + @Override public void actionPerformed(ActionEvent e) { moveTask.setDirectionX(direction); } @@ -202,6 +203,7 @@ this.direction = direction; } + @Override public void actionPerformed(ActionEvent e) { moveTask.setDirectionY(direction); } @@ -312,6 +314,7 @@ private class ZoomInAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { iSlippyMapChooser.zoomIn(); } @@ -319,6 +322,7 @@ private class ZoomOutAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { iSlippyMapChooser.zoomOut(); } Index: src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 6083) +++ src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (working copy) @@ -133,6 +133,7 @@ * Replies the current bounding box. null, if no valid bounding box is currently selected. * */ + @Override public Bounds getBoundingBox() { return bbox; } @@ -142,6 +143,7 @@ * * @param bbox the bounding box. null, if this widget isn't initialized with a bounding box */ + @Override public void setBoundingBox(Bounds bbox) { pnlTileGrid.initFromBoundingBox(bbox); } @@ -195,6 +197,7 @@ * property change events for {@link BBoxChooser#BBOX_PROP} */ class TileBoundsChangeListener implements PropertyChangeListener { + @Override public void propertyChange(PropertyChangeEvent evt) { if (!evt.getPropertyName().equals(TileGridInputPanel.TILE_BOUNDS_PROP)) return; TileBounds tb = (TileBounds)evt.getNewValue(); @@ -370,6 +373,7 @@ spZoomLevel.setValue(tileBounds.zoomLevel); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TileAddressInputPanel.TILE_BOUNDS_PROP)) { TileBounds tb = (TileBounds)evt.getNewValue(); @@ -384,6 +388,7 @@ } class ZomeLevelChangeHandler implements ChangeListener { + @Override public void stateChanged(ChangeEvent e) { int zoomLevel = (Integer)spZoomLevel.getValue(); valMaxX.setZoomLevel(zoomLevel); @@ -409,16 +414,20 @@ fireTileBoundsChanged(tb); } + @Override public void focusGained(FocusEvent e) {/* irrelevant */} + @Override public void focusLost(FocusEvent e) { buildTileBounds(); } + @Override public void actionPerformed(ActionEvent e) { buildTileBounds(); } + @Override public void stateChanged(ChangeEvent e) { buildTileBounds(); } @@ -505,6 +514,7 @@ putValue(SHORT_DESCRIPTION, tr("Apply the tile address")); } + @Override public void actionPerformed(ActionEvent e) { TileBounds tb = valTileAddress.getTileBounds(); if (tb != null) { Index: src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java (working copy) @@ -13,6 +13,7 @@ public ComparePairListCellRenderer() { setOpaque(true); } + @Override public Component getListCellRendererComponent( JList list, Object value, Index: src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (working copy) @@ -167,6 +167,7 @@ * @see ListMergeModel * @see PropertiesMergeModel */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TagMergeModel.PROP_NUM_UNDECIDED_TAGS)) { int newValue = (Integer)evt.getNewValue(); Index: src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (working copy) @@ -841,20 +841,24 @@ selectedIdx = 0; } + @Override public Object getElementAt(int index) { if (index < compareModes.size()) return compareModes.get(index); throw new IllegalArgumentException(tr("Unexpected value of parameter ''index''. Got {0}.", index)); } + @Override public int getSize() { return compareModes.size(); } + @Override public Object getSelectedItem() { return compareModes.get(selectedIdx); } + @Override public void setSelectedItem(Object anItem) { int i = compareModes.indexOf(anItem); if (i < 0) Index: src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (working copy) @@ -436,11 +436,13 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = myEntriesTable.getSelectedRows(); model.copyMyToTop(rows); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(!myEntriesTable.getSelectionModel().isSelectionEmpty()); } @@ -463,11 +465,13 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = myEntriesTable.getSelectedRows(); model.copyMyToEnd(rows); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(!myEntriesTable.getSelectionModel().isSelectionEmpty()); } @@ -490,6 +494,7 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] myRows = myEntriesTable.getSelectedRows(); int [] mergedRows = mergedEntriesTable.getSelectedRows(); @@ -499,6 +504,7 @@ model.copyMyBeforeCurrent(myRows, current); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled( !myEntriesTable.getSelectionModel().isSelectionEmpty() @@ -524,6 +530,7 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] myRows = myEntriesTable.getSelectedRows(); int [] mergedRows = mergedEntriesTable.getSelectedRows(); @@ -533,6 +540,7 @@ model.copyMyAfterCurrent(myRows, current); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled( !myEntriesTable.getSelectionModel().isSelectionEmpty() @@ -553,11 +561,13 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = theirEntriesTable.getSelectedRows(); model.copyTheirToTop(rows); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(!theirEntriesTable.getSelectionModel().isSelectionEmpty()); } @@ -575,11 +585,13 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = theirEntriesTable.getSelectedRows(); model.copyTheirToEnd(rows); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(!theirEntriesTable.getSelectionModel().isSelectionEmpty()); } @@ -597,6 +609,7 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] myRows = theirEntriesTable.getSelectedRows(); int [] mergedRows = mergedEntriesTable.getSelectedRows(); @@ -606,6 +619,7 @@ model.copyTheirBeforeCurrent(myRows, current); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled( !theirEntriesTable.getSelectionModel().isSelectionEmpty() @@ -626,6 +640,7 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] myRows = theirEntriesTable.getSelectedRows(); int [] mergedRows = mergedEntriesTable.getSelectedRows(); @@ -635,6 +650,7 @@ model.copyTheirAfterCurrent(myRows, current); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled( !theirEntriesTable.getSelectionModel().isSelectionEmpty() @@ -651,6 +667,7 @@ putValue(Action.SHORT_DESCRIPTION, tr("Copy all my elements to the target")); } + @Override public void actionPerformed(ActionEvent arg0) { model.copyAll(ListRole.MY_ENTRIES); model.setFrozen(true); @@ -660,10 +677,12 @@ setEnabled(model.getMergedEntries().isEmpty() && !model.isFrozen()); } + @Override public void update(Observable o, Object arg) { updateEnabledState(); } + @Override public void propertyChange(PropertyChangeEvent evt) { updateEnabledState(); } @@ -677,6 +696,7 @@ putValue(Action.SHORT_DESCRIPTION, tr("Copy all their elements to the target")); } + @Override public void actionPerformed(ActionEvent arg0) { model.copyAll(ListRole.THEIR_ENTRIES); model.setFrozen(true); @@ -686,10 +706,12 @@ setEnabled(model.getMergedEntries().isEmpty() && !model.isFrozen()); } + @Override public void update(Observable o, Object arg) { updateEnabledState(); } + @Override public void propertyChange(PropertyChangeEvent evt) { updateEnabledState(); } @@ -707,11 +729,13 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = mergedEntriesTable.getSelectedRows(); model.moveUpMerged(rows); } + @Override public void valueChanged(ListSelectionEvent e) { int [] rows = mergedEntriesTable.getSelectedRows(); setEnabled( @@ -739,11 +763,13 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = mergedEntriesTable.getSelectedRows(); model.moveDownMerged(rows); } + @Override public void valueChanged(ListSelectionEvent e) { int [] rows = mergedEntriesTable.getSelectedRows(); setEnabled( @@ -771,11 +797,13 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = mergedEntriesTable.getSelectedRows(); model.removeMerged(rows); } + @Override public void valueChanged(ListSelectionEvent e) { int [] rows = mergedEntriesTable.getSelectedRows(); setEnabled( @@ -802,6 +830,7 @@ setEnabled(true); } + @Override public void actionPerformed(ActionEvent arg0) { // do nothing } @@ -817,6 +846,7 @@ btn.addItemListener(this); addPropertyChangeListener( new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(PROP_SELECTED)) { btn.setSelected((Boolean)evt.getNewValue()); @@ -826,6 +856,7 @@ ); } + @Override public void itemStateChanged(ItemEvent e) { int state = e.getStateChange(); if (state == ItemEvent.SELECTED) { @@ -866,6 +897,7 @@ } } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) { handlePropertyChangeFrozen((Boolean)evt.getOldValue(), (Boolean)evt.getNewValue()); @@ -876,6 +908,7 @@ return model; } + @Override public void update(Observable o, Object arg) { lblMyVersion.setText( trn("My version ({0} entry)", "My version ({0} entries)", model.getMyEntriesSize(), model.getMyEntriesSize()) @@ -934,6 +967,7 @@ * event handler for {@link AdjustmentEvent}s * */ + @Override public void adjustmentValueChanged(AdjustmentEvent e) { if (! enabledMap.get(e.getAdjustable())) return; @@ -1000,6 +1034,7 @@ // register an item lister with the check box // view.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { switch(e.getStateChange()) { case ItemEvent.SELECTED: @@ -1018,6 +1053,7 @@ observable.addObserver( new Observer() { + @Override public void update(Observable o, Object arg) { boolean sync = isParticipatingInSynchronizedScrolling(adjustable); if (view.isSelected() != sync) { Index: src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (working copy) @@ -52,6 +52,7 @@ return embeddInScrollPane(theirEntriesTable); } + @Override public void populate(Conflict conflict) { Way myWay = (Way)conflict.getMy(); Way theirWay = (Way)conflict.getTheir(); @@ -60,6 +61,7 @@ theirEntriesTable.setLayer(findLayerFor(theirWay)); } + @Override public void deletePrimitive(boolean deleted) { if (deleted) { model.setFrozen(true); Index: src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (working copy) @@ -150,6 +150,7 @@ setText(Integer.toString(row+1)); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (working copy) @@ -380,6 +380,7 @@ lblTheirReferrers.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get()); } + @Override public void update(Observable o, Object arg) { updateCoordinates(); updateDeletedState(); @@ -396,10 +397,12 @@ putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordinates")); } + @Override public void actionPerformed(ActionEvent e) { model.decideCoordsConflict(MergeDecisionType.KEEP_MINE); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord()); } @@ -411,10 +414,12 @@ putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordinates")); } + @Override public void actionPerformed(ActionEvent e) { model.decideCoordsConflict(MergeDecisionType.KEEP_THEIR); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord()); } @@ -426,10 +431,12 @@ putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between different coordinates")); } + @Override public void actionPerformed(ActionEvent e) { model.decideCoordsConflict(MergeDecisionType.UNDECIDED); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasCoordConflict() && model.isDecidedCoord()); } @@ -441,10 +448,12 @@ putValue(Action.SHORT_DESCRIPTION, tr("Keep my deleted state")); } + @Override public void actionPerformed(ActionEvent e) { model.decideDeletedStateConflict(MergeDecisionType.KEEP_MINE); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState()); } @@ -456,10 +465,12 @@ putValue(Action.SHORT_DESCRIPTION, tr("Keep their deleted state")); } + @Override public void actionPerformed(ActionEvent e) { model.decideDeletedStateConflict(MergeDecisionType.KEEP_THEIR); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState()); } @@ -471,15 +482,18 @@ putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between deleted state")); } + @Override public void actionPerformed(ActionEvent e) { model.decideDeletedStateConflict(MergeDecisionType.UNDECIDED); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasDeletedStateConflict() && model.isDecidedDeletedState()); } } + @Override public void deletePrimitive(boolean deleted) { if (deleted) { if (model.getMergedCoords() == null) { @@ -490,6 +504,7 @@ } } + @Override public void populate(Conflict conflict) { model.populate(conflict); } Index: src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (working copy) @@ -48,6 +48,7 @@ return embeddInScrollPane(theirEntriesTable); } + @Override public void populate(Conflict conflict) { Relation myRel = (Relation)conflict.getMy(); Relation theirRel = (Relation)conflict.getTheir(); @@ -60,6 +61,7 @@ super(new RelationMemberListMergeModel()); } + @Override public void deletePrimitive(boolean deleted) { if (deleted) { model.clearMerged(); Index: src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java (working copy) @@ -36,6 +36,7 @@ ); } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { // Do not edit empty or incomplete members ! (fix #5374 and #6315) if (value == null) @@ -48,6 +49,7 @@ return editor; } + @Override public Object getCellEditorValue() { return editor.getText(); } Index: src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (working copy) @@ -146,6 +146,7 @@ setText(""); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (working copy) @@ -22,6 +22,7 @@ setForeground(ConflictColors.FGCOLOR.get()); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int col) { Index: src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (working copy) @@ -279,6 +279,7 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int rows[] = mineTable.getSelectedRows(); if (rows == null || rows.length == 0) @@ -287,6 +288,7 @@ selectNextConflict(rows); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(mineTable.getSelectedRowCount() > 0); } @@ -309,6 +311,7 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int rows[] = theirTable.getSelectedRows(); if (rows == null || rows.length == 0) @@ -317,6 +320,7 @@ selectNextConflict(rows); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(theirTable.getSelectedRowCount() > 0); } @@ -345,6 +349,7 @@ adjustable.addAdjustmentListener(this); } + @Override public void adjustmentValueChanged(AdjustmentEvent e) { for (Adjustable a : synchronizedAdjustables) { if (a != e.getAdjustable()) { @@ -404,6 +409,7 @@ setEnabled(false); } + @Override public void actionPerformed(ActionEvent arg0) { int rows[] = mergedTable.getSelectedRows(); if (rows == null || rows.length == 0) @@ -411,11 +417,13 @@ model.decide(rows, MergeDecisionType.UNDECIDED); } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(mergedTable.getSelectedRowCount() > 0); } } + @Override public void deletePrimitive(boolean deleted) { // Use my entries, as it doesn't really matter MergeDecisionType decision = deleted?MergeDecisionType.KEEP_MINE:MergeDecisionType.UNDECIDED; @@ -424,6 +432,7 @@ } } + @Override public void populate(Conflict conflict) { model.populate(conflict.getMy(), conflict.getTheir()); for (JTable table : new JTable[]{mineTable, theirTable}) { Index: src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (working copy) @@ -388,6 +388,7 @@ setEnabled(true); } + @Override public void actionPerformed(ActionEvent arg0) { setCanceled(true); setVisible(false); @@ -403,6 +404,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent arg0) { setVisible(false); pnlTagConflictResolver.rememberPreferences(); @@ -413,6 +415,7 @@ && pnlRelationMemberConflictResolver.getModel().getNumConflicts() == 0); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { updateEnabledState(); @@ -443,14 +446,17 @@ addHierarchyBoundsListener(this); } + @Override public void ancestorResized(HierarchyEvent e) { setDividerLocation((int) (dividerLocation * getHeight())); } + @Override public void ancestorMoved(HierarchyEvent e) { // do nothing } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(JSplitPane.DIVIDER_LOCATION_PROPERTY)) { int newVal = (Integer) evt.getNewValue(); Index: src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (working copy) @@ -128,6 +128,7 @@ } } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { MultiValueResolutionDecision decision = (MultiValueResolutionDecision)value; initEditor(decision); @@ -135,6 +136,7 @@ return editor; } + @Override public Object getCellEditorValue() { return editor.getSelectedItem(); } @@ -179,6 +181,7 @@ } } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { renderColors(isSelected); Index: src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (working copy) @@ -123,6 +123,7 @@ setText(""); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (working copy) @@ -271,6 +271,7 @@ setEnabled(true); } + @Override public void actionPerformed(ActionEvent arg0) { setVisible(false); setCanceled(true); @@ -286,6 +287,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent arg0) { setVisible(false); } @@ -304,6 +306,7 @@ } } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { updateEnabledState(); @@ -333,6 +336,7 @@ return resolvers.get(type).getModel().getResolution(); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { TagConflictResolverModel model = (TagConflictResolverModel)evt.getSource(); @@ -470,6 +474,7 @@ renderStatistics(info.targetInfo); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { reset(); Index: src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java (working copy) @@ -22,6 +22,7 @@ /* --------------------------------------------------------------------------------- */ /* TableCellEditor */ /* --------------------------------------------------------------------------------- */ + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { setSelectedItem(value); this.originalValue = (RelationMemberConflictDecisionType)value; @@ -31,31 +32,38 @@ private TableCellEditorSupport tableCellEditorSupport; private RelationMemberConflictDecisionType originalValue; + @Override public void addCellEditorListener(CellEditorListener l) { tableCellEditorSupport.addCellEditorListener(l); } + @Override public void cancelCellEditing() { setSelectedItem(originalValue); tableCellEditorSupport.fireEditingCanceled(); } + @Override public Object getCellEditorValue() { return getSelectedItem(); } + @Override public boolean isCellEditable(EventObject anEvent) { return true; } + @Override public void removeCellEditorListener(CellEditorListener l) { tableCellEditorSupport.removeCellEditorListener(l); } + @Override public boolean shouldSelectCell(EventObject anEvent) { return true; } + @Override public boolean stopCellEditing() { tableCellEditorSupport.fireEditingStopped(); return true; Index: src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (working copy) @@ -39,6 +39,7 @@ /* --------------------------------------------------------------------------------- */ /* TableCellRenderer */ /* --------------------------------------------------------------------------------- */ + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { resetTableRenderer(); @@ -57,6 +58,7 @@ /* --------------------------------------------------------------------------------- */ /* ListCellRenderer */ /* --------------------------------------------------------------------------------- */ + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { resetListRenderer(); Index: src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (working copy) @@ -147,12 +147,14 @@ putValue(SHORT_DESCRIPTION, tr("Apply this role to all members")); } + @Override public void actionPerformed(ActionEvent e) { model.applyRole(tfRole.getText()); } } class ToggleTagRelationsAction implements ChangeListener { + @Override public void stateChanged(ChangeEvent e) { ButtonModel buttonModel = ((AbstractButton) e.getSource()).getModel(); tfKey.setEnabled(buttonModel.isSelected()); Index: src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java (working copy) @@ -51,6 +51,7 @@ * */ class SelectNextColumnCellAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { run(); } @@ -81,6 +82,7 @@ */ class SelectPreviousColumnCellAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { run(); } @@ -104,10 +106,12 @@ } } + @Override public void gotoNextDecision() { selectNextColumnCellAction.run(); } + @Override public void gotoPreviousDecision() { selectPreviousColumnCellAction.run(); } Index: src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (working copy) @@ -51,6 +51,7 @@ pnl.add(cbShowTagsWithMultiValuesOnly = new JCheckBox(tr("Show tags with multiple values only")), gc); cbShowTagsWithConflictsOnly.addChangeListener( new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { model.setShowTagsWithConflictsOnly(cbShowTagsWithConflictsOnly.isSelected()); cbShowTagsWithMultiValuesOnly.setEnabled(cbShowTagsWithConflictsOnly.isSelected()); @@ -62,6 +63,7 @@ ); cbShowTagsWithMultiValuesOnly.addChangeListener( new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { model.setShowTagsWithMultiValuesOnly(cbShowTagsWithMultiValuesOnly.isSelected()); } Index: src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (working copy) @@ -64,6 +64,7 @@ Collections.sort( displayedKeys, new Comparator() { + @Override public int compare(String key1, String key2) { if (decisions.get(key1).isDecided() && ! decisions.get(key2).isDecided()) return 1; Index: src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java (revision 6083) +++ src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java (working copy) @@ -53,6 +53,7 @@ * */ class SelectNextColumnCellAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { run(); } @@ -83,6 +84,7 @@ */ class SelectPreviousColumnCellAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { run(); } @@ -106,10 +108,12 @@ } } + @Override public void gotoNextDecision() { selectNextColumnCellAction.run(); } + @Override public void gotoPreviousDecision() { selectPreviousColumnCellAction.run(); } Index: src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (working copy) @@ -267,6 +267,7 @@ } class FilterChangeHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { Main.pref.put("changeset-dialog.for-selected-objects-only", cbInSelectionOnly.isSelected()); pnlList.removeAll(); @@ -304,6 +305,7 @@ ds.setSelected(sel); } + @Override public void actionPerformed(ActionEvent e) { if (Main.main.getEditLayer() == null) return; @@ -320,11 +322,13 @@ setEnabled(getCurrentChangesetList().getSelectedIndices().length > 0); } + @Override public void itemStateChanged(ItemEvent arg0) { updateEnabledState(); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } @@ -342,6 +346,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent arg0) { ChangesetListModel model = getCurrentChangesetListModel(); Set sel = model.getSelectedChangesetIds(); @@ -355,11 +360,13 @@ setEnabled(getCurrentChangesetList().getSelectedIndices().length > 0); } + @Override public void itemStateChanged(ItemEvent arg0) { updateEnabledState(); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } @@ -377,6 +384,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent arg0) { List sel = getCurrentChangesetListModel().getSelectedOpenChangesets(); if (sel.isEmpty()) @@ -388,10 +396,12 @@ setEnabled(getCurrentChangesetListModel().hasSelectedOpenChangesets()); } + @Override public void itemStateChanged(ItemEvent arg0) { updateEnabledState(); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } @@ -409,6 +419,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent arg0) { Set sel = getCurrentChangesetListModel().getSelectedChangesets(); if (sel.isEmpty()) @@ -428,10 +439,12 @@ setEnabled(getCurrentChangesetList().getSelectedIndices().length > 0); } + @Override public void itemStateChanged(ItemEvent arg0) { updateEnabledState(); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } @@ -462,6 +475,7 @@ cm.setSelectedChangesetsById(toSelect); } + @Override public void actionPerformed(ActionEvent arg0) { ChangesetListModel model = getCurrentChangesetListModel(); Set sel = model.getSelectedChangesetIds(); @@ -484,6 +498,7 @@ } Runnable r = new Runnable() { + @Override public void run() { // first, wait for the download task to finish, if a download // task was launched @@ -514,9 +529,11 @@ Main.worker.submit(r); } + @Override public void itemStateChanged(ItemEvent arg0) { } + @Override public void valueChanged(ListSelectionEvent e) { } } Index: src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (working copy) @@ -153,6 +153,7 @@ this.source = source; } + @Override public void valueChanged(TreeSelectionEvent e) { if (source == undoTree) { redoTree.getSelectionModel().removeTreeSelectionListener(redoSelectionListener); @@ -181,24 +182,29 @@ addShowNotifyListener(updater); tree.addTreeSelectionListener(new TreeSelectionListener() { + @Override public void valueChanged(TreeSelectionEvent e) { updater.updateEnabledState(); } }); tree.getModel().addTreeModelListener(new TreeModelListener() { + @Override public void treeNodesChanged(TreeModelEvent e) { updater.updateEnabledState(); } + @Override public void treeNodesInserted(TreeModelEvent e) { updater.updateEnabledState(); } + @Override public void treeNodesRemoved(TreeModelEvent e) { updater.updateEnabledState(); } + @Override public void treeStructureChanged(TreeModelEvent e) { updater.updateEnabledState(); } @@ -314,6 +320,7 @@ FilteredCollection prims = new FilteredCollection( c.getParticipatingPrimitives(), new Predicate(){ + @Override public boolean evaluate(OsmPrimitive o) { OsmPrimitive p = currentLayer.data.getPrimitiveById(o); return p != null && p.isUsable(); @@ -323,6 +330,7 @@ return prims; } + @Override public void commandChanged(int queueSize, int redoSize) { if (!isVisible()) return; @@ -412,6 +420,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { lastOperation = type; TreePath path = tree.getSelectionPath(); @@ -436,6 +445,7 @@ Main.map.repaint(); } + @Override public void updateEnabledState() { // do not allow execution if nothing is selected or a sub command was selected setEnabled(!tree.isSelectionEmpty() && tree.getSelectionPath().getPathCount()==2); Index: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (working copy) @@ -100,6 +100,7 @@ lstConflicts.setCellRenderer(new OsmPrimitivRenderer()); lstConflicts.addMouseListener(new MouseEventHandler()); addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent e) { Main.map.mapView.repaint(); } @@ -230,6 +231,7 @@ Visitor conflictPainter = new AbstractVisitor() { // Manage a stack of visited relations to avoid infinite recursion with cyclic relations (fix #7938) private final Set visited = new HashSet(); + @Override public void visit(Node n) { Point p = nc.getPoint(n); g.drawRect(p.x-1, p.y-1, 2, 2); @@ -239,6 +241,7 @@ Point p2 = nc.getPoint(n2); g.drawLine(p1.x, p1.y, p2.x, p2.y); } + @Override public void visit(Way w) { Node lastN = null; for (Node n : w.getNodes()) { @@ -250,6 +253,7 @@ lastN = n; } } + @Override public void visit(Relation e) { if (!visited.contains(e)) { visited.add(e); @@ -271,6 +275,7 @@ } } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { if (oldLayer != null) { oldLayer.getConflicts().removeConflictListener(this); @@ -305,15 +310,18 @@ return conflicts.get(index); } + @Override public void onConflictsAdded(ConflictCollection conflicts) { refreshView(); } + @Override public void onConflictsRemoved(ConflictCollection conflicts) { System.err.println("1 conflict has been resolved."); refreshView(); } + @Override public void selectionChanged(Collection newSelection) { lstConflicts.clearSelection(); for (OsmPrimitive osm : newSelection) { @@ -354,12 +362,14 @@ listeners = new CopyOnWriteArrayList(); } + @Override public void addListDataListener(ListDataListener l) { if (l != null) { listeners.addIfAbsent(l); } } + @Override public void removeListDataListener(ListDataListener l) { listeners.remove(l); } @@ -377,12 +387,14 @@ } } + @Override public Object getElementAt(int index) { if (index < 0) return null; if (index >= getSize()) return null; return conflicts.get(index).getMy(); } + @Override public int getSize() { if (conflicts == null) return 0; return conflicts.size(); @@ -411,10 +423,12 @@ putValue("help", ht("/Dialog/ConflictList#ResolveAction")); } + @Override public void actionPerformed(ActionEvent e) { resolve(); } + @Override public void valueChanged(ListSelectionEvent e) { ListSelectionModel model = (ListSelectionModel)e.getSource(); boolean enabled = model.getMinSelectionIndex() >= 0 @@ -431,6 +445,7 @@ putValue("help", ht("/Dialog/ConflictList#SelectAction")); } + @Override public void actionPerformed(ActionEvent e) { Collection sel = new LinkedList(); for (Object o : lstConflicts.getSelectedValues()) { @@ -442,6 +457,7 @@ } } + @Override public void valueChanged(ListSelectionEvent e) { ListSelectionModel model = (ListSelectionModel)e.getSource(); boolean enabled = model.getMinSelectionIndex() >= 0 Index: src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (working copy) @@ -142,6 +142,7 @@ setEnabled(true); } + @Override public void actionPerformed(ActionEvent arg0) { closeDialog(); } @@ -158,6 +159,7 @@ setEnabled(true); } + @Override public void actionPerformed(ActionEvent arg0) { HelpBrowser.setUrlForHelpTopic(ht("/Dialog/Conflict")); } @@ -179,6 +181,7 @@ setEnabled(resolver.isResolvedCompletely()); } + @Override public void actionPerformed(ActionEvent arg0) { if (! resolver.isResolvedCompletely()) { Object[] options = { @@ -213,6 +216,7 @@ closeDialog(); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ConflictResolver.RESOLVED_COMPLETELY_PROP)) { updateEnabledState(); @@ -232,6 +236,7 @@ } } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ConflictResolver.MY_PRIMITIVE_PROP)) { updateTitle((OsmPrimitive)evt.getNewValue()); Index: src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (working copy) @@ -214,6 +214,7 @@ // Toggle filter "enabled" on Enter InputMapUtils.addEnterAction(userTable, new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { int index = userTable.getSelectedRow(); if (index<0) return; @@ -224,6 +225,7 @@ // Toggle filter "hiding" on Spacebar InputMapUtils.addSpacebarAction(userTable, new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { int index = userTable.getSelectedRow(); if (index<0) return; @@ -255,6 +257,7 @@ } static class BooleanRenderer extends JCheckBox implements TableCellRenderer { + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) { FilterTableModel model = (FilterTableModel)table.getModel(); setSelected(value != null && (Boolean)value); @@ -266,6 +269,7 @@ public void updateDialogHeader() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { setTitle(tr("Filter Hidden:{0} Disabled:{1}", filterModel.disabledAndHiddenCount, filterModel.disabledCount)); } @@ -314,34 +318,42 @@ return result; } + @Override public void dataChanged(DataChangedEvent event) { filterModel.executeFilters(); } + @Override public void nodeMoved(NodeMovedEvent event) { // Do nothing } + @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) { filterModel.executeFilters(); } + @Override public void primitivesAdded(PrimitivesAddedEvent event) { filterModel.executeFilters(event.getPrimitives()); } + @Override public void primitivesRemoved(PrimitivesRemovedEvent event) { filterModel.executeFilters(); } + @Override public void relationMembersChanged(RelationMembersChangedEvent event) { filterModel.executeFilters(getAffectedPrimitives(event.getPrimitives())); } + @Override public void tagsChanged(TagsChangedEvent event) { filterModel.executeFilters(getAffectedPrimitives(event.getPrimitives())); } + @Override public void wayNodesChanged(WayNodesChangedEvent event) { filterModel.executeFilters(getAffectedPrimitives(event.getPrimitives())); } Index: src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (working copy) @@ -235,10 +235,12 @@ return filters.get(i); } + @Override public int getRowCount() { return filters.size(); } + @Override public int getColumnCount() { return 5; } @@ -305,6 +307,7 @@ } } + @Override public Object getValueAt(int row, int column) { Filter f = filters.get(row); switch (column) { Index: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (working copy) @@ -133,10 +133,12 @@ /* ----------------------------------------------------------------------------- */ /* interface HistoryDataSetListener */ /* ----------------------------------------------------------------------------- */ + @Override public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) { model.refresh(); } + @Override public void historyDataSetCleared(HistoryDataSet source) { model.refresh(); } @@ -206,6 +208,7 @@ selectPrimitives(selectedPrimitives); } + @Override public void selectionChanged(Collection newSelection) { data.clear(); selectionModel.clearSelection(); @@ -267,6 +270,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { int [] rows = historyTable.getSelectedRows(); if (rows == null || rows.length == 0) return; @@ -281,6 +285,7 @@ setEnabled(historyTable.getSelectedRowCount() > 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } @@ -307,6 +312,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { int [] rows = historyTable.getSelectedRows(); if (rows == null || rows.length == 0) return; @@ -317,6 +323,7 @@ setEnabled(historyTable.getSelectedRowCount() > 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } Index: src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (working copy) @@ -293,34 +293,41 @@ } class LatLonInputVerifier implements DocumentListener { + @Override public void changedUpdate(DocumentEvent e) { parseLatLonUserInput(); } + @Override public void insertUpdate(DocumentEvent e) { parseLatLonUserInput(); } + @Override public void removeUpdate(DocumentEvent e) { parseLatLonUserInput(); } } class EastNorthInputVerifier implements DocumentListener { + @Override public void changedUpdate(DocumentEvent e) { parseEastNorthUserInput(); } + @Override public void insertUpdate(DocumentEvent e) { parseEastNorthUserInput(); } + @Override public void removeUpdate(DocumentEvent e) { parseEastNorthUserInput(); } } static class TextFieldFocusHandler implements FocusListener { + @Override public void focusGained(FocusEvent e) { Component c = e.getComponent(); if (c instanceof JosmTextField) { @@ -328,6 +335,7 @@ tf.selectAll(); } } + @Override public void focusLost(FocusEvent e) {} } Index: src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (working copy) @@ -274,6 +274,7 @@ // Activate layer on Enter key press InputMapUtils.addEnterAction(layerList, new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { activateLayerAction.actionPerformed(null); layerList.requestFocus(); Index: src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (working copy) @@ -34,6 +34,7 @@ putValue("help", ht("/Action/LayerInfo")); this.layer = layer; } + @Override public void actionPerformed(ActionEvent e) { JOptionPane.showMessageDialog( Main.parent, Index: src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (working copy) @@ -118,6 +118,7 @@ } }); cbWireframe.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Main.main.menu.wireFrameToggleAction.actionPerformed(null); } @@ -314,6 +315,7 @@ setVerticalAlignment(SwingConstants.CENTER); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) { if (value == null) return this; @@ -399,6 +401,7 @@ model.ensureSelectedIsVisible(); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } Index: src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (working copy) @@ -234,6 +234,7 @@ super(name, iconName, tooltip, shortcut, false); } + @Override public void actionPerformed(ActionEvent e) { toggleButtonHook(); if(getValue("toolbarbutton") != null && getValue("toolbarbutton") instanceof JButton) { @@ -310,6 +311,7 @@ } } + @Override public void buttonShown() { unfurlDialog(); } @@ -485,6 +487,7 @@ buttonsHide.setBorder(BorderFactory.createEmptyBorder()); buttonsHide.addActionListener( new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { setIsButtonHiding(buttonHiding == ButtonHiddingType.ALWAYS_SHOWN?ButtonHiddingType.DYNAMIC:ButtonHiddingType.ALWAYS_SHOWN); } @@ -502,6 +505,7 @@ pref.setBorder(BorderFactory.createEmptyBorder()); pref.addActionListener( new ActionListener(){ + @Override @SuppressWarnings("unchecked") public void actionPerformed(ActionEvent e) { final PreferenceDialog p = new PreferenceDialog(Main.parent); @@ -523,6 +527,7 @@ sticky.setBorder(BorderFactory.createEmptyBorder()); sticky.addActionListener( new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { detach(); dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null); @@ -537,6 +542,7 @@ close.setBorder(BorderFactory.createEmptyBorder()); close.addActionListener( new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { hideDialog(); dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null); @@ -743,6 +749,7 @@ return preferredHeight; } + @Override public String helpTopic() { String help = getClass().getName(); help = help.substring(help.lastIndexOf('.')+1, help.length()-6); Index: src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (working copy) @@ -105,10 +105,12 @@ * Called when the selection in the dataset changed. * @param newSelection The new selection array. */ + @Override public void selectionChanged(Collection newSelection) { refresh(newSelection); } + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { if (newLayer instanceof OsmDataLayer) { refresh(((OsmDataLayer) newLayer).data.getAllSelected()); @@ -117,10 +119,12 @@ } } + @Override public void layerAdded(Layer newLayer) { // do nothing } + @Override public void layerRemoved(Layer oldLayer) { // do nothing } @@ -163,6 +167,7 @@ model.selectPrimitivesOwnedBy(userTable.getSelectedRows()); } + @Override public void actionPerformed(ActionEvent e) { select(); } @@ -171,6 +176,7 @@ setEnabled(userTable != null && userTable.getSelectedRowCount() > 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } @@ -233,6 +239,7 @@ setEnabled(userTable != null && userTable.getSelectedRowCount() > 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } @@ -261,6 +268,7 @@ this.count=count; this.percent = percent; } + @Override public int compareTo(UserInfo o) { if (count < o.count) return 1; if (count > o.count) return -1; Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (working copy) @@ -87,6 +87,7 @@ setToolTipText(""); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { if (value == null) Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (working copy) @@ -203,14 +203,17 @@ /* ------------------------------------------------------------------------------- */ /* interface ChangesetDownloadTask */ /* ------------------------------------------------------------------------------- */ + @Override public Set getDownloadedChangesets() { return downloadedChangesets; } + @Override public boolean isCanceled() { return canceled; } + @Override public boolean isFailed() { return lastException != null; } Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (working copy) @@ -166,6 +166,7 @@ /* ---------------------------------------------------------------------------- */ /* interface PropertyChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if(!evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) return; @@ -184,6 +185,7 @@ putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server")); } + @Override public void actionPerformed(ActionEvent evt) { if (currentChangeset == null) return; ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetContentPanel.this,currentChangeset.getId()); @@ -249,6 +251,7 @@ } Runnable r = new Runnable() { + @Override public void run() { try { for (HistoryOsmPrimitive p : primitives) { @@ -264,6 +267,7 @@ } } catch (final Exception e) { GuiHelper.runInEDT(new Runnable() { + @Override public void run() { BugReportExceptionHandler.handleException(e); } @@ -279,12 +283,14 @@ setEnabled(model.hasSelectedPrimitives()); } + @Override public void actionPerformed(ActionEvent arg0) { Set selected = model.getSelectedPrimitives(); if (selected.isEmpty()) return; showHistory(selected); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } @@ -315,6 +321,7 @@ ); } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) return; @@ -343,10 +350,12 @@ setEnabled(model.hasSelectedPrimitives()); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { updateEnabledState(); } @@ -377,6 +386,7 @@ ); } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) return; @@ -406,10 +416,12 @@ setEnabled(model.hasSelectedPrimitives()); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { updateEnabledState(); } @@ -446,6 +458,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangesetcontent")); } + @Override public void actionPerformed(ActionEvent evt) { if (current == null) return; ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(HeaderPanel.this, current.getId()); Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java (working copy) @@ -54,6 +54,7 @@ setToolTipText(""); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { if (value == null) Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (working copy) @@ -83,6 +83,7 @@ Collections.sort( data, new Comparator() { + @Override public int compare(ChangesetDataSetEntry c1, ChangesetDataSetEntry c2) { if (c1.getModificationType().equals(c2.getModificationType())) { long id1 = c1.getPrimitive().getId(); @@ -114,14 +115,17 @@ /* -------------------------------------------------------------- */ /* interface TableModel */ /* -------------------------------------------------------------- */ + @Override public int getColumnCount() { return 3; } + @Override public int getRowCount() { return data.size(); } + @Override public Object getValueAt(int row, int col) { switch(col) { case 0: return data.get(row).getModificationType(); @@ -147,9 +151,11 @@ this(entry.getModificationType(), entry.getPrimitive()); } + @Override public ChangesetModificationType getModificationType() { return modificationType; } + @Override public HistoryOsmPrimitive getPrimitive() { return primitive; } Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (working copy) @@ -254,6 +254,7 @@ /* ---------------------------------------------------------------------------- */ /* interface PropertyChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (! evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) return; @@ -271,6 +272,7 @@ putValue(SHORT_DESCRIPTION, tr("Remove the changeset in the detail view panel from the local cache")); } + @Override public void actionPerformed(ActionEvent evt) { if (current == null) return; @@ -293,6 +295,7 @@ putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server")); } + @Override public void actionPerformed(ActionEvent evt) { if (current == null) return; ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetDetailPanel.this,current.getId()); @@ -329,6 +332,7 @@ putValue(SHORT_DESCRIPTION, tr("Update the changeset from the OSM server")); } + @Override public void actionPerformed(ActionEvent evt) { if (current == null) return; Main.worker.submit( @@ -377,6 +381,7 @@ ); } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) return; @@ -403,6 +408,7 @@ setEnabled(current != null); } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { updateEnabledState(); } @@ -436,6 +442,7 @@ ); } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) return; @@ -463,6 +470,7 @@ setEnabled(current != null); } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { updateEnabledState(); } Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (working copy) @@ -146,6 +146,7 @@ ExceptionDialogUtil.explainException(lastException); } Runnable r = new Runnable() { + @Override public void run() { ChangesetCache.getInstance().update(downloadedChangesets); } @@ -191,14 +192,17 @@ /* ------------------------------------------------------------------------------- */ /* interface ChangesetDownloadTask */ /* ------------------------------------------------------------------------------- */ + @Override public Set getDownloadedChangesets() { return downloadedChangesets; } + @Override public boolean isCanceled() { return canceled; } + @Override public boolean isFailed() { return lastException != null; } Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java (working copy) @@ -18,6 +18,7 @@ /* ---------------------------------------------------------------------------- */ /* Interface SelectionChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void selectionChanged(Collection newSelection) { initFromPrimitives(newSelection); } @@ -25,6 +26,7 @@ /* ---------------------------------------------------------------------------- */ /* Interface LayerChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { if (newLayer == null) { setChangesets(null); Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (working copy) @@ -46,6 +46,7 @@ setText(sb.toString()); } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Changeset cs = (Changeset)value; Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (working copy) @@ -143,6 +143,7 @@ Collections.sort( data, new Comparator() { + @Override public int compare(Changeset cs1, Changeset cs2) { if (cs1.getId() > cs2.getId()) return -1; if (cs1.getId() == cs2.getId()) return 0; @@ -182,6 +183,7 @@ /* ---------------------------------------------------------------------------- */ /* Interface ChangesetCacheListener */ /* ---------------------------------------------------------------------------- */ + @Override public void changesetCacheUpdated(ChangesetCacheEvent event) { Set sel = getSelectedChangesets(); for(Changeset cs: event.getAddedChangesets()) { Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (working copy) @@ -46,6 +46,7 @@ /* ---------------------------------------------------------------------------- */ /* interface PropertyChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (!evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) return; Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (working copy) @@ -28,27 +28,36 @@ /* ------------------------------------------------------------------------------ */ /* interface DataSetListener */ /* ------------------------------------------------------------------------------ */ + @Override public void dataChanged(DataChangedEvent event) { initFromDataSet(event.getDataset()); } + @Override public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored */} + @Override public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored */} + @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignored */} + @Override public void nodeMoved(NodeMovedEvent event) {/* ignored */} + @Override public void relationMembersChanged(RelationMembersChangedEvent event) {/* ignored */} + @Override public void tagsChanged(TagsChangedEvent event) {/* ignored */} + @Override public void wayNodesChanged(WayNodesChangedEvent event) {/* ignored */} /* ------------------------------------------------------------------------------ */ /* interface EditLayerListener */ /* ------------------------------------------------------------------------------ */ + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { // just init the model content. Don't register as DataSetListener. The mode // is already registered to receive DataChangedEvents from the current Index: src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (working copy) @@ -84,6 +84,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) return; @@ -100,14 +101,17 @@ setEnabled(tfChangesetId.readIds()); } + @Override public void changedUpdate(DocumentEvent arg0) { updateEnabledState(); } + @Override public void insertUpdate(DocumentEvent arg0) { updateEnabledState(); } + @Override public void removeUpdate(DocumentEvent arg0) { updateEnabledState(); } Index: src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (working copy) @@ -258,6 +258,7 @@ pnlBoundingBoxRestriction.setVisible(cbBoundingBoxRestriction.isSelected()); } + @Override public void itemStateChanged(ItemEvent e) { if (e.getSource() == cbUserRestriction) { userRestrictionStateChanged(); @@ -616,6 +617,7 @@ } class UserRestrictionChangedHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { tfUid.setEnabled(rbRestrictToUid.isSelected()); tfUserName.setEnabled(rbRestrictToUserName.isSelected()); @@ -818,6 +820,7 @@ } class TimeRestrictionChangedHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { tfClosedAfterDate1.setEnabled(rbClosedAfter.isSelected()); tfClosedAfterTime1.setEnabled(rbClosedAfter.isSelected()); Index: src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (working copy) @@ -244,6 +244,7 @@ * */ class SelectQueryHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { BasicQuery q = getSelectedQuery(); if (q == null) return; Index: src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (working copy) @@ -175,6 +175,7 @@ ); } + @Override public void actionPerformed(ActionEvent arg0) { try { switch(tpQueryPanels.getSelectedIndex()) { @@ -218,6 +219,7 @@ setVisible(false); } + @Override public void actionPerformed(ActionEvent arg0) { cancel(); } Index: src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (working copy) @@ -79,6 +79,7 @@ ); pnl.getEditorPane().addHyperlinkListener( new HyperlinkListener() { + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) { tfUrl.setText(e.getDescription()); @@ -193,14 +194,17 @@ feedbackInvalid(); } } + @Override public void changedUpdate(DocumentEvent e) { validate(); } + @Override public void insertUpdate(DocumentEvent e) { validate(); } + @Override public void removeUpdate(DocumentEvent e) { validate(); } Index: src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (working copy) @@ -55,6 +55,7 @@ tag = t; this.presetHandler = presetHandler; } + @Override public void mouseClicked(MouseEvent arg0) { Collection selection = tag.createSelection(presetHandler.getSelection()); if (selection == null || selection.isEmpty()) @@ -66,13 +67,17 @@ } } + @Override public void mouseEntered(MouseEvent arg0) { label.setFont(hover); } + @Override public void mouseExited(MouseEvent arg0) { label.setFont(normal); } + @Override public void mousePressed(MouseEvent arg0) {} + @Override public void mouseReleased(MouseEvent arg0) {} } Index: src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (working copy) @@ -92,6 +92,7 @@ private String objKey; Comparator defaultACItemComparator = new Comparator() { + @Override public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue()); } @@ -308,6 +309,7 @@ p.add(Box.createHorizontalStrut(10), GBC.std()); p.add(values, GBC.eol().fill(GBC.HORIZONTAL)); values.getEditor().addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { buttonAction(0, null); // emulate OK button click } @@ -493,6 +495,7 @@ protected JPopupMenu popupMenu = new JPopupMenu() { JCheckBoxMenuItem fixTagLanguageCb = new JCheckBoxMenuItem( new AbstractAction(tr("Use English language for tag by default")){ + @Override public void actionPerformed(ActionEvent e) { boolean sel=((JCheckBoxMenuItem) e.getSource()).getState(); PROPERTY_FIX_TAG_LOCALE.put(sel); @@ -590,12 +593,14 @@ selectKeysComboBox(); popupMenu.add(new AbstractAction(tr("Set number of recently added tags")) { + @Override public void actionPerformed(ActionEvent e) { selectNumberOfTags(); } }); JCheckBoxMenuItem rememberLastTags = new JCheckBoxMenuItem( new AbstractAction(tr("Remember last used tags")){ + @Override public void actionPerformed(ActionEvent e) { boolean sel=((JCheckBoxMenuItem) e.getSource()).getState(); PROPERTY_REMEMBER_TAGS.put(sel); Index: src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (working copy) @@ -199,12 +199,14 @@ } } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; run(); } + @Override public void valueChanged(TreeSelectionEvent e) { refreshEnabled(); } @@ -225,6 +227,7 @@ Main.worker.submit(new DownloadAllChildrenTask(getParentDialog(), (Relation)model.getRoot())); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; @@ -261,12 +264,14 @@ Main.worker.submit(new DownloadRelationSetTask(getParentDialog(),relations)); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; run(); } + @Override public void valueChanged(TreeSelectionEvent e) { updateEnabledState(); } @@ -415,6 +420,7 @@ refreshView(r); } SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { Main.map.repaint(); } Index: src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (working copy) @@ -134,6 +134,7 @@ SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { curLayer.mergeFrom(dataSet); curLayer.onPostDownloadFromServer(); Index: src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (working copy) @@ -97,6 +97,7 @@ SwingUtilities.invokeAndWait( new Runnable() { + @Override public void run() { layer.mergeFrom(allDownloads); layer.onPostDownloadFromServer(); Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (working copy) @@ -33,6 +33,7 @@ /** * replies the table cell editor */ + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { @@ -43,6 +44,7 @@ return editor; } + @Override public Object getCellEditorValue() { return editor.getText(); } Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (working copy) @@ -64,6 +64,7 @@ setForeground(fgc); } + @Override abstract public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column); Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (working copy) @@ -86,6 +86,7 @@ /* --------------------------------------------------------------------------- */ /* Interface SelectionChangedListener */ /* --------------------------------------------------------------------------- */ + @Override public void selectionChanged(Collection newSelection) { if (Main.main.getEditLayer() != this.layer) return; // just trigger a repaint @@ -97,6 +98,7 @@ /* --------------------------------------------------------------------------- */ /* Interface DataSetListener */ /* --------------------------------------------------------------------------- */ + @Override public void dataChanged(DataChangedEvent event) { // just trigger a repaint - the display name of the relation members may // have changed @@ -105,21 +107,26 @@ setSelectedMembers(sel); } + @Override public void nodeMoved(NodeMovedEvent event) {/* ignore */} + @Override public void primitivesAdded(PrimitivesAddedEvent event) {/* ignore */} + @Override public void primitivesRemoved(PrimitivesRemovedEvent event) { // ignore - the relation in the editor might become out of sync with the relation // in the dataset. We will deal with it when the relation editor is closed or // when the changes in the editor are applied. } + @Override public void relationMembersChanged(RelationMembersChangedEvent event) { // ignore - the relation in the editor might become out of sync with the relation // in the dataset. We will deal with it when the relation editor is closed or // when the changes in the editor are applied. } + @Override public void tagsChanged(TagsChangedEvent event) { // just refresh the respective table cells // @@ -132,8 +139,10 @@ setSelectedMembers(sel); } + @Override public void wayNodesChanged(WayNodesChangedEvent event) {/* ignore */} + @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignore */} /* --------------------------------------------------------------------------- */ @@ -163,14 +172,17 @@ fireTableDataChanged(); } + @Override public int getColumnCount() { return 3; } + @Override public int getRowCount() { return members.size(); } + @Override public Object getValueAt(int rowIndex, int columnIndex) { switch (columnIndex) { case 0: @@ -725,6 +737,7 @@ return connectionType.get(i); } + @Override public void tableChanged(TableModelEvent e) { connectionType = null; } Index: src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (working copy) @@ -172,6 +172,7 @@ // SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { getLayer().onPostDownloadFromServer(); } Index: src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (working copy) @@ -97,6 +97,7 @@ setEnabled(model.canReload()); } + @Override public void actionPerformed(ActionEvent e) { boolean full = cbReadFull.isSelected(); final ParentRelationLoadingTask task = new ParentRelationLoadingTask( @@ -107,6 +108,7 @@ ); task.setContinuation( new Runnable() { + @Override public void run() { if (task.isCanceled() || task.hasError()) return; @@ -117,14 +119,17 @@ Main.worker.submit(task); } + @Override public void contentsChanged(ListDataEvent e) { refreshEnabled(); } + @Override public void intervalAdded(ListDataEvent e) { refreshEnabled(); } + @Override public void intervalRemoved(ListDataEvent e) { refreshEnabled(); } @@ -146,6 +151,7 @@ setEnabled(referrers.getSelectionModel().getMinSelectionIndex() >=0); } + @Override public void actionPerformed(ActionEvent e) { run(); } @@ -159,6 +165,7 @@ editor.setVisible(true); } + @Override public void valueChanged(ListSelectionEvent e) { refreshEnabled(); } Index: src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (working copy) @@ -36,10 +36,12 @@ fireModelUpdate(); } + @Override public Object getElementAt(int index) { return referrers.get(index); } + @Override public int getSize() { return referrers.size(); } Index: src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (working copy) @@ -182,6 +182,7 @@ * called when a layer is removed * */ + @Override public void layerRemoved(Layer oldLayer) { if (oldLayer == null || ! (oldLayer instanceof OsmDataLayer)) return; @@ -199,10 +200,12 @@ } } + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { // do nothing } + @Override public void layerAdded(Layer newLayer) { // do nothing } Index: src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (working copy) @@ -80,10 +80,12 @@ */ class LazyRelationLoader implements TreeWillExpandListener { + @Override public void treeWillCollapse(TreeExpansionEvent event) throws ExpandVetoException { // do nothing } + @Override public void treeWillExpand(TreeExpansionEvent event) throws ExpandVetoException { TreePath path = event.getPath(); Relation parent = (Relation)event.getPath().getLastPathComponent(); @@ -140,6 +142,7 @@ final RelationTreeModel model = (RelationTreeModel)getModel(); SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { model.refreshNode(path); } Index: src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (working copy) @@ -61,6 +61,7 @@ setBackground(bgColor); } + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { Index: src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (working copy) @@ -188,38 +188,46 @@ /* ----------------------------------------------------------------------- */ /* interface TreeModel */ /* ----------------------------------------------------------------------- */ + @Override public Object getChild(Object parent, int index) { return getRelationChildByIdx((Relation)parent, index); } + @Override public int getChildCount(Object parent) { return getNumRelationChildren((Relation)parent); } + @Override public int getIndexOfChild(Object parent, Object child) { return getIndexForRelationChild((Relation)parent, (Relation)child); } + @Override public Object getRoot() { return root; } + @Override public boolean isLeaf(Object node) { Relation r = (Relation)node; if (r.isIncomplete()) return false; return getNumRelationChildren(r) == 0; } + @Override public void addTreeModelListener(TreeModelListener l) { if (l != null) { listeners.addIfAbsent(l); } } + @Override public void removeTreeModelListener(TreeModelListener l) { listeners.remove(l); } + @Override public void valueForPathChanged(TreePath path, Object newValue) { // do nothing } Index: src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java (working copy) @@ -10,8 +10,10 @@ public RunnableAction() { } + @Override public abstract void run(); + @Override public void actionPerformed(ActionEvent arg0) { run(); } Index: src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (working copy) @@ -63,6 +63,7 @@ setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(primitive)); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (working copy) @@ -44,20 +44,24 @@ MapView.removeLayerChangeListener(this); } + @Override public int getColumnCount() { return 1; } + @Override public int getRowCount() { if (Main.map.mapView.getEditLayer() != layer) return 0; return cache.size(); } + @Override public Object getValueAt(int rowIndex, int columnIndex) { return cache.get(rowIndex); } + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { if (oldLayer == layer) { cache.clear(); @@ -68,10 +72,12 @@ fireTableDataChanged(); } + @Override public void layerAdded(Layer newLayer) { // do nothing } + @Override public void layerRemoved(Layer oldLayer) { if (oldLayer == layer) { unregister(); @@ -80,6 +86,7 @@ fireTableDataChanged(); } + @Override public void selectionChanged(Collection newSelection) { if (layer == Main.map.mapView.getEditLayer()) { cache.clear(); Index: src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 6083) +++ src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (working copy) @@ -104,6 +104,7 @@ return pnl; } + @Override public void addGui(final DownloadDialog gui) { JPanel dlg = new JPanel(new GridBagLayout()); gui.addDownloadAreaSelector(dlg, tr("Bookmarks")); @@ -111,6 +112,7 @@ bookmarks = new BookmarkList(); bookmarks.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent e) { Bookmark b = (Bookmark)bookmarks.getSelectedValue(); if (b != null) { @@ -160,6 +162,7 @@ * * @param area the download area. */ + @Override public void setDownloadArea(Bounds area) { if (area == null) return; this.currentArea = area; @@ -179,6 +182,7 @@ putValue(SHORT_DESCRIPTION, tr("Add a bookmark for the currently selected download area")); } + @Override public void actionPerformed(ActionEvent e) { if (currentArea == null) { JOptionPane.showMessageDialog( @@ -212,6 +216,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { Object[] sels = bookmarks.getSelectedValues(); if (sels == null || sels.length == 0) @@ -224,6 +229,7 @@ protected void updateEnabledState() { setEnabled(bookmarks.getSelectedIndices().length > 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } @@ -237,6 +243,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { Object[] sels = bookmarks.getSelectedValues(); if (sels == null || sels.length != 1) @@ -260,6 +267,7 @@ protected void updateEnabledState() { setEnabled(bookmarks.getSelectedIndices().length == 1); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } Index: src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java =================================================================== --- src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 6083) +++ src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (working copy) @@ -80,6 +80,7 @@ registerBoundingBoxBuilder(); } + @Override public void addGui(final DownloadDialog gui) { buildDownloadAreaInputFields(); final JPanel dlg = new JPanel(new GridBagLayout()); @@ -122,6 +123,7 @@ this.parent = gui; } + @Override public void setDownloadArea(Bounds area) { updateBboxFields(area); updateUrl(area); @@ -211,6 +213,7 @@ check(); } + @Override public void actionPerformed(ActionEvent e) { check(); } @@ -243,6 +246,7 @@ check(); } + @Override public void actionPerformed(ActionEvent e) { check(); } @@ -261,8 +265,11 @@ } class OsmUrlRefresher implements DocumentListener { + @Override public void changedUpdate(DocumentEvent e) { parseURL(parent); } + @Override public void insertUpdate(DocumentEvent e) { parseURL(parent); } + @Override public void removeUpdate(DocumentEvent e) { parseURL(parent); } } @@ -297,6 +304,7 @@ refreshBounds(); } + @Override public void actionPerformed(ActionEvent e) { refreshBounds(); } Index: src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/download/DownloadDialog.java (working copy) @@ -135,6 +135,7 @@ cbStartup = new JCheckBox(tr("Open this dialog on startup")); cbStartup.setToolTipText(tr("Autostart ''Download from OSM'' dialog every time JOSM is started.
You can open it manually from File menu or toolbar.")); cbStartup.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Main.pref.put("download.autorun", cbStartup.isSelected()); }}); @@ -152,6 +153,7 @@ } /* This should not be necessary, but if not here, repaint is not always correct in SlippyMap! */ + @Override public void paint(Graphics g) { tpDownloadAreaSelectors.getSelectedComponent().paint(g); super.paint(g); @@ -197,6 +199,7 @@ KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "checkClipboardContents"); getRootPane().getActionMap().put("checkClipboardContents", new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { String clip = Utils.getClipboardContent(); if (clip == null) { @@ -399,6 +402,7 @@ setVisible(false); } + @Override public void actionPerformed(ActionEvent e) { run(); } @@ -438,6 +442,7 @@ setVisible(false); } + @Override public void actionPerformed(ActionEvent e) { run(); } Index: src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6083) +++ src/org/openstreetmap/josm/gui/download/PlaceSelection.java (working copy) @@ -132,6 +132,7 @@ * * This method is, for all intents and purposes, the constructor for this class. */ + @Override public void addGui(final DownloadDialog gui) { JPanel panel = new JPanel(); panel.setLayout(new BorderLayout()); @@ -163,6 +164,7 @@ parent = gui; } + @Override public void setDownloadArea(Bounds area) { tblSearchResults.clearSelection(); } @@ -290,6 +292,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled() || cbSearchExpression.getText().trim().length() == 0) return; @@ -303,14 +306,17 @@ setEnabled(cbSearchExpression.getText().trim().length() > 0); } + @Override public void changedUpdate(DocumentEvent e) { updateEnabledState(); } + @Override public void insertUpdate(DocumentEvent e) { updateEnabledState(); } + @Override public void removeUpdate(DocumentEvent e) { updateEnabledState(); } @@ -472,6 +478,7 @@ } class ListSelectionHandler implements ListSelectionListener { + @Override public void valueChanged(ListSelectionEvent lse) { SearchResult r = model.getSelectedSearchResult(); if (r != null) { @@ -523,6 +530,7 @@ return ret.toString(); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java =================================================================== --- src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (revision 6083) +++ src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (working copy) @@ -36,16 +36,19 @@ pnlSlippyMapBBoxChooser.addPropertyChangeListener(this); } + @Override public void addGui(final DownloadDialog gui) { iGui = gui; iGui.addDownloadAreaSelector(pnlSlippyMapBBoxChooser, tr("Slippy map")); } + @Override public void setDownloadArea(Bounds area) { pnlSlippyMapBBoxChooser.setBoundingBox(area); repaint(); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(BBoxChooser.BBOX_PROP)) { if (iGui != null) { Index: src/org/openstreetmap/josm/gui/download/TileSelection.java =================================================================== --- src/org/openstreetmap/josm/gui/download/TileSelection.java (revision 6083) +++ src/org/openstreetmap/josm/gui/download/TileSelection.java (working copy) @@ -30,15 +30,18 @@ build(); } + @Override public void addGui(final DownloadDialog gui) { gui.addDownloadAreaSelector(chooser, tr("Tile Numbers")); parent = gui; } + @Override public void setDownloadArea(Bounds area) { chooser.setBoundingBox(area); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(BBoxChooser.BBOX_PROP)) { Bounds bbox = (Bounds)evt.getNewValue(); Index: src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java =================================================================== --- src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java (revision 6083) +++ src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java (working copy) @@ -49,6 +49,7 @@ this.helpTopic = helpTopic; } + @Override public void actionPerformed(ActionEvent e) { if (helpTopic != null) { HelpBrowser.setUrlForHelpTopic(helpTopic); Index: src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6083) +++ src/org/openstreetmap/josm/gui/help/HelpBrowser.java (working copy) @@ -83,6 +83,7 @@ public static void setUrlForHelpTopic(final String helpTopic) { final HelpBrowser browser = getInstance(); Runnable r = new Runnable() { + @Override public void run() { browser.openHelpTopic(helpTopic); browser.setVisible(true); @@ -189,6 +190,7 @@ p.add(buildToolBar(), BorderLayout.NORTH); help.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Close"); help.getActionMap().put("Close", new AbstractAction(){ + @Override public void actionPerformed(ActionEvent e) { setVisible(false); } @@ -427,6 +429,7 @@ putValue(SMALL_ICON, ImageProvider.get("help", "internet")); } + @Override public void actionPerformed(ActionEvent e) { OpenBrowser.displayUrl(getUrl()); } @@ -439,6 +442,7 @@ putValue(SMALL_ICON,ImageProvider.get("dialogs", "edit")); } + @Override public void actionPerformed(ActionEvent e) { String url = getUrl(); if(url == null) @@ -471,6 +475,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); } + @Override public void actionPerformed(ActionEvent e) { openUrl(getUrl()); } @@ -487,9 +492,11 @@ setEnabled(history.canGoBack()); } + @Override public void actionPerformed(ActionEvent e) { history.back(); } + @Override public void update(Observable o, Object arg) { //System.out.println("BackAction: canGoBoack=" + history.canGoBack() ); setEnabled(history.canGoBack()); @@ -507,9 +514,11 @@ setEnabled(history.canGoForward()); } + @Override public void actionPerformed(ActionEvent e) { history.forward(); } + @Override public void update(Observable o, Object arg) { setEnabled(history.canGoForward()); } @@ -522,6 +531,7 @@ putValue(SMALL_ICON, ImageProvider.get("help", "home")); } + @Override public void actionPerformed(ActionEvent e) { openHelpTopic("/"); } @@ -580,6 +590,7 @@ return null; } + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) return; Index: src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (working copy) @@ -57,6 +57,7 @@ * event handler for {@link AdjustmentEvent}s * */ + @Override public void adjustmentValueChanged(AdjustmentEvent e) { if (! enabledMap.get(e.getAdjustable())) return; @@ -123,6 +124,7 @@ // register an item lister with the check box // view.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { switch(e.getStateChange()) { case ItemEvent.SELECTED: @@ -141,6 +143,7 @@ observable.addObserver( new Observer() { + @Override public void update(Observable o, Object arg) { boolean sync = isParticipatingInSynchronizedScrolling(adjustable); if (view.isSelected() != sync) { Index: src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (working copy) @@ -280,6 +280,7 @@ } } + @Override public void update(Observable o, Object arg) { refresh(); } @@ -293,6 +294,7 @@ super(model, PointInTimeType.REFERENCE_POINT_IN_TIME); } + @Override protected void build() { setLayout(new GridBagLayout()); setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY)); @@ -318,6 +320,7 @@ lblDistance.setBorder(BorderFactory.createEmptyBorder(2,2,2,2)); } + @Override protected void refresh() { HistoryOsmPrimitive p = getPrimitive(); HistoryOsmPrimitive opposite = getOppositePrimitive(); Index: src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (working copy) @@ -121,12 +121,14 @@ /* ---------------------------------------------------------------------------------- */ /* interface HistoryDataSetListener */ /* ---------------------------------------------------------------------------------- */ + @Override public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) { if (primitiveId == null || primitiveId.equals(browser.getHistory().getPrimitiveId())) { browser.populate(source.getHistory(browser.getHistory().getPrimitiveId())); } } + @Override public void historyDataSetCleared(HistoryDataSet source) { closeAction.run(); } @@ -145,6 +147,7 @@ HistoryBrowserDialogManager.getInstance().hide(HistoryBrowserDialog.this); } + @Override public void actionPerformed(ActionEvent e) { run(); } @@ -157,6 +160,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); } + @Override public void actionPerformed(ActionEvent e) { HistoryLoadTask task = new HistoryLoadTask(); task.add(browser.getHistory()); Index: src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (working copy) @@ -123,9 +123,12 @@ /* ----------------------------------------------------------------------------- */ /* LayerChangeListener */ /* ----------------------------------------------------------------------------- */ + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) {} + @Override public void layerAdded(Layer newLayer) {} + @Override public void layerRemoved(Layer oldLayer) { // remove all history browsers if the number of layers drops to 0 // Index: src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (working copy) @@ -681,6 +681,7 @@ /* ---------------------------------------------------------------------- */ /* DataSetListener */ /* ---------------------------------------------------------------------- */ + @Override public void nodeMoved(NodeMovedEvent event) { Node node = event.getNode(); if (!node.isNew() && node.getId() == history.getId()) { @@ -688,6 +689,7 @@ } } + @Override public void primitivesAdded(PrimitivesAddedEvent event) { for (OsmPrimitive p: event.getPrimitives()) { if (canShowAsLatest(p)) { @@ -696,6 +698,7 @@ } } + @Override public void primitivesRemoved(PrimitivesRemovedEvent event) { for (OsmPrimitive p: event.getPrimitives()) { if (!p.isNew() && p.getId() == history.getId()) { @@ -704,6 +707,7 @@ } } + @Override public void relationMembersChanged(RelationMembersChangedEvent event) { Relation r = event.getRelation(); if (!r.isNew() && r.getId() == history.getId()) { @@ -711,6 +715,7 @@ } } + @Override public void tagsChanged(TagsChangedEvent event) { OsmPrimitive prim = event.getPrimitive(); if (!prim.isNew() && prim.getId() == history.getId()) { @@ -718,6 +723,7 @@ } } + @Override public void wayNodesChanged(WayNodesChangedEvent event) { Way way = event.getChangedWay(); if (!way.isNew() && way.getId() == history.getId()) { @@ -725,6 +731,7 @@ } } + @Override public void dataChanged(DataChangedEvent event) { OsmPrimitive primitive = event.getDataset().getPrimitiveById(history.getId(), history.getType()); HistoryOsmPrimitive latest; @@ -737,6 +744,7 @@ fireModelChange(); } + @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) { // Irrelevant } @@ -744,6 +752,7 @@ /* ---------------------------------------------------------------------- */ /* LayerChangeListener */ /* ---------------------------------------------------------------------- */ + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { if (oldLayer != null && oldLayer instanceof OsmDataLayer) { OsmDataLayer l = (OsmDataLayer)oldLayer; @@ -767,7 +776,9 @@ fireModelChange(); } + @Override public void layerAdded(Layer newLayer) {} + @Override public void layerRemoved(Layer oldLayer) {} /** @@ -777,11 +788,13 @@ static class HistoryPrimitiveBuilder extends AbstractVisitor { private HistoryOsmPrimitive clone; + @Override public void visit(Node n) { clone = new HistoryNode(n.getId(), n.getVersion(), n.isVisible(), getCurrentUser(), 0, null, n.getCoor(), false); clone.setTags(n.getKeys()); } + @Override public void visit(Relation r) { clone = new HistoryRelation(r.getId(), r.getVersion(), r.isVisible(), getCurrentUser(), 0, null, false); clone.setTags(r.getKeys()); @@ -791,6 +804,7 @@ } } + @Override public void visit(Way w) { clone = new HistoryWay(w.getId(), w.getVersion(), w.isVisible(), getCurrentUser(), 0, null, false); clone.setTags(w.getKeys()); Index: src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (working copy) @@ -46,6 +46,7 @@ } // Warning: The model pads with null-rows to match the size of the opposite table. 'value' could be null + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: src/org/openstreetmap/josm/gui/history/NodeListViewer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/NodeListViewer.java (working copy) @@ -201,6 +201,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "zoomin")); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; OsmPrimitive p = getPrimitiveToZoom(); @@ -247,6 +248,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "history")); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; run(); @@ -262,6 +264,7 @@ Main.worker.submit(new HistoryLoadTask().add(primitiveId)); } Runnable r = new Runnable() { + @Override public void run() { final History h = HistoryDataSet.getInstance().getHistory(primitiveId); if (h == null) Index: src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (working copy) @@ -75,6 +75,7 @@ } // Warning: The model pads with null-rows to match the size of the opposite table. 'value' could be null + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (working copy) @@ -25,6 +25,7 @@ model.addListSelectionListener(this); } + @Override public void valueChanged(ListSelectionEvent e) { DefaultListSelectionModel referenceModel = (DefaultListSelectionModel)e.getSource(); int i = referenceModel.getMinSelectionIndex(); Index: src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (working copy) @@ -74,6 +74,7 @@ setFont(font); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (working copy) @@ -132,6 +132,7 @@ build(); } + @Override public void update(Observable o, Object arg) { lblInfo.setText(getInfoText()); Index: src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 6083) +++ src/org/openstreetmap/josm/gui/history/VersionTable.java (working copy) @@ -81,6 +81,7 @@ return (HistoryBrowserModel.VersionTableModel) getModel(); } + @Override public void update(Observable o, Object arg) { repaint(); } @@ -163,6 +164,7 @@ public static class RadioButtonRenderer extends JRadioButton implements TableCellRenderer { + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) { setSelected(value != null && (Boolean)value); setHorizontalAlignment(SwingConstants.CENTER); @@ -195,6 +197,7 @@ return btn.isSelected(); } + @Override public void itemStateChanged(ItemEvent e) { fireEditingStopped(); } @@ -204,6 +207,7 @@ public AlignedRenderer(int hAlignment) { setHorizontalAlignment(hAlignment); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) { String v = value.toString(); setText(v); Index: src/org/openstreetmap/josm/gui/io/AbstractIOTask.java =================================================================== --- src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (working copy) @@ -87,6 +87,7 @@ /** * Runs the task */ + @Override public abstract void run(); /** Index: src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java =================================================================== --- src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (working copy) @@ -39,6 +39,7 @@ private CopyOnWriteArrayList listeners; private ActionListener al = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { fireEditingStopped(); } @@ -59,6 +60,7 @@ b.setPreferredSize(new Dimension(b.getPreferredSize().width, 19)); b.addActionListener(al); am.put(b.getText(), new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { b.setSelected(!b.isSelected()); fireEditingStopped(); @@ -84,11 +86,13 @@ } } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { updateCheckboxes(value); return this; } + @Override public void addCellEditorListener(CellEditorListener l) { if (l != null) { listeners.addIfAbsent(l); @@ -107,10 +111,12 @@ } } + @Override public void cancelCellEditing() { fireEditingCanceled(); } + @Override public Object getCellEditorValue() { boolean[] values = new boolean[2]; values[0] = checkBoxes[0].isSelected(); @@ -118,23 +124,28 @@ return values; } + @Override public boolean isCellEditable(EventObject anEvent) { return true; } + @Override public void removeCellEditorListener(CellEditorListener l) { listeners.remove(l); } + @Override public boolean shouldSelectCell(EventObject anEvent) { return true; } + @Override public boolean stopCellEditing() { fireEditingStopped(); return true; } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { updateCheckboxes(value); return this; Index: src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (working copy) @@ -59,6 +59,7 @@ hcbUploadComment.setPossibleItems(cmtHistory); hcbUploadComment.getEditor().addActionListener( new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { changesetCommentModel.setComment(hcbUploadComment.getText()); } @@ -100,13 +101,16 @@ hcbUploadComment.getEditor().addActionListener(handler); hcbUploadComment.getEditor().getEditorComponent().addKeyListener( new KeyListener() { + @Override public void keyTyped(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_TAB) { handler.actionPerformed(new ActionEvent(hcbUploadComment,0, "focusDown")); } } + @Override public void keyReleased(KeyEvent e) {} + @Override public void keyPressed(KeyEvent e) {} } ); @@ -150,6 +154,7 @@ * in sync with the current changeset comment */ class ChangesetCommentObserver implements Observer { + @Override public void update(Observable o, Object arg) { if (!(o instanceof ChangesetCommentModel)) return; String newComment = (String)arg; Index: src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (working copy) @@ -40,6 +40,7 @@ return sb.toString(); } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Changeset cs = (Changeset)value; Index: src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (working copy) @@ -221,14 +221,17 @@ /* ---------------------------------------------------------------------------- */ /* Interface ListDataListener */ /* ---------------------------------------------------------------------------- */ + @Override public void contentsChanged(ListDataEvent e) { refreshGUI(); } + @Override public void intervalAdded(ListDataEvent e) { refreshGUI(); } + @Override public void intervalRemoved(ListDataEvent e) { refreshGUI(); } @@ -239,6 +242,7 @@ * */ class ChangesetListItemStateListener implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem(); if (cs == null) return; @@ -254,6 +258,7 @@ * */ class CloseAfterUploadItemStateListener implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { if (e.getItemSelectable() != cbCloseAfterUpload) return; @@ -275,6 +280,7 @@ * */ class RadioButtonHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { if (rbUseNew.isSelected()) { cbOpenChangesets.setEnabled(false); @@ -303,6 +309,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); } + @Override public void actionPerformed(ActionEvent e) { DownloadOpenChangesetsTask task = new DownloadOpenChangesetsTask(ChangesetManagementPanel.this); Main.worker.submit(task); @@ -321,6 +328,7 @@ refreshEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem(); if (cs == null) return; @@ -336,6 +344,7 @@ ); } + @Override public void itemStateChanged(ItemEvent e) { refreshEnabledState(); } Index: src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (working copy) @@ -121,6 +121,7 @@ refreshEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { setCanceled(false); setVisible(false); @@ -130,6 +131,7 @@ setEnabled(lstOpenChangesets.getSelectedValues() != null && lstOpenChangesets.getSelectedValues().length > 0); } + @Override public void valueChanged(ListSelectionEvent e) { refreshEnabledState(); } @@ -148,6 +150,7 @@ setVisible(false); } + @Override public void actionPerformed(ActionEvent e) { cancel(); } Index: src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java =================================================================== --- src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (working copy) @@ -58,6 +58,7 @@ } SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { ChangesetCache.getInstance().update(closedChangesets); } Index: src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java =================================================================== --- src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (working copy) @@ -80,6 +80,7 @@ return; } GuiHelper.runInEDTAndWait(new Runnable() { + @Override public void run() { layer.mergeFrom(ds); AutoScaleAction.zoomTo(ds.allPrimitives()); Index: src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java (working copy) @@ -68,6 +68,7 @@ build(); } + @Override public void addCellEditorListener(CellEditorListener l) { if (l != null) { listeners.addIfAbsent(l); @@ -86,26 +87,32 @@ } } + @Override public void cancelCellEditing() { fireEditingCanceled(); } + @Override public Object getCellEditorValue() { return value; } + @Override public boolean isCellEditable(EventObject anEvent) { return true; } + @Override public void removeCellEditorListener(CellEditorListener l) { listeners.remove(l); } + @Override public boolean shouldSelectCell(EventObject anEvent) { return true; } + @Override public boolean stopCellEditing() { if (tfFileName.getText() == null || tfFileName.getText().trim().equals("")) { value = null; @@ -125,6 +132,7 @@ } } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { SaveLayerInfo info = (SaveLayerInfo)value; setInitialValue(info.getFile()); @@ -138,6 +146,7 @@ putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file")); } + @Override public void actionPerformed(ActionEvent e) { File f = SaveActionBase.createAndOpenSaveFileChooser(tr("Select filename"), "osm"); if (f != null) { Index: src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java =================================================================== --- src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (working copy) @@ -75,6 +75,7 @@ } /** renderer used while not editing the file path **/ + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { removeAll(); @@ -92,6 +93,7 @@ } /** renderer used while the file path is being edited **/ + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { removeAll(); @@ -177,6 +179,7 @@ return t; } + @Override public void addCellEditorListener(CellEditorListener l) { if (l != null) { listeners.addIfAbsent(l); @@ -195,26 +198,32 @@ } } + @Override public void cancelCellEditing() { fireEditingCanceled(); } + @Override public Object getCellEditorValue() { return value; } + @Override public boolean isCellEditable(EventObject anEvent) { return true; } + @Override public void removeCellEditorListener(CellEditorListener l) { listeners.remove(l); } + @Override public boolean shouldSelectCell(EventObject anEvent) { return true; } + @Override public boolean stopCellEditing() { if (tfFilename.getText() == null || tfFilename.getText().trim().equals("")) { value = null; @@ -231,6 +240,7 @@ putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file")); } + @Override public void actionPerformed(ActionEvent e) { File f = SaveActionBase.createAndOpenSaveFileChooser(tr("Select filename"), "osm"); if (f != null) { Index: src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (working copy) @@ -61,6 +61,7 @@ /* ------------------------------------------------------------------------------------ */ /* ChangesetCacheListener */ /* ------------------------------------------------------------------------------------ */ + @Override public void changesetCacheUpdated(ChangesetCacheEvent event) { refresh(); } Index: src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java =================================================================== --- src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (working copy) @@ -116,6 +116,7 @@ this.file = file; } + @Override public int compareTo(SaveLayerInfo o) { if (isDoSaveAndUpload()) { if (o.isDoSaveAndUpload()) Index: src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (working copy) @@ -324,6 +324,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { cancel(); } @@ -346,10 +347,12 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); } + @Override public void actionPerformed(ActionEvent e) { setUserAction(UserAction.PROCEED); closeDialog(); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { Mode mode = (Mode)evt.getNewValue(); @@ -404,12 +407,14 @@ } } + @Override public void actionPerformed(ActionEvent e) { if (! confirmSaveLayerInfosOK()) return; launchSafeAndUploadTask(); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { SaveLayersModel.Mode mode = (SaveLayersModel.Mode)evt.getNewValue(); @@ -549,6 +554,7 @@ ); } + @Override public void run() { model.setMode(SaveLayersModel.Mode.UPLOADING_AND_SAVING); List toUpload = model.getLayersToUpload(); Index: src/org/openstreetmap/josm/gui/io/SaveLayersModel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (working copy) @@ -64,6 +64,7 @@ Collections.sort( layerInfo, new Comparator() { + @Override public int compare(SaveLayerInfo o1, SaveLayerInfo o2) { return o1.compareTo(o2); } Index: src/org/openstreetmap/josm/gui/io/SaveLayersTable.java =================================================================== --- src/org/openstreetmap/josm/gui/io/SaveLayersTable.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/SaveLayersTable.java (working copy) @@ -18,6 +18,7 @@ super.getTableHeader().setReorderingAllowed(false); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { Mode mode = (Mode)evt.getNewValue(); Index: src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (working copy) @@ -30,6 +30,7 @@ needsSave.setPreferredSize(new Dimension(needsSave.getPreferredSize().width, 19)); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { JPanel panel = new JPanel(new GridBagLayout()); Index: src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (working copy) @@ -120,6 +120,7 @@ /* -------------------------------------------------------------------------- */ /* Interface TableChangeListener */ /* -------------------------------------------------------------------------- */ + @Override public void tableChanged(TableModelEvent e) { String uploadComment = getUploadComment(); changesetCommentModel.setComment(uploadComment); @@ -131,6 +132,7 @@ * */ class ChangesetCommentObserver implements Observer { + @Override public void update(Observable o, Object arg) { if (!(o instanceof ChangesetCommentModel)) return; String newValue = (String)arg; Index: src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (working copy) @@ -78,6 +78,7 @@ return; } GuiHelper.runInEDTAndWait(new Runnable() { + @Override public void run() { layer.mergeFrom(ds); layer.onPostDownloadFromServer(); Index: src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java (working copy) @@ -54,31 +54,37 @@ setVisible(false); } + @Override public void setCustomText(String message) { lblCustomText.setText(message); repaint(); } + @Override public void setIndeterminate(boolean indeterminate) { progressBar.setIndeterminate(indeterminate); repaint(); } + @Override public void setMaximum(int maximum) { progressBar.setMaximum(maximum); repaint(); } + @Override public void setTaskTitle(String taskTitle) { lblTaskTitle.setText(taskTitle); repaint(); } + @Override public void setValue(int value) { progressBar.setValue(value); repaint(); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { Mode mode = (Mode)evt.getNewValue(); Index: src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/UploadDialog.java (working copy) @@ -213,9 +213,11 @@ // pnlBasicUploadSettings.getUploadParameterSummaryPanel().setConfigurationParameterRequestListener( new ConfigurationParameterRequestHandler() { + @Override public void handleUploadStrategyConfigurationRequest() { tpConfigPanels.setSelectedIndex(3); } + @Override public void handleChangesetConfigurationRequest() { tpConfigPanels.setSelectedIndex(2); } @@ -224,6 +226,7 @@ pnlBasicUploadSettings.setUploadCommentDownFocusTraversalHandler( new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { btnUpload.requestFocusInWindow(); } @@ -439,6 +442,7 @@ ); } + @Override public void actionPerformed(ActionEvent e) { if (getUploadComment().trim().length() < 10) { if (warnUploadComment()) @@ -472,6 +476,7 @@ putValue(SHORT_DESCRIPTION, tr("Cancel the upload and resume editing")); } + @Override public void actionPerformed(ActionEvent e) { setCanceled(true); setVisible(false); @@ -505,6 +510,7 @@ /* -------------------------------------------------------------------------- */ /* Interface PropertyChangeListener */ /* -------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) { Changeset cs = (Changeset)evt.getNewValue(); @@ -519,6 +525,7 @@ /* -------------------------------------------------------------------------- */ /* Interface PreferenceChangedListener */ /* -------------------------------------------------------------------------- */ + @Override public void preferenceChanged(PreferenceChangeEvent e) { if (e.getKey() == null || ! e.getKey().equals("osm-server.url")) return; Index: src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (working copy) @@ -182,6 +182,7 @@ /* --------------------------------------------------------------------- */ /* Interface HyperlinkListener /* --------------------------------------------------------------------- */ + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { if (e.getDescription() == null || configHandler == null) @@ -197,6 +198,7 @@ /* --------------------------------------------------------------------- */ /* Interface PropertyChangeListener /* --------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) { selectedChangeset = (Changeset)evt.getNewValue(); Index: src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (working copy) @@ -220,6 +220,7 @@ // partially uploaded. Better run on EDT. // Runnable r = new Runnable() { + @Override public void run() { layer.cleanupAfterUpload(processedPrimitives); layer.onPostUploadToServer(); @@ -317,6 +318,7 @@ // - to the Upload Dialog // - to map editing GuiHelper.runInEDT(new Runnable() { + @Override public void run() { // if the changeset is still open after this upload we want it to // be selected on the next upload Index: src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (working copy) @@ -209,6 +209,7 @@ data, new Comparator() { private DefaultNameFormatter formatter = DefaultNameFormatter.getInstance(); + @Override public int compare(OsmPrimitive o1, OsmPrimitive o2) { int ret = OsmPrimitiveType.from(o1).compareTo(OsmPrimitiveType.from(o2)); if (ret != 0) return ret; @@ -232,12 +233,14 @@ } } + @Override public Object getElementAt(int index) { if (data == null) return null; return data.get(index); } + @Override public int getSize() { if (data == null) return 0; @@ -269,6 +272,7 @@ setEnabled(true); } + @Override public void actionPerformed(ActionEvent e) { setCanceled(true); setVisible(false); @@ -283,6 +287,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { setCanceled(false); setVisible(false); @@ -293,6 +298,7 @@ || lstDeletedPrimitives.getSelectedIndex() >= 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } Index: src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (working copy) @@ -373,6 +373,7 @@ tfChunkSize.requestFocusInWindow(); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(UploadedObjectsSummaryPanel.NUM_OBJECTS_TO_UPLOAD_PROP)) { setNumUploadedObjects((Integer)evt.getNewValue()); @@ -380,6 +381,7 @@ } static class TextFieldFocusHandler implements FocusListener { + @Override public void focusGained(FocusEvent e) { Component c = e.getComponent(); if (c instanceof JosmTextField) { @@ -387,6 +389,7 @@ tf.selectAll(); } } + @Override public void focusLost(FocusEvent e) {} } @@ -425,18 +428,22 @@ } } + @Override public void changedUpdate(DocumentEvent arg0) { valiateChunkSize(); } + @Override public void insertUpdate(DocumentEvent arg0) { valiateChunkSize(); } + @Override public void removeUpdate(DocumentEvent arg0) { valiateChunkSize(); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getSource() == tfChunkSize && evt.getPropertyName().equals("enabled") @@ -453,6 +460,7 @@ firePropertyChange(UPLOAD_STRATEGY_SPECIFICATION_PROP, null, getUploadStrategySpecification()); } + @Override public void itemStateChanged(ItemEvent e) { UploadStrategy strategy = getUploadStrategy(); if (strategy == null) return; @@ -467,12 +475,15 @@ notifyStrategy(); } + @Override public void focusGained(FocusEvent arg0) {} + @Override public void focusLost(FocusEvent arg0) { notifyStrategy(); } + @Override public void actionPerformed(ActionEvent arg0) { notifyStrategy(); } Index: src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (working copy) @@ -173,11 +173,13 @@ fireContentsChanged(this,0,getSize()); } + @Override public Object getElementAt(int index) { if (primitives == null) return null; return primitives.get(index); } + @Override public int getSize() { if (primitives == null) return 0; return primitives.size(); Index: src/org/openstreetmap/josm/gui/layer/Layer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/Layer.java (working copy) @@ -378,6 +378,7 @@ this.layer = layer; } + @Override public void actionPerformed(ActionEvent e) { SaveAction.getInstance().doSave(layer); } @@ -393,6 +394,7 @@ this.layer = layer; } + @Override public void actionPerformed(ActionEvent e) { SaveAsAction.getInstance().doSave(layer); } @@ -408,6 +410,7 @@ this.layer = layer; } + @Override public void actionPerformed(ActionEvent e) { new GpxExportAction().export(layer); } Index: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (working copy) @@ -137,6 +137,7 @@ public int deletedWays; public int deletedRelations; + @Override public void visit(final Node n) { nodes++; if (n.isDeleted()) { @@ -144,6 +145,7 @@ } } + @Override public void visit(final Way w) { ways++; if (w.isDeleted()) { @@ -151,6 +153,7 @@ } } + @Override public void visit(final Relation r) { relations++; if (r.isDeleted()) { @@ -597,6 +600,7 @@ super(tr("Convert to GPX layer"), ImageProvider.get("converttogpx")); putValue("help", ht("/Action/ConvertToGpxLayer")); } + @Override public void actionPerformed(ActionEvent e) { Main.main.addLayer(new GpxLayer(toGpxData(), tr("Converted from: {0}", getName()))); Main.main.removeLayer(OsmDataLayer.this); @@ -693,6 +697,7 @@ super(tr("Dataset consistency test")); } + @Override public void actionPerformed(ActionEvent e) { String result = DatasetConsistencyTest.runTests(data); if (result.length() == 0) { @@ -715,12 +720,14 @@ DataSet.removeSelectionListener(this); } + @Override public void processDatasetEvent(AbstractDatasetChangedEvent event) { isChanged = true; setRequiresSaveToFile(true); setRequiresUploadToServer(true); } + @Override public void selectionChanged(Collection newSelection) { isChanged = true; } Index: src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (working copy) @@ -133,6 +133,7 @@ */ private class LoadGpxDataActionListener implements ActionListener { + @Override public void actionPerformed(ActionEvent arg0) { FileFilter filter = new FileFilter(){ @Override public boolean accept(File f) { @@ -228,6 +229,7 @@ ImageDisplay imgDisp; JList imgList; + @Override public void actionPerformed(ActionEvent arg0) { SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); @@ -328,10 +330,12 @@ panelLst.setLayout(new BorderLayout()); imgList = new JList(new AbstractListModel() { + @Override public Object getElementAt(int i) { return yLayer.data.get(i).getFile().getName(); } + @Override public int getSize() { return yLayer.data.size(); } @@ -339,6 +343,7 @@ imgList.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); imgList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent arg0) { int index = imgList.getSelectedIndex(); Integer orientation = null; @@ -367,6 +372,7 @@ JButton openButton = new JButton(tr("Open another photo")); openButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent arg0) { JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null, JpegFileFilter.getInstance(), JFileChooser.FILES_ONLY, "geoimage.lastdirectory"); if (fc == null) @@ -440,6 +446,7 @@ } } + @Override public void actionPerformed(ActionEvent arg0) { // Construct the list of loaded GPX tracks Collection layerLst = Main.map.mapView.getAllLayers(); @@ -770,17 +777,22 @@ this.doRepaint = doRepaint; } + @Override public void insertUpdate(DocumentEvent ev) { updateStatusBar(); } + @Override public void removeUpdate(DocumentEvent ev) { updateStatusBar(); } + @Override public void changedUpdate(DocumentEvent ev) { } + @Override public void itemStateChanged(ItemEvent e) { updateStatusBar(); } + @Override public void actionPerformed(ActionEvent e) { updateStatusBar(); } @@ -828,9 +840,11 @@ RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(); private class RepaintTheMapListener implements FocusListener { + @Override public void focusGained(FocusEvent e) { // do nothing } + @Override public void focusLost(FocusEvent e) { yLayer.updateBufferAndRepaint(); } @@ -841,6 +855,7 @@ */ private class AdjustActionListener implements ActionListener { + @Override public void actionPerformed(ActionEvent arg0) { long diff = delta + Math.round(timezone*60*60); @@ -891,6 +906,7 @@ // This is called whenever one of the sliders is moved. // It updates the labels and also calls the "match photos" code class sliderListener implements ChangeListener { + @Override public void stateChanged(ChangeEvent e) { // parse slider position into real timezone double tz = Math.abs(sldTimezone.getValue()); @@ -974,6 +990,7 @@ private class AutoGuessActionListener implements ActionListener { + @Override public void actionPerformed(ActionEvent arg0) { GpxDataWrapper gpxW = selectedGPX(true); if (gpxW == null) @@ -1095,6 +1112,7 @@ } Collections.sort(dateImgLst, new Comparator() { + @Override public int compare(ImageEntry arg0, ImageEntry arg1) { return arg0.getExifTime().compareTo(arg1.getExifTime()); } Index: src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (working copy) @@ -763,6 +763,7 @@ }; mapModeListener = new MapModeChangeListener() { + @Override public void mapModeChange(MapMode oldMapMode, MapMode newMapMode) { if (newMapMode == null || (newMapMode instanceof org.openstreetmap.josm.actions.mapmode.SelectAction)) { Main.map.mapView.addMouseListener(mouseAdapter); @@ -776,6 +777,7 @@ mapModeListener.mapModeChange(null, Main.map.mapMode); MapView.addLayerChangeListener(new LayerChangeListener() { + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { if (newLayer == GeoImageLayer.this) { // only in select mode it is possible to click the images @@ -783,9 +785,11 @@ } } + @Override public void layerAdded(Layer newLayer) { } + @Override public void layerRemoved(Layer oldLayer) { if (oldLayer == GeoImageLayer.this) { if (thumbsloader != null) { @@ -809,6 +813,7 @@ } } + @Override public void propertyChange(PropertyChangeEvent evt) { if (NavigatableComponent.PROPNAME_CENTER.equals(evt.getPropertyName()) || NavigatableComponent.PROPNAME_SCALE.equals(evt.getPropertyName())) { updateOffscreenBuffer = true; @@ -842,10 +847,12 @@ return gpxLayer; } + @Override public void jumpToNextMarker() { showNextPhoto(); } + @Override public void jumpToPreviousMarker() { showPreviousPhoto(); } Index: src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (working copy) @@ -66,6 +66,7 @@ this.orientation = orientation == null ? -1 : orientation; } + @Override public void run() { Image img = Toolkit.getDefaultToolkit().createImage(file.getPath()); tracker.addImage(img, 1); @@ -159,6 +160,7 @@ /** Zoom in and out, trying to preserve the point of the image that was under the mouse cursor * at the same place */ + @Override public void mouseWheelMoved(MouseWheelEvent e) { File file; Image image; @@ -231,6 +233,7 @@ } /** Center the display on the point that has been clicked */ + @Override public void mouseClicked(MouseEvent e) { // Move the center to the clicked point. File file; @@ -268,6 +271,7 @@ /** Initialize the dragging, either with button 1 (simple dragging) or button 3 (selection of * a picture part) */ + @Override public void mousePressed(MouseEvent e) { if (image == null) { mouseIsDragging = false; @@ -302,6 +306,7 @@ } } + @Override public void mouseDragged(MouseEvent e) { if (! mouseIsDragging && selectedRect == null) return; @@ -350,6 +355,7 @@ } + @Override public void mouseReleased(MouseEvent e) { if (! mouseIsDragging && selectedRect == null) return; @@ -413,12 +419,15 @@ } } + @Override public void mouseEntered(MouseEvent e) { } + @Override public void mouseExited(MouseEvent e) { } + @Override public void mouseMoved(MouseEvent e) { } Index: src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (working copy) @@ -135,6 +135,7 @@ return (ImageEntry) c; } + @Override public int compareTo(ImageEntry image) { if (exifTime != null && image.exifTime != null) return exifTime.compareTo(image.exifTime); Index: src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (working copy) @@ -167,6 +167,7 @@ putValue(SMALL_ICON, icon); } + @Override public void actionPerformed(ActionEvent e) { if (COMMAND_NEXT.equals(action)) { if (currentLayer != null) { Index: src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (working copy) @@ -34,6 +34,7 @@ } } + @Override public void run() { System.err.println("Load Thumbnails"); tracker = new MediaTracker(Main.map.mapView); Index: src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (working copy) @@ -42,6 +42,7 @@ this.data = data; } + @Override public void actionPerformed(ActionEvent e) { final List points = new ArrayList(); for (GpxTrack trk : data.tracks) { Index: src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (working copy) @@ -54,6 +54,7 @@ p2.add(scale); p.add(p2, BorderLayout.SOUTH); scale.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent ev) { p.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); if (scale.getModel().isSelected()) { Index: src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (working copy) @@ -342,6 +342,7 @@ return ret; } + @Override public void jumpToNextMarker() { if (currentMarker == null) { currentMarker = data.get(0); @@ -359,6 +360,7 @@ Main.map.mapView.zoomTo(currentMarker.getEastNorth()); } + @Override public void jumpToPreviousMarker() { if (currentMarker == null) { currentMarker = data.get(data.size() - 1); @@ -461,6 +463,7 @@ } + @Override public void actionPerformed(ActionEvent e) { Main.pref.put("marker.show "+layer.getName(), layer.isTextOrIconShown() ? "hide" : "show"); Main.map.mapView.repaint(); Index: src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6083) +++ src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (working copy) @@ -286,6 +286,7 @@ if (timer == null) { animationInterval = Main.pref.getDouble("marker.audioanimationinterval", 1.0); //milliseconds timer = new Timer((int)(animationInterval * 1000.0), new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { timerAction(); } Index: src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6083) +++ src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (working copy) @@ -50,6 +50,7 @@ super(entry); } + @Override protected void init() { super.init(); icons.clear(); @@ -89,6 +90,7 @@ } } + @Override public InputStream getSourceInputStream() throws IOException { MirroredInputStream in = new MirroredInputStream(url); InputStream zip = in.getZipEntry("xml", "style"); Index: src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (working copy) @@ -280,6 +280,7 @@ class UseDefaultItemListener implements ItemListener { private boolean enabled; + @Override public void itemStateChanged(ItemEvent e) { if (!enabled) return; switch (e.getStateChange()) { Index: src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 6083) +++ src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (working copy) @@ -75,6 +75,7 @@ } } + @Override public Component getListCellRendererComponent(JList list, Object value, int idx, boolean isSelected, boolean hasFocus) { AuthorizationProcedure procedure = (AuthorizationProcedure)value; renderColors(isSelected); Index: src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 6083) +++ src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (working copy) @@ -339,6 +339,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent evt) { Main.worker.submit(new FullyAutomaticAuthorisationTask(FullyAutomaticAuthorizationUI.this)); } @@ -347,14 +348,17 @@ setEnabled(valPassword.isValid() && valUserName.isValid()); } + @Override public void changedUpdate(DocumentEvent e) { updateEnabledState(); } + @Override public void insertUpdate(DocumentEvent e) { updateEnabledState(); } + @Override public void removeUpdate(DocumentEvent e) { updateEnabledState(); } @@ -370,6 +374,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous")); } + @Override public void actionPerformed(ActionEvent arg0) { prepareUIForEnteringRequest(); } @@ -385,6 +390,7 @@ putValue(SMALL_ICON, ImageProvider.get("about")); } + @Override public void actionPerformed(ActionEvent arg0) { Main.worker.submit(new TestAccessTokenTask( FullyAutomaticAuthorizationUI.this, @@ -510,6 +516,7 @@ protected void handleException(final OsmOAuthAuthorizationException e) { Runnable r = new Runnable() { + @Override public void run() { if (e instanceof OsmLoginFailedException) { alertLoginFailed((OsmLoginFailedException)e); @@ -549,6 +556,7 @@ getProgressMonitor().worked(1); if (canceled)return; GuiHelper.runInEDT(new Runnable() { + @Override public void run() { prepareUIForResultDisplay(); setAccessToken(accessToken); Index: src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6083) +++ src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (working copy) @@ -224,14 +224,17 @@ setAccessToken(new OAuthToken(tfAccessTokenKey.getText().trim(), tfAccessTokenSecret.getText().trim())); } } + @Override public void changedUpdate(DocumentEvent e) { build(); } + @Override public void insertUpdate(DocumentEvent e) { build(); } + @Override public void removeUpdate(DocumentEvent e) { build(); } @@ -248,6 +251,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent evt) { TestAccessTokenTask task = new TestAccessTokenTask( ManualAuthorizationUI.this, @@ -262,6 +266,7 @@ setEnabled(hasAccessToken()); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (! evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP)) return; Index: src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 6083) +++ src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (working copy) @@ -175,15 +175,19 @@ spAuthorisationProcedureUI.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); spAuthorisationProcedureUI.getVerticalScrollBar().addComponentListener( new ComponentListener() { + @Override public void componentShown(ComponentEvent e) { spAuthorisationProcedureUI.setBorder(UIManager.getBorder("ScrollPane.border")); } + @Override public void componentHidden(ComponentEvent e) { spAuthorisationProcedureUI.setBorder(null); } + @Override public void componentResized(ComponentEvent e) {} + @Override public void componentMoved(ComponentEvent e) {} } ); @@ -305,6 +309,7 @@ } class AuthorisationProcedureChangeListener implements ItemListener { + @Override public void itemStateChanged(ItemEvent arg0) { refreshAuthorisationProcedurePanel(); } @@ -322,6 +327,7 @@ setVisible(false); } + @Override public void actionPerformed(ActionEvent evt) { cancel(); } @@ -337,6 +343,7 @@ updateEnabledState(null); } + @Override public void actionPerformed(ActionEvent evt) { setCanceled(false); setVisible(false); @@ -346,6 +353,7 @@ setEnabled(token != null); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (!evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP)) return; @@ -362,6 +370,7 @@ } static class ExternalBrowserLauncher implements HyperlinkListener { + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) { OpenBrowser.displayUrl(e.getDescription()); Index: src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 6083) +++ src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (working copy) @@ -127,6 +127,7 @@ cbShowAdvancedParameters.setSelected(false); cbShowAdvancedParameters.addItemListener( new ItemListener() { + @Override public void itemStateChanged(ItemEvent evt) { getAdvancedPropertiesPanel().setVisible(evt.getStateChange() == ItemEvent.SELECTED); } @@ -284,6 +285,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous")); } + @Override public void actionPerformed(ActionEvent arg0) { transitionToRetrieveRequestToken(); } @@ -358,6 +360,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous")); } + @Override public void actionPerformed(ActionEvent arg0) { transitionToRetrieveRequestToken(); } @@ -379,6 +382,7 @@ putValue(SHORT_DESCRIPTION, tr("Click to retrieve a Request Token")); } + @Override public void actionPerformed(ActionEvent evt) { final RetrieveRequestTokenTask task = new RetrieveRequestTokenTask( SemiAutomaticAuthorizationUI.this, @@ -386,11 +390,13 @@ ); Main.worker.submit(task); Runnable r = new Runnable() { + @Override public void run() { if (task.isCanceled()) return; if (task.getRequestToken() == null) return; requestToken = task.getRequestToken(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { transitionToRetrieveAccessToken(); } @@ -412,6 +418,7 @@ putValue(SHORT_DESCRIPTION, tr("Click to retrieve an Access Token")); } + @Override public void actionPerformed(ActionEvent evt) { final RetrieveAccessTokenTask task = new RetrieveAccessTokenTask( SemiAutomaticAuthorizationUI.this, @@ -420,11 +427,13 @@ ); Main.worker.submit(task); Runnable r = new Runnable() { + @Override public void run() { if (task.isCanceled()) return; if (task.getAccessToken() == null) return; setAccessToken(task.getAccessToken()); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { transitionToShowAccessToken(); } @@ -446,6 +455,7 @@ putValue(SHORT_DESCRIPTION, tr("Click to test the Access Token")); } + @Override public void actionPerformed(ActionEvent evt) { TestAccessTokenTask task = new TestAccessTokenTask( SemiAutomaticAuthorizationUI.this, Index: src/org/openstreetmap/josm/gui/preferences/AudioPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (working copy) @@ -29,6 +29,7 @@ public class AudioPreference extends DefaultTabPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new AudioPreference(); } @@ -54,6 +55,7 @@ private JosmTextField audioFastForwardMultiplier = new JosmTextField(8); private JosmTextField audioCalibration = new JosmTextField(8); + @Override public void addGui(PreferenceTabbedPane gui) { JPanel audio = new JPanel(new GridBagLayout()); @@ -124,6 +126,7 @@ createPreferenceTabWithScrollPane(gui, audio); } + @Override public boolean ok() { Main.pref.put("audio.menuinvisible", ! audioMenuVisible.isSelected()); Main.pref.put("marker.traceaudio", markerAudioTraceVisible.isSelected()); Index: src/org/openstreetmap/josm/gui/preferences/PluginPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (working copy) @@ -55,6 +55,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new PluginPreference(); } @@ -170,6 +171,7 @@ return pane; } + @Override public void addGui(final PreferenceTabbedPane gui) { GridBagConstraints gc = new GridBagConstraints(); gc.weightx = 1.0; @@ -224,6 +226,7 @@ return model != null ? model.getPluginsScheduledForUpdateOrDownload() : null; } + @Override public boolean ok() { if (! pluginPreferencesActivated) return false; @@ -246,9 +249,11 @@ public void readLocalPluginInformation() { final ReadLocalPluginInformationTask task = new ReadLocalPluginInformationTask(); Runnable r = new Runnable() { + @Override public void run() { if (task.isCanceled()) return; SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { model.setAvailablePlugins(task.getAvailablePlugins()); pnlPluginPreferences.refreshView(); @@ -272,12 +277,15 @@ putValue(SMALL_ICON, ImageProvider.get("download")); } + @Override public void actionPerformed(ActionEvent e) { final ReadRemotePluginInformationTask task = new ReadRemotePluginInformationTask(Main.pref.getPluginSites()); Runnable continuation = new Runnable() { + @Override public void run() { if (task.isCanceled()) return; SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { model.updateAvailablePlugins(task.getAvailablePlugins()); pnlPluginPreferences.refreshView(); @@ -329,6 +337,7 @@ protected void alertNothingToUpdate() { try { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { HelpAwareOptionPane.showOptionDialog( pnlPluginPreferences, @@ -344,6 +353,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { final List toUpdate = model.getSelectedPlugins(); // the async task for downloading plugins @@ -358,6 +368,7 @@ // to be run asynchronously after the plugin download // final Runnable pluginDownloadContinuation = new Runnable() { + @Override public void run() { if (pluginDownloadTask.isCanceled()) return; @@ -375,6 +386,7 @@ // to be run asynchronously after the plugin list download // final Runnable pluginInfoDownloadContinuation = new Runnable() { + @Override public void run() { if (pluginInfoDownloadTask.isCanceled()) return; @@ -415,6 +427,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "settings")); } + @Override public void actionPerformed(ActionEvent e) { configureSites(); } @@ -434,14 +447,17 @@ pnlPluginPreferences.refreshView(); } + @Override public void changedUpdate(DocumentEvent arg0) { filter(); } + @Override public void insertUpdate(DocumentEvent arg0) { filter(); } + @Override public void removeUpdate(DocumentEvent arg0) { filter(); } @@ -462,6 +478,7 @@ add(new JScrollPane(list), GBC.std().fill()); JPanel buttons = new JPanel(new GridBagLayout()); buttons.add(new JButton(new AbstractAction(tr("Add")){ + @Override public void actionPerformed(ActionEvent e) { String s = JOptionPane.showInputDialog( JOptionPane.getFrameForComponent(PluginConfigurationSitesPanel.this), @@ -475,6 +492,7 @@ } }), GBC.eol().fill(GBC.HORIZONTAL)); buttons.add(new JButton(new AbstractAction(tr("Edit")){ + @Override public void actionPerformed(ActionEvent e) { if (list.getSelectedValue() == null) { JOptionPane.showMessageDialog( @@ -500,6 +518,7 @@ } }), GBC.eol().fill(GBC.HORIZONTAL)); buttons.add(new JButton(new AbstractAction(tr("Delete")){ + @Override public void actionPerformed(ActionEvent event) { if (list.getSelectedValue() == null) { JOptionPane.showMessageDialog( Index: src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (working copy) @@ -47,6 +47,7 @@ JCheckBox expert = new JCheckBox(tr("Expert mode")); expert.setSelected(ExpertToggleAction.isExpert()); expert.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ExpertToggleAction.getInstance().actionPerformed(null); } @@ -151,6 +152,7 @@ tpPreferences.validationListeners.clear(); } + @Override public void actionPerformed(ActionEvent evt) { cancel(); } @@ -163,6 +165,7 @@ putValue(SHORT_DESCRIPTION, tr("Save the preferences and close the dialog")); } + @Override public void actionPerformed(ActionEvent evt) { for (ValidationListener listener: tpPreferences.validationListeners) { if (!listener.validatePreferences()) Index: src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (working copy) @@ -266,6 +266,7 @@ // this is the task which will run *after* the plugins are downloaded // final Runnable continuation = new Runnable() { + @Override public void run() { boolean requiresRestart = false; if (task != null && !task.isCanceled()) { @@ -331,6 +332,7 @@ Main.worker.submit(task); Main.worker.submit( new Runnable() { + @Override public void run() { SwingUtilities.invokeLater(continuation); } @@ -470,6 +472,7 @@ * This mouse wheel listener reacts when a scroll is carried out over the * tab strip and scrolls one tab/down or up, selecting it immediately. */ + @Override public void mouseWheelMoved(MouseWheelEvent wev) { // Ensure the cursor is over the tab strip if(super.indexAtLocation(wev.getPoint().x, wev.getPoint().y) < 0) Index: src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (working copy) @@ -20,6 +20,7 @@ public class ServerAccessPreference extends DefaultTabPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new ServerAccessPreference(); } @@ -105,6 +106,7 @@ return pnl; } + @Override public void addGui(PreferenceTabbedPane gui) { GridBagConstraints gc = new GridBagConstraints(); gc.fill = GridBagConstraints.BOTH; @@ -128,6 +130,7 @@ /** * Saves the values to the preferences */ + @Override public boolean ok() { pnlApiUrlPreferences.saveToPreferences(); pnlAuthPreferences.saveToPreferences(); Index: src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (working copy) @@ -483,10 +483,12 @@ this.data = new ArrayList(); } + @Override public int getColumnCount() { return isMapPaint ? 2 : 1; } + @Override public int getRowCount() { return data == null ? 0 : data.size(); } @@ -747,6 +749,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { FileFilter ff; if (isMapPaint) { @@ -787,6 +790,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); } + @Override public void actionPerformed(ActionEvent evt) { EditSourceEntryDialog editEntryDialog = new EditSourceEntryDialog( SourceEditor.this, @@ -819,10 +823,12 @@ setEnabled(tblActiveSources.getSelectedRowCount() > 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { activeSourcesModel.removeSelected(); } @@ -840,10 +846,12 @@ setEnabled(tblActiveSources.getSelectedRowCount() == 1); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent evt) { int pos = tblActiveSources.getSelectedRow(); if (pos < 0 || pos >= tblActiveSources.getRowCount()) @@ -891,10 +899,12 @@ activeSourcesModel.move(increment); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void tableChanged(TableModelEvent e) { updateEnabledState(); } @@ -911,10 +921,12 @@ setEnabled(lstAvailableSources.getSelectedIndices().length > 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { List sources = availableSourcesModel.getSelected(); int josmVersion = Version.getInstance().getVersion(); @@ -960,6 +972,7 @@ putValue(SMALL_ICON, ImageProvider.get("preferences", "reset")); } + @Override public void actionPerformed(ActionEvent e) { activeSourcesModel.setActiveSources(getDefault()); } @@ -976,6 +989,7 @@ this.sourceProviders = sourceProviders; } + @Override public void actionPerformed(ActionEvent e) { MirroredInputStream.cleanup(url); reloadAvailableSources(url, sourceProviders); @@ -991,14 +1005,17 @@ this.data = new ArrayList(); } + @Override public int getColumnCount() { return 1; } + @Override public int getRowCount() { return data == null ? 0 : data.size(); } + @Override public Object getValueAt(int rowIndex, int columnIndex) { return data.get(rowIndex); } @@ -1063,6 +1080,7 @@ Collections.sort( data, new Comparator() { + @Override public int compare(String o1, String o2) { if (o1.equals("") && o2.equals("")) return 0; @@ -1086,6 +1104,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); } + @Override public void actionPerformed(ActionEvent e) { iconPathsModel.addPath(""); tblIconPaths.editCellAt(iconPathsModel.getRowCount() -1,0); @@ -1104,10 +1123,12 @@ setEnabled(tblIconPaths.getSelectedRowCount() > 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { iconPathsModel.removeSelected(); } @@ -1125,10 +1146,12 @@ setEnabled(tblIconPaths.getSelectedRowCount() == 1); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { int row = tblIconPaths.getSelectedRow(); tblIconPaths.editCellAt(row, 0); @@ -1136,6 +1159,7 @@ } static class SourceEntryListCellRenderer extends JLabel implements ListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { String s = value.toString(); @@ -1357,6 +1381,7 @@ build(); } + @Override public void addCellEditorListener(CellEditorListener l) { if (l != null) { listeners.addIfAbsent(l); @@ -1375,28 +1400,34 @@ } } + @Override public void cancelCellEditing() { fireEditingCanceled(); } + @Override public Object getCellEditorValue() { return value; } + @Override public boolean isCellEditable(EventObject anEvent) { if (anEvent instanceof MouseEvent) return ((MouseEvent)anEvent).getClickCount() >= 2; return true; } + @Override public void removeCellEditorListener(CellEditorListener l) { listeners.remove(l); } + @Override public boolean shouldSelectCell(EventObject anEvent) { return true; } + @Override public boolean stopCellEditing() { value = tfFileName.getText(); fireEditingStopped(); @@ -1412,6 +1443,7 @@ } } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { setInitialValue((String)value); tfFileName.selectAll(); @@ -1450,6 +1482,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { JFileChooserManager fcm = new JFileChooserManager(true).createFileChooser(); if (!isFile) { Index: src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java (working copy) @@ -95,6 +95,7 @@ testPanel.add(prefOtherUpload, GBC.eol()); ActionListener otherUploadEnabled = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { prefOtherUpload.setEnabled(prefOther.isSelected()); } Index: src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (working copy) @@ -104,10 +104,12 @@ } class EntryListModel extends AbstractListModel { + @Override public Object getElementAt(int index) { return (index+1) + ": " + data.get(index).toString(); } + @Override public int getSize() { return data.size(); } @@ -130,6 +132,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); } + @Override public void actionPerformed(ActionEvent evt) { entryModel.add(new ArrayList()); } @@ -147,10 +150,12 @@ setEnabled(entryList.getSelectedIndices().length == 1); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { int idx = entryList.getSelectedIndices()[0]; entryModel.remove(idx); @@ -158,6 +163,7 @@ } class EntryListener implements ListSelectionListener { + @Override public void valueChanged(ListSelectionEvent e) { TableCellEditor editor = table.getCellEditor(); if (editor != null) { Index: src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (working copy) @@ -126,10 +126,12 @@ } class EntryListModel extends AbstractListModel { + @Override public Object getElementAt(int index) { return tr("Entry {0}", index+1); } + @Override public int getSize() { return dataKeys.size(); } @@ -154,6 +156,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); } + @Override public void actionPerformed(ActionEvent evt) { entryModel.add(); } @@ -171,10 +174,12 @@ setEnabled(entryList.getSelectedIndices().length == 1); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { int idx = entryList.getSelectedIndices()[0]; entryModel.remove(idx); @@ -182,6 +187,7 @@ } class EntryListener implements ListSelectionListener { + @Override public void valueChanged(ListSelectionEvent e) { TableCellEditor editor = table.getCellEditor(); if (editor != null) { Index: src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (working copy) @@ -51,6 +51,7 @@ public class ColorPreference implements SubPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new ColorPreference(); } @@ -140,12 +141,14 @@ return Main.pref.getColorName(o); } + @Override public void addGui(final PreferenceTabbedPane gui) { fixColorPrefixes(); setColorModel(Main.pref.getAllColors()); colorEdit = new JButton(tr("Choose")); colorEdit.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { int sel = colors.getSelectedRow(); JColorChooser chooser = new JColorChooser((Color)colors.getValueAt(sel, 1)); @@ -161,6 +164,7 @@ }); defaultSet = new JButton(tr("Set to default")); defaultSet.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { int sel = colors.getSelectedRow(); String name = (String)colors.getValueAt(sel, 0); @@ -172,6 +176,7 @@ }); JButton defaultAll = new JButton(tr("Set all to default")); defaultAll.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { for(int i = 0; i < colors.getRowCount(); ++i) { @@ -185,6 +190,7 @@ }); remove = new JButton(tr("Remove")); remove.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { int sel = colors.getSelectedRow(); del.add((String)colors.getValueAt(sel, 0)); @@ -210,6 +216,7 @@ colors.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); final TableCellRenderer oldColorsRenderer = colors.getDefaultRenderer(Object.class); colors.setDefaultRenderer(Object.class, new TableCellRenderer(){ + @Override public Component getTableCellRendererComponent(JTable t, Object o, boolean selected, boolean focus, int row, int column) { if (o == null) return new JLabel(); @@ -261,6 +268,7 @@ ConflictDialog.getColor(); } + @Override public boolean ok() { Boolean ret = false; for(String d : del) { Index: src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java (working copy) @@ -13,6 +13,7 @@ public class DisplayPreference extends DefaultTabPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new DisplayPreference(); } Index: src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (working copy) @@ -26,6 +26,7 @@ public class DrawingPreference implements SubPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new DrawingPreference(); } @@ -47,6 +48,7 @@ private JCheckBox useWireframeAntialiasing = new JCheckBox(tr("Smooth map graphics in wireframe mode (antialiasing)")); private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas")); + @Override public void addGui(PreferenceTabbedPane gui) { //gui.display.setPreferredSize(new Dimension(400,600)); gpxPanel = new GPXSettingsPanel(); @@ -61,6 +63,7 @@ // directionHint directionHint.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { if (directionHint.isSelected()){ headArrow.setSelected(Main.pref.getBoolean("draw.segment.head_only", false)); @@ -154,6 +157,7 @@ gui.getDisplayPreference().addSubTab(this, tr("OSM Data"), scrollpane); } + @Override public boolean ok() { gpxPanel.savePreferences(); Main.pref.put("draw.data.area_outline_only", outlineOnly.isSelected()); Index: src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (working copy) @@ -127,6 +127,7 @@ ExpertToggleAction.addVisibilitySwitcher(drawRawGpsLinesAll); drawRawGpsLinesActionListener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { boolean f=drawRawGpsLinesNone.isSelected()||drawRawGpsLinesGlobal.isSelected(); forceRawGpsLines.setEnabled(!f); @@ -166,6 +167,7 @@ // drawGpsArrows drawGpsArrows.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { drawGpsArrowsFast.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled()); drawGpsArrowsMinDist.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled()); @@ -215,12 +217,14 @@ colorGroup.add(colorTypeTime); colorTypeVelocity.addChangeListener(new ChangeListener(){ + @Override public void stateChanged(ChangeEvent e) { colorTypeVelocityTune.setEnabled(colorTypeVelocity.isSelected()); colorDynamic.setEnabled(colorTypeVelocity.isSelected() || colorTypeDilution.isSelected()); } }); colorTypeDilution.addChangeListener(new ChangeListener(){ + @Override public void stateChanged(ChangeEvent e) { colorDynamic.setEnabled(colorTypeVelocity.isSelected() || colorTypeDilution.isSelected()); } Index: src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (working copy) @@ -31,6 +31,7 @@ public class LafPreference implements SubPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new LafPreference(); } @@ -47,6 +48,7 @@ private JCheckBox modeless = new JCheckBox(tr("Modeless working (Potlatch style)")); private JCheckBox dynamicButtons = new JCheckBox(tr("Dynamic buttons in side menus")); + @Override public void addGui(PreferenceTabbedPane gui) { lafCombo = new JosmComboBox(UIManager.getInstalledLookAndFeels()); @@ -118,6 +120,7 @@ gui.getDisplayPreference().addSubTab(this, tr("Look and Feel"), scrollpane); } + @Override public boolean ok() { boolean mod = false; Main.pref.put("draw.splashscreen", showSplashScreen.isSelected()); Index: src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (working copy) @@ -29,6 +29,7 @@ public class LanguagePreference implements SubPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new LanguagePreference(); } @@ -39,6 +40,7 @@ /** the model for the combo box */ private LanguageComboBoxModel model; + @Override public void addGui(final PreferenceTabbedPane gui) { model = new LanguageComboBoxModel(); // Selecting the language BEFORE the JComboBox listens to model changes speed up initialization by ~35ms (see #7386) @@ -58,6 +60,7 @@ tabPref.registerSubTab(this, tabPref.getSubTab(lafPreference)); } + @Override public boolean ok() { if(langCombo.getSelectedItem() == null) return Main.pref.put("language", null); Index: src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (working copy) @@ -93,6 +93,7 @@ return sanitize(tmsUrl.getText()); } + @Override protected boolean isImageryValid() { return !getImageryName().isEmpty() && !getTmsUrl().isEmpty(); } Index: src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (working copy) @@ -165,6 +165,7 @@ return sanitize(wmsUrl.getText()); } + @Override protected boolean isImageryValid() { if (getImageryName().isEmpty()) { return false; Index: src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (working copy) @@ -426,6 +426,7 @@ this.type = type; } + @Override public void actionPerformed(ActionEvent evt) { final AddImageryPanel p; if (ImageryInfo.ImageryType.WMS.equals(type)) { @@ -551,6 +552,7 @@ putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); } + @Override public void actionPerformed(ActionEvent evt) { layerInfo.loadDefaults(true); defaultModel.fireTableDataChanged(); Index: src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java (working copy) @@ -84,6 +84,7 @@ GBC.eop().fill(GBC.HORIZONTAL).insets(5,0,0,0)); ActionListener autosaveEnabled = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { boolean enabled = autosave.isSelected(); autosaveIntervalLabel.setEnabled(enabled); Index: src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (working copy) @@ -47,11 +47,13 @@ } public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new MapPaintPreference(); } } + @Override public void addGui(final PreferenceTabbedPane gui) { enableIconDefault = new JCheckBox(tr("Enable built-in icon defaults"), Main.pref.getBoolean("mappaint.icon.enable-defaults", true)); @@ -71,6 +73,7 @@ // gui.getMapPreference().getTabPane().addChangeListener( new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { if (gui.getMapPreference().getTabPane().getSelectedComponent() == panel) { sources.initiallyLoadAvailableSources(); @@ -159,6 +162,7 @@ } + @Override public boolean ok() { boolean reload = Main.pref.put("mappaint.icon.enable-defaults", enableIconDefault.isSelected()); reload |= sources.finish(); Index: src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java (working copy) @@ -13,6 +13,7 @@ public class MapPreference extends DefaultTabPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new MapPreference(); } Index: src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (working copy) @@ -173,6 +173,7 @@ // gui.getMapPreference().getTabPane().addChangeListener( new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { if (gui.getMapPreference().getTabPane().getSelectedComponent() == panel) { sources.initiallyLoadAvailableSources(); Index: src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (working copy) @@ -121,6 +121,7 @@ } } } + @Override public void actionPerformed(ActionEvent e) { // Select/unselect corresponding plugin in the model model.setPluginSelected(cb.pi.getName(), cb.isSelected()); @@ -227,6 +228,7 @@ HtmlPanel description = new HtmlPanel(); description.setText(pi.getDescriptionAsHtml()); description.getEditorPane().addHyperlinkListener(new HyperlinkListener() { + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if(e.getEventType() == EventType.ACTIVATED) { OpenBrowser.displayUrl(e.getURL().toString()); Index: src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (working copy) @@ -143,6 +143,7 @@ Collections.sort( availablePlugins, new Comparator() { + @Override public int compare(PluginInformation o1, PluginInformation o2) { String n1 = o1.getName() == null ? "" : o1.getName().toLowerCase(); String n2 = o2.getName() == null ? "" : o2.getName().toLowerCase(); Index: src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (working copy) @@ -239,6 +239,7 @@ } class TimeBasedPolicyChangeListener implements ChangeListener { + @Override public void stateChanged(ChangeEvent e) { lblUpdateInterval.setEnabled(!rbTimeBasedUpatePolicy.get(Policy.NEVER).isSelected()); tfUpdateInterval.setEnabled(!rbTimeBasedUpatePolicy.get(Policy.NEVER).isSelected()); Index: src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (working copy) @@ -56,6 +56,7 @@ public class ProjectionPreference implements SubPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new ProjectionPreference(); } @@ -286,6 +287,7 @@ */ static private GBC projSubPrefPanelGBC = GBC.std().fill(GBC.BOTH).weight(1.0, 1.0); + @Override public void addGui(PreferenceTabbedPane gui) { ProjectionChoice pc = setupProjectionCombo(); @@ -449,6 +451,7 @@ throw new RuntimeException("Couldn't find the current projection in the list of available projections!"); projectionCombo.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ProjectionChoice pc = (ProjectionChoice) projectionCombo.getSelectedItem(); selectedProjectionChanged(pc); Index: src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (working copy) @@ -136,6 +136,7 @@ * Listens to changes in the authentication method */ class AuthenticationMethodChangeListener implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { if (rbBasicAuthentication.isSelected()) { pnlAuthenticationParameteters.removeAll(); @@ -150,6 +151,7 @@ } } + @Override public void propertyChange(PropertyChangeEvent evt) { if (pnlOAuthPreferences != null) { pnlOAuthPreferences.propertyChange(evt); Index: src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (working copy) @@ -68,6 +68,7 @@ cbShowAdvancedParameters.setSelected(false); cbShowAdvancedParameters.addItemListener( new ItemListener() { + @Override public void itemStateChanged(ItemEvent evt) { pnlAdvancedProperties.setVisible(evt.getStateChange() == ItemEvent.SELECTED); } @@ -310,6 +311,7 @@ putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth")); } + @Override public void actionPerformed(ActionEvent arg0) { OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard( OAuthAuthenticationPreferencesPanel.this, @@ -335,6 +337,7 @@ putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth")); } + @Override public void actionPerformed(ActionEvent arg0) { OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard( OAuthAuthenticationPreferencesPanel.this, @@ -361,6 +364,7 @@ } + @Override public void actionPerformed(ActionEvent evt) { OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken(); OAuthParameters parameters = OAuthParameters.createFromPreferences(Main.pref); @@ -374,6 +378,7 @@ } } + @Override public void propertyChange(PropertyChangeEvent evt) { if (! evt.getPropertyName().equals(OsmApiUrlInputPanel.API_URL_PROP)) return; Index: src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (working copy) @@ -165,15 +165,18 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent arg0) { final String url = tfOsmServerUrl.getText().trim(); final ApiUrlTestTask task = new ApiUrlTestTask(OsmApiUrlInputPanel.this, url); Main.worker.submit(task); Runnable r = new Runnable() { + @Override public void run() { if (task.isCanceled()) return; Runnable r = new Runnable() { + @Override public void run() { if (task.isSuccess()) { lblValid.setIcon(ImageProvider.get("dialogs/changeset", "valid")); @@ -202,14 +205,17 @@ setEnabled(enabled); } + @Override public void changedUpdate(DocumentEvent arg0) { updateEnabledState(); } + @Override public void insertUpdate(DocumentEvent arg0) { updateEnabledState(); } + @Override public void removeUpdate(DocumentEvent arg0) { updateEnabledState(); } @@ -258,6 +264,7 @@ * Handles changes in the default URL */ class UseDefaultServerUrlChangeHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { switch(e.getStateChange()) { case ItemEvent.SELECTED: @@ -279,6 +286,7 @@ firePropertyChange(API_URL_PROP, null, tfOsmServerUrl.getText()); } + @Override public void actionPerformed(ActionEvent e) { propagate(); } Index: src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java (revision 6083) +++ src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java (working copy) @@ -20,6 +20,7 @@ private String defaultFilter; public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new ShortcutPreference(); } Index: src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java =================================================================== --- src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (working copy) @@ -64,10 +64,12 @@ * Tasks =======*/ + @Override public void beginTask(String title) { beginTask(title, DEFAULT_TICKS); } + @Override public synchronized void beginTask(String title, int ticks) { this.taskTitle = title; checkState(State.INIT); @@ -77,6 +79,7 @@ resetState(); } + @Override public synchronized void finishTask() { if (state != State.FINISHED) { @@ -90,6 +93,7 @@ } } + @Override public synchronized void invalidate() { if (state == State.INIT) { state = State.FINISHED; @@ -97,6 +101,7 @@ } } + @Override public synchronized void subTask(final String title) { if (state == State.IN_SUBTASK) { if (title != null) { @@ -114,6 +119,7 @@ } } + @Override public synchronized void indeterminateSubTask(String title) { if (state == State.IN_SUBTASK) { if (title != null) { @@ -131,6 +137,7 @@ } } + @Override public synchronized void setCustomText(String text) { if (state == State.IN_SUBTASK) { requestedState.customText = text; @@ -140,6 +147,7 @@ } } + @Override public synchronized void setExtraText(String text) { if (state == State.IN_SUBTASK) { requestedState.extraText = text; @@ -152,6 +160,7 @@ /** * Default implementation is empty. Override in subclasses to display the log messages. */ + @Override public void appendLogMessage(String message) { // do nothing } @@ -176,18 +185,22 @@ doSetIntermediate(intermediateTask); } + @Override public void cancel() { cancelHandler.cancel(); } + @Override public boolean isCanceled() { return cancelHandler.isCanceled(); } + @Override public void addCancelListener(CancelListener listener) { cancelHandler.addCancelListener(listener); } + @Override public void removeCancelListener(CancelListener listener) { cancelHandler.removeCancelListener(listener); } @@ -198,6 +211,7 @@ abstract void updateProgress(double value); + @Override public synchronized void setTicks(int ticks) { if (ticks >= ticksCount) { ticks = ticksCount - 1; @@ -206,11 +220,13 @@ internalUpdateProgress(0); } + @Override public synchronized void setTicksCount(int ticks) { this.ticksCount = ticks; internalUpdateProgress(0); } + @Override public void worked(int ticks) { if (ticks == ALL_TICKS) { setTicks(this.ticksCount - 1); @@ -227,10 +243,12 @@ updateProgress(ticksCount == 0?0:(ticks + childProgress * childTicks) / ticksCount); } + @Override public synchronized int getTicks() { return ticks; } + @Override public synchronized int getTicksCount() { return ticksCount; } @@ -239,6 +257,7 @@ * Subtasks ==========*/ + @Override public synchronized ProgressMonitor createSubTaskMonitor(int ticks, boolean internal) { if (ticks == ALL_TICKS) { ticks = ticksCount - this.ticks; Index: src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java =================================================================== --- src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (working copy) @@ -13,22 +13,28 @@ } + @Override public void addCancelListener(CancelListener listener) { } + @Override public void beginTask(String title) { } + @Override public void beginTask(String title, int ticks) { } + @Override public void cancel() { } + @Override public ProgressMonitor createSubTaskMonitor(int ticks, boolean internal) { return INSTANCE; } + @Override public void finishTask() { } @@ -36,50 +42,63 @@ return null; } + @Override public int getTicks() { return 0; } + @Override public void indeterminateSubTask(String title) { } + @Override public void invalidate() { } + @Override public boolean isCanceled() { return false; } + @Override public void removeCancelListener(CancelListener listener) { } + @Override public void setCustomText(String text) { } public void setErrorMessage(String message) { } + @Override public void setExtraText(String text) { } + @Override public void appendLogMessage(String message) { } public void setSilent(boolean value) { } + @Override public void setTicks(int ticks) { } + @Override public void setTicksCount(int ticks) { } + @Override public void subTask(String title) { } + @Override public void worked(int ticks) { } + @Override public int getTicksCount() { return 0; } Index: src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java =================================================================== --- src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (working copy) @@ -115,6 +115,7 @@ } private ActionListener cancelListener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { cancel(); } @@ -149,6 +150,7 @@ @Override public void doBeginTask() { doInEDT(new Runnable() { + @Override public void run() { Main.currentProgressMonitor = PleaseWaitProgressMonitor.this; if (dialogParent instanceof Frame && dialog == null) { @@ -183,6 +185,7 @@ if (newValue != currentProgressValue) { currentProgressValue = newValue; doInEDT(new Runnable() { + @Override public void run() { ProgressMonitorDialog dialog = getDialog(); if (dialog != null) { @@ -198,6 +201,7 @@ checkState(State.IN_TASK, State.IN_SUBTASK); this.customText = title; doInEDT(new Runnable() { + @Override public void run() { ProgressMonitorDialog dialog = getDialog(); if (dialog != null) { @@ -212,6 +216,7 @@ checkState(State.IN_TASK, State.IN_SUBTASK); this.title = title; doInEDT(new Runnable() { + @Override public void run() { ProgressMonitorDialog dialog = getDialog(); if (dialog != null) { @@ -225,6 +230,7 @@ protected void doSetIntermediate(final boolean value) { this.indeterminate = value; doInEDT(new Runnable() { + @Override public void run() { // Enable only if progress is at the beginning. Doing intermediate progress in the middle // will hide already reached progress @@ -239,6 +245,7 @@ @Override public void appendLogMessage(final String message) { doInEDT(new Runnable() { + @Override public void run() { ProgressMonitorDialog dialog = getDialog(); if (dialog != null) { Index: src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java =================================================================== --- src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (working copy) @@ -33,6 +33,7 @@ @Override public void doBeginTask() { GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setCustomText(""); delegate.setMaximum(PROGRESS_BAR_MAX); @@ -51,6 +52,7 @@ if (newValue != currentProgressValue) { currentProgressValue = newValue; GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setValue(currentProgressValue); } @@ -62,6 +64,7 @@ protected void doSetCustomText(final String title) { checkState(State.IN_TASK, State.IN_SUBTASK); GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setCustomText(title); } @@ -72,6 +75,7 @@ protected void doSetTitle(final String title) { checkState(State.IN_TASK, State.IN_SUBTASK); GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setTaskTitle(title); } @@ -81,6 +85,7 @@ @Override protected void doSetIntermediate(final boolean value) { GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setIndeterminate(value); } Index: src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (revision 6083) +++ src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (working copy) @@ -85,6 +85,7 @@ /** * replies the table cell editor */ + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { currentTag = (TagModel) value; @@ -114,6 +115,7 @@ } } + @Override public Object getCellEditorValue() { return editor.getText(); } Index: src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 6083) +++ src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (working copy) @@ -81,6 +81,7 @@ * * @return the renderer component */ + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int rowIndex, int vColIndex) { resetRenderer(); Index: src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 6083) +++ src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (working copy) @@ -168,8 +168,10 @@ editor.setDocument(new AutoCompletingComboBoxDocument(this)); editor.addFocusListener( new FocusListener() { + @Override public void focusLost(FocusEvent e) { } + @Override public void focusGained(FocusEvent e) { // save unix system selection (middle mouse paste) Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection(); @@ -304,6 +306,7 @@ setOpaque(true); } + @Override public Component getListCellRendererComponent( JList list, Object value, Index: src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 6083) +++ src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (working copy) @@ -193,14 +193,17 @@ this.autoCompletionList = autoCompletionList; } + @Override public Component getEditorComponent() { return this; } + @Override public Object getItem() { return getText(); } + @Override public void setItem(Object anObject) { if (anObject == null) { setText(""); @@ -225,6 +228,7 @@ private TableCellEditorSupport tableCellEditorSupport; private String originalValue; + @Override public void addCellEditorListener(CellEditorListener l) { tableCellEditorSupport.addCellEditorListener(l); } @@ -237,32 +241,39 @@ setText(originalValue); } + @Override public void removeCellEditorListener(CellEditorListener l) { tableCellEditorSupport.removeCellEditorListener(l); } + @Override public void cancelCellEditing() { restoreOriginalValue(); tableCellEditorSupport.fireEditingCanceled(); } + @Override public Object getCellEditorValue() { return getText(); } + @Override public boolean isCellEditable(EventObject anEvent) { return true; } + @Override public boolean shouldSelectCell(EventObject anEvent) { return true; } + @Override public boolean stopCellEditing() { tableCellEditorSupport.fireEditingStopped(); return true; } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { setText( value == null ? "" : value.toString()); rememberOriginalValue(getText()); Index: src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java (revision 6083) +++ src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java (working copy) @@ -62,6 +62,7 @@ * Imposes an ordering on the priorities. * Currently, being in the current DataSet is worth more than being in the Presets. */ + @Override public int compareTo(AutoCompletionItemPritority other) { int sel = Boolean.valueOf(selected).compareTo(other.selected); if (sel != 0) return sel; Index: src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 6083) +++ src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (working copy) @@ -275,15 +275,18 @@ fireTableDataChanged(); } + @Override public int getColumnCount() { return 1; } + @Override public int getRowCount() { return list == null ? 0 : getFilteredSize(); } + @Override public Object getValueAt(int rowIndex, int columnIndex) { return list == null ? null : getFilteredItem(rowIndex); } Index: src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (revision 6083) +++ src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (working copy) @@ -115,6 +115,7 @@ return true; } + @Override public int compareTo(AutoCompletionListItem other) { int ret = other.priority.compareTo(priority); // higher priority items come first in the list if (ret != 0) Index: src/org/openstreetmap/josm/gui/util/GuiHelper.java =================================================================== --- src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 6083) +++ src/org/openstreetmap/josm/gui/util/GuiHelper.java (working copy) @@ -54,6 +54,7 @@ public static void executeByMainWorkerInEDT(final Runnable task) { Main.worker.submit(new Runnable() { + @Override public void run() { runInEDTAndWait(task); } @@ -137,6 +138,7 @@ public static final Component prepareResizeableOptionPane(final Component pane, final Dimension minDimension) { if (pane != null) { pane.addHierarchyListener(new HierarchyListener() { + @Override public void hierarchyChanged(HierarchyEvent e) { Window window = SwingUtilities.getWindowAncestor(pane); if (window instanceof Dialog) { Index: src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java =================================================================== --- src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 6083) +++ src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (working copy) @@ -134,8 +134,10 @@ /* -------------------------------------------------------------------------------- */ /* interface FocusListener */ /* -------------------------------------------------------------------------------- */ + @Override public void focusGained(FocusEvent arg0) {} + @Override public void focusLost(FocusEvent arg0) { validate(); } @@ -143,6 +145,7 @@ /* -------------------------------------------------------------------------------- */ /* interface ActionListener */ /* -------------------------------------------------------------------------------- */ + @Override public void actionPerformed(ActionEvent arg0) { validate(); } @@ -150,14 +153,17 @@ /* -------------------------------------------------------------------------------- */ /* interface DocumentListener */ /* -------------------------------------------------------------------------------- */ + @Override public void changedUpdate(DocumentEvent arg0) { validate(); } + @Override public void insertUpdate(DocumentEvent arg0) { validate(); } + @Override public void removeUpdate(DocumentEvent arg0) { validate(); } @@ -165,6 +171,7 @@ /* -------------------------------------------------------------------------------- */ /* interface PropertyChangeListener */ /* -------------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals("enabled")) { boolean enabled = (Boolean)evt.getNewValue(); Index: src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (working copy) @@ -202,8 +202,11 @@ } class OsmUrlRefresher implements DocumentListener { + @Override public void changedUpdate(DocumentEvent e) { parseURL(); } + @Override public void insertUpdate(DocumentEvent e) { parseURL(); } + @Override public void removeUpdate(DocumentEvent e) { parseURL(); } } } Index: src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java =================================================================== --- src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (revision 6083) +++ src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (working copy) @@ -79,21 +79,25 @@ fireHistoryChanged(); } + @Override public Iterator iterator() { return new Iterator() { private int position = -1; + @Override public void remove() { removeElementAt(position); } + @Override public boolean hasNext() { if(position < getSize()-1 && getSize()>0) return true; return false; } + @Override public AutoCompletionListItem next() { position++; return (AutoCompletionListItem)getElementAt(position); Index: src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java =================================================================== --- src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (revision 6083) +++ src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (working copy) @@ -166,11 +166,13 @@ setEnabled(false); } + @Override public void undoableEditHappened(UndoableEditEvent e) { undoManager.addEdit(e.getEdit()); setEnabled(undoManager.canUndo()); } + @Override public void actionPerformed(ActionEvent e) { try { undoManager.undo(); Index: src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java =================================================================== --- src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java (revision 6083) +++ src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java (working copy) @@ -34,22 +34,27 @@ super(layout); } + @Override public Dimension getPreferredScrollableViewportSize() { return getPreferredSize(); } + @Override public int getScrollableBlockIncrement(Rectangle arg0, int arg1, int arg2) { return 20; } + @Override public boolean getScrollableTracksViewportHeight() { return false; } + @Override public boolean getScrollableTracksViewportWidth() { return true; } + @Override public int getScrollableUnitIncrement(Rectangle arg0, int arg1, int arg2) { return 10; } Index: src/org/openstreetmap/josm/io/FileImporter.java =================================================================== --- src/org/openstreetmap/josm/io/FileImporter.java (revision 6083) +++ src/org/openstreetmap/josm/io/FileImporter.java (working copy) @@ -102,6 +102,7 @@ return 0; } + @Override public int compareTo(FileImporter other) { return (new Double(this.getPriority())).compareTo(other.getPriority()); } Index: src/org/openstreetmap/josm/io/GpxExporter.java =================================================================== --- src/org/openstreetmap/josm/io/GpxExporter.java (revision 6083) +++ src/org/openstreetmap/josm/io/GpxExporter.java (working copy) @@ -241,6 +241,7 @@ final JLabel warning) { ActionListener authorActionListener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { boolean b = author.isSelected(); authorName.setEnabled(b); @@ -277,6 +278,7 @@ authorName.addKeyListener(authorNameListener); predefined.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { final String[] licenses = { "Creative Commons By-SA", Index: src/org/openstreetmap/josm/io/GpxImporter.java =================================================================== --- src/org/openstreetmap/josm/io/GpxImporter.java (revision 6083) +++ src/org/openstreetmap/josm/io/GpxImporter.java (working copy) @@ -104,6 +104,7 @@ public static void addLayers(final GpxImporterData data) { // FIXME: remove UI stuff from the IO subsystem GuiHelper.runInEDT(new Runnable() { + @Override public void run() { if (data.markerLayer != null) { Main.main.addLayer(data.markerLayer); Index: src/org/openstreetmap/josm/io/NMEAImporter.java =================================================================== --- src/org/openstreetmap/josm/io/NMEAImporter.java (revision 6083) +++ src/org/openstreetmap/josm/io/NMEAImporter.java (working copy) @@ -35,6 +35,7 @@ final File fileFinal = file; GuiHelper.runInEDT(new Runnable() { + @Override public void run() { Main.main.addLayer(gpxLayer); if (Main.pref.getBoolean("marker.makeautomarkers", true)) { Index: src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 6083) +++ src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (working copy) @@ -295,6 +295,7 @@ if (args.containsKey("addtags")) { GuiHelper.executeByMainWorkerInEDT(new Runnable() { + @Override public void run() { String[] tags = null; try { Index: src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java =================================================================== --- src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java (revision 6083) +++ src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java (working copy) @@ -79,6 +79,7 @@ /** * The main loop, spawns a {@link RequestProcessor} for each connection */ + @Override public void run() { Main.info(marktr("RemoteControl::Accepting connections on port {0}"), Index: src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java =================================================================== --- src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 6083) +++ src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (working copy) @@ -131,6 +131,7 @@ /** * The work is done here. */ + @Override public void run() { Writer out = null; try { Index: src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java =================================================================== --- src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (revision 6083) +++ src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (working copy) @@ -130,6 +130,7 @@ */ if (args.containsKey("addtags")) { GuiHelper.executeByMainWorkerInEDT(new Runnable() { + @Override public void run() { DataSet ds = Main.main.getCurrentDataSet(); if(ds == null) // e.g. download failed @@ -143,6 +144,7 @@ if (args.containsKey("select") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) { // select objects after downloading, zoom to selection. GuiHelper.executeByMainWorkerInEDT(new Runnable() { + @Override public void run() { HashSet newSel = new HashSet(); DataSet ds = Main.main.getCurrentDataSet(); @@ -194,6 +196,7 @@ // make sure this isn't called unless there *is* a MapView if (Main.isDisplayingMapView()) { GuiHelper.executeByMainWorkerInEDT(new Runnable() { + @Override public void run() { BoundingXYVisitor bbox = new BoundingXYVisitor(); bbox.visit(bounds); Index: src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java =================================================================== --- src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java (revision 6083) +++ src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java (working copy) @@ -106,11 +106,13 @@ } link.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { cl.show(cards, "link"); } }); include.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { cl.show(cards, "include"); } @@ -126,6 +128,7 @@ p.add(cards, GBC.eol().insets(15,0,3,3)); export.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.DESELECTED) { GuiHelper.setEnabledRec(p, false); Index: src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java =================================================================== --- src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (revision 6083) +++ src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (working copy) @@ -73,6 +73,7 @@ updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { SaveAction.getInstance().doSave(layer); updateEnabledState(); @@ -138,11 +139,13 @@ } link.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { cl.show(cards, "link"); } }); include.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { cl.show(cards, "include"); } @@ -158,6 +161,7 @@ p.add(cards, GBC.eol().insets(15,0,3,3)); export.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.DESELECTED) { GuiHelper.setEnabledRec(p, false); Index: src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6083) +++ src/org/openstreetmap/josm/plugins/PluginHandler.java (working copy) @@ -144,6 +144,7 @@ } } + @Override public int compareTo(DeprecatedPlugin o) { return name.compareTo(o.name); } @@ -574,6 +575,7 @@ Collections.sort( toLoad, new Comparator() { + @Override public int compare(PluginInformation o1, PluginInformation o2) { if (o1.stage < o2.stage) return -1; if (o1.stage == o2.stage) return 0; @@ -972,6 +974,7 @@ return; final File[] files = pluginDir.listFiles(new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.endsWith(".jar.new"); }}); @@ -1198,6 +1201,7 @@ pluginTab.add(new JLabel(name), GBC.std()); pluginTab.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL)); pluginTab.add(new JButton(new AbstractAction(tr("Information")) { + @Override public void actionPerformed(ActionEvent event) { StringBuilder b = new StringBuilder(); for (Entry e : info.attr.entrySet()) { Index: src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java =================================================================== --- src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java (revision 6083) +++ src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java (working copy) @@ -12,6 +12,7 @@ this.plugin = plugin; } + @Override public PreferenceSetting createPreferenceSetting() { return plugin.getPreferenceSetting(); } Index: src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java =================================================================== --- src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (revision 6083) +++ src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (working copy) @@ -73,6 +73,7 @@ protected void scanSiteCacheFiles(ProgressMonitor monitor, File pluginsDirectory) { File[] siteCacheFiles = pluginsDirectory.listFiles( new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.matches("^([0-9]+-)?site.*\\.txt$"); } @@ -98,6 +99,7 @@ protected void scanIconCacheFiles(ProgressMonitor monitor, File pluginsDirectory) { File[] siteCacheFiles = pluginsDirectory.listFiles( new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.matches("^([0-9]+-)?site.*plugin-icons\\.zip$"); } @@ -126,6 +128,7 @@ protected void scanPluginFiles(ProgressMonitor monitor, File pluginsDirectory) { File[] pluginFiles = pluginsDirectory.listFiles( new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.endsWith(".jar") || name.endsWith(".jar.new"); } Index: src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java =================================================================== --- src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 6083) +++ src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (working copy) @@ -330,6 +330,7 @@ for (String location : PluginInformation.getPluginLocations()) { File [] f = new File(location).listFiles( new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.matches("^([0-9]+-)?site.*\\.txt$") || name.matches("^([0-9]+-)?site.*-icons\\.zip$"); Index: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java =================================================================== --- src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 6083) +++ src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (working copy) @@ -38,6 +38,7 @@ private static int exceptionCounter = 0; private static boolean suppressExceptionDialogs = false; + @Override public void uncaughtException(Thread t, Throwable e) { handleException(e); } Index: src/org/openstreetmap/josm/tools/CopyList.java =================================================================== --- src/org/openstreetmap/josm/tools/CopyList.java (revision 6083) +++ src/org/openstreetmap/josm/tools/CopyList.java (working copy) @@ -177,10 +177,12 @@ */ int expectedModCount = modCount; + @Override public boolean hasNext() { return cursor != size; } + @Override public E next() { checkForComodification(); try { @@ -193,6 +195,7 @@ } } + @Override public void remove() { if (lastRet == -1) throw new IllegalStateException(); Index: src/org/openstreetmap/josm/tools/Diff.java =================================================================== --- src/org/openstreetmap/josm/tools/Diff.java (revision 6083) +++ src/org/openstreetmap/josm/tools/Diff.java (working copy) @@ -406,6 +406,7 @@ producing an edit script in reverse order. */ static class ReverseScript implements ScriptBuilder { + @Override public change build_script( final boolean[] changed0,int len0, final boolean[] changed1,int len1) @@ -439,6 +440,7 @@ static class ForwardScript implements ScriptBuilder { /** Scan the tables of which lines are inserted and deleted, producing an edit script in forward order. */ + @Override public change build_script( final boolean[] changed0,int len0, final boolean[] changed1,int len1) Index: src/org/openstreetmap/josm/tools/I18n.java =================================================================== --- src/org/openstreetmap/josm/tools/I18n.java (revision 6083) +++ src/org/openstreetmap/josm/tools/I18n.java (working copy) @@ -329,6 +329,7 @@ Locale[] l = new Locale[v.size()]; l = v.toArray(l); Arrays.sort(l, new Comparator() { + @Override public int compare(Locale o1, Locale o2) { return o1.toString().compareTo(o2.toString()); } Index: src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6083) +++ src/org/openstreetmap/josm/tools/ImageProvider.java (working copy) @@ -692,6 +692,7 @@ }); parser.setEntityResolver(new EntityResolver() { + @Override public InputSource resolveEntity (String publicId, String systemId) { return new InputSource(new ByteArrayInputStream(new byte[0])); } Index: src/org/openstreetmap/josm/tools/PlatformHookOsx.java =================================================================== --- src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 6083) +++ src/org/openstreetmap/josm/tools/PlatformHookOsx.java (working copy) @@ -45,6 +45,7 @@ System.out.println("Failed to register with OSX: " + ex); } } + @Override public Object invoke (Object proxy, Method method, Object[] args) throws Throwable { Boolean handled = Boolean.TRUE; //System.out.println("Going to handle method "+method+" (short: "+method.getName()+") with event "+args[0]); Index: src/org/openstreetmap/josm/tools/PresetTextComparator.java =================================================================== --- src/org/openstreetmap/josm/tools/PresetTextComparator.java (revision 6083) +++ src/org/openstreetmap/josm/tools/PresetTextComparator.java (working copy) @@ -9,6 +9,7 @@ import org.openstreetmap.josm.Main; public class PresetTextComparator implements Comparator, Serializable { + @Override public int compare(JMenuItem arg0, JMenuItem arg1) { if (Main.main.menu.presetSearchAction.equals(arg0.getAction())) return -1; Index: src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java =================================================================== --- src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java (revision 6083) +++ src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java (working copy) @@ -40,11 +40,13 @@ } } + @Override public boolean hasNext() { findNext(); return current != null; } + @Override public T next() { findNext(); S old = current; @@ -54,6 +56,7 @@ return res; } + @Override public void remove() { throw new UnsupportedOperationException(); }