Index: /trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- /trunk/src/org/openstreetmap/josm/Main.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/Main.java (revision 6084) @@ -573,4 +573,5 @@ private final CommandQueueListener redoUndoListener = new CommandQueueListener(){ + @Override public void commandChanged(final int queueSize, final int redoSize) { menu.undo.setEnabled(queueSize > 0); Index: /trunk/src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 6084) @@ -47,4 +47,5 @@ } + @Override public void actionPerformed(ActionEvent e) { final JTabbedPane about = new JTabbedPane(); Index: /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6084) @@ -148,4 +148,5 @@ } + @Override public void actionPerformed(ActionEvent e) { launchInfoBrowsersForSelectedPrimitives(); Index: /trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 6084) @@ -30,4 +30,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 6084) @@ -85,4 +85,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 6084) @@ -100,4 +100,5 @@ * Operation depends on the selected objects: */ + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 6084) @@ -166,4 +166,5 @@ } + @Override public void actionPerformed(ActionEvent e) { autoScale(); @@ -302,4 +303,5 @@ */ private class ZoomChangeAdapter implements MapView.ZoomChangeListener { + @Override public void zoomChanged() { updateEnabledState(); Index: /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (revision 6084) @@ -75,4 +75,5 @@ } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); Index: /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 6084) @@ -43,4 +43,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Main.worker.submit(new DownloadOpenChangesetsTask()); @@ -92,4 +93,5 @@ SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { if (lastException != null) { Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 6084) @@ -191,4 +191,5 @@ } + @Override public void actionPerformed(ActionEvent event) { if (getCurrentDataSet() == null) @@ -220,4 +221,5 @@ { Runnable guiTask = new Runnable() { + @Override public void run() { getCurrentDataSet().setSelected(selectedWay); Index: /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 6084) @@ -75,4 +75,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 6084) @@ -60,4 +60,5 @@ * @param e Action Event */ + @Override public void actionPerformed(ActionEvent e) { if (Main.main.getEditLayer() == null) { @@ -112,4 +113,5 @@ // the same.) SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { Main.map.relationListDialog.selectRelation(relation); Index: /trunk/src/org/openstreetmap/josm/actions/DeleteAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (revision 6084) @@ -21,4 +21,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/DistributeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (revision 6084) @@ -46,4 +46,5 @@ * nodes along the straight line between these nodes. */ + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/DownloadAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 6084) @@ -32,4 +32,5 @@ } + @Override public void actionPerformed(ActionEvent e) { DownloadDialog dialog = DownloadDialog.getInstance(); Index: /trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (revision 6084) @@ -52,4 +52,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Index: /trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 6084) @@ -79,4 +79,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled() || ! Main.isDisplayingMapView()) Index: /trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (revision 6084) @@ -24,4 +24,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Main.main.menu.paste.pasteData(new PrimitiveDeepCopy(getCurrentDataSet().getSelected()), getEditLayer(), e); Index: /trunk/src/org/openstreetmap/josm/actions/ExitAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ExitAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ExitAction.java (revision 6084) @@ -26,4 +26,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Main.exitJosm(true); Index: /trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 6084) @@ -160,4 +160,5 @@ } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); Index: /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6084) @@ -93,4 +93,5 @@ new Comparator() { private AllFormatsImporter all = new AllFormatsImporter(); + @Override public int compare(ExtensionFileFilter o1, ExtensionFileFilter o2) { if (o1.getDescription().equals(all.filter.getDescription())) return 1; Index: /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (revision 6084) @@ -121,4 +121,5 @@ } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); Index: /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 6084) @@ -45,4 +45,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/HelpAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 6084) @@ -27,4 +27,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand() == null) { Index: /trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 6084) @@ -33,4 +33,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 6084) @@ -231,12 +231,15 @@ }); } + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { updateEnabledStateInEDT(); } + @Override public void layerAdded(Layer newLayer) { updateEnabledStateInEDT(); } + @Override public void layerRemoved(Layer oldLayer) { updateEnabledStateInEDT(); @@ -249,4 +252,5 @@ */ private class SelectionChangeAdapter implements SelectionChangedListener { + @Override public void selectionChanged(Collection newSelection) { updateEnabledState(newSelection); Index: /trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (revision 6084) @@ -73,4 +73,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Layer sourceLayer = Main.main.getEditLayer(); Index: /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 6084) @@ -58,4 +58,5 @@ } + @Override public void actionPerformed(ActionEvent event) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (revision 6084) @@ -49,4 +49,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (getEditLayer() == null || getEditLayer().data.getAllSelected().isEmpty()) Index: /trunk/src/org/openstreetmap/josm/actions/MirrorAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (revision 6084) @@ -38,4 +38,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Collection sel = getCurrentDataSet().getSelected(); Index: /trunk/src/org/openstreetmap/josm/actions/MoveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/MoveAction.java (revision 6084) @@ -79,4 +79,5 @@ } + @Override public void actionPerformed(ActionEvent event) { Index: /trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java (revision 6084) @@ -28,4 +28,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled() || (getCurrentDataSet().getSelectedNodes().size() != 1)) Index: /trunk/src/org/openstreetmap/josm/actions/NewAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/NewAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/NewAction.java (revision 6084) @@ -21,4 +21,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Main.main.addLayer(new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null)); Index: /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 6084) @@ -63,4 +63,5 @@ } + @Override public void actionPerformed(ActionEvent e) { JFileChooser fc = createAndOpenFileChooser(true, true, null); @@ -218,4 +219,5 @@ if (f.isDirectory()) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(Main.parent, tr( Index: /trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 6084) @@ -87,4 +87,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6084) @@ -92,4 +92,5 @@ true, "action/orthogonalize/undo", true); } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) @@ -123,4 +124,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java (revision 6084) @@ -19,22 +19,29 @@ } + @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: /trunk/src/org/openstreetmap/josm/actions/PasteAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 6084) @@ -47,4 +47,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 6084) @@ -31,8 +31,10 @@ * Launch the preferences dialog. */ + @Override public void actionPerformed(ActionEvent e) { run(); } + @Override public void run() { new PreferenceDialog(Main.parent).setVisible(true); Index: /trunk/src/org/openstreetmap/josm/actions/PurgeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (revision 6084) @@ -237,4 +237,5 @@ Collections.sort(toPurgeAdditionally, new Comparator() { + @Override public int compare(OsmPrimitive o1, OsmPrimitive o2) { int type = o2.getType().compareTo(o1.getType()); @@ -267,4 +268,5 @@ } + @Override public void actionPerformed(ActionEvent e) { layer.data.addSelected(toPurgeAdditionally); Index: /trunk/src/org/openstreetmap/josm/actions/RedoAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/RedoAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/RedoAction.java (revision 6084) @@ -29,4 +29,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (Main.map == null) Index: /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 6084) @@ -42,4 +42,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Box panel = Box.createVerticalBox(); Index: /trunk/src/org/openstreetmap/josm/actions/RestartAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/RestartAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/RestartAction.java (revision 6084) @@ -41,4 +41,5 @@ } + @Override public void actionPerformed(ActionEvent e) { try { Index: /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 6084) @@ -71,4 +71,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (! isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (revision 6084) @@ -18,4 +18,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java (revision 6084) @@ -32,4 +32,5 @@ } + @Override public void actionPerformed(ActionEvent e) { ExtensionFileFilter ff = new ExtensionFileFilter("jos,joz", "jos", tr("Session file (*.jos, *.joz)")); Index: /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 6084) @@ -135,4 +135,5 @@ } + @Override public void actionPerformed(ActionEvent e) { StringBuilder text = new StringBuilder(); Index: /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 6084) @@ -85,4 +85,5 @@ } + @Override public void actionPerformed(ActionEvent e) { DataSet ds = getCurrentDataSet(); Index: /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 6084) @@ -117,4 +117,5 @@ * of the split actions outlined above, and if yes, calls the splitWay method. */ + @Override public void actionPerformed(ActionEvent e) { Index: /trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java (revision 6084) @@ -19,4 +19,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Main.pref.put("draw.rawgps.lines", !Main.pref.getBoolean("draw.rawgps.lines", true)); Index: /trunk/src/org/openstreetmap/josm/actions/UndoAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UndoAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/UndoAction.java (revision 6084) @@ -29,4 +29,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (Main.map == null) Index: /trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 6084) @@ -20,4 +20,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 6084) @@ -228,4 +228,5 @@ // TODO: find better way to initialize the comment field SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { dialog.setDefaultChangesetTags(layer.data.getChangeSetTags()); @@ -253,4 +254,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) Index: /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 6084) @@ -87,4 +87,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) @@ -190,4 +191,5 @@ } + @Override public void visit(Node n) { if (n.isNewOrUndeleted() || n.isModified() || n.isDeleted()) { @@ -197,4 +199,5 @@ } + @Override public void visit(Way w) { if (w.isNewOrUndeleted() || w.isModified() || w.isDeleted()) { @@ -209,4 +212,5 @@ } + @Override public void visit(Relation r) { if (r.isNewOrUndeleted() || r.isModified() || r.isDeleted()) { @@ -224,4 +228,5 @@ } + @Override public void visit(Changeset cs) { // do nothing @@ -283,4 +288,5 @@ } Runnable r = new Runnable() { + @Override public void run() { processPostParentChecker(layer, toUpload); Index: /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 6084) @@ -49,4 +49,5 @@ } + @Override public void actionPerformed(ActionEvent ev) { doValidate(ev, true); Index: /trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java (revision 6084) @@ -58,4 +58,5 @@ notifySelectedState(); } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); Index: /trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java (revision 6084) @@ -72,4 +72,5 @@ } + @Override public void actionPerformed(ActionEvent e) { toggleSelectedState(); Index: /trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java (revision 6084) @@ -28,4 +28,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!Main.isDisplayingMapView()) return; Index: /trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java (revision 6084) @@ -23,4 +23,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!Main.isDisplayingMapView()) return; Index: /trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java (revision 6084) @@ -61,4 +61,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (! isEnabled()) @@ -91,16 +92,20 @@ } + @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: /trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (revision 6084) @@ -30,4 +30,5 @@ } + @Override public void actionPerformed(ActionEvent e) { try { Index: /trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 6084) @@ -33,4 +33,5 @@ } + @Override public void actionPerformed(ActionEvent e) { double speed = AudioPlayer.speed(); Index: /trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (revision 6084) @@ -28,4 +28,5 @@ } + @Override public void actionPerformed(ActionEvent e) { try { Index: /trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (revision 6084) @@ -27,4 +27,5 @@ } + @Override public void actionPerformed(ActionEvent e) { MarkerLayer.playNextMarker(); Index: /trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 6084) @@ -30,4 +30,5 @@ } + @Override public void actionPerformed(ActionEvent e) { URL url = AudioPlayer.url(); Index: /trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 6084) @@ -27,4 +27,5 @@ } + @Override public void actionPerformed(ActionEvent e) { MarkerLayer.playPreviousMarker(); Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (revision 6084) @@ -165,4 +165,5 @@ SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { targetLayer.onPostDownloadFromServer(); Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (revision 6084) @@ -59,4 +59,5 @@ } + @Override public void run() { // wait for all downloads task to finish (by waiting for the futures Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 6084) @@ -397,4 +397,5 @@ * This is required to update the cursors when ctrl/shift/alt is pressed */ + @Override public void eventDispatched(AWTEvent e) { if(oldEvent == null) Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 6084) @@ -77,4 +77,5 @@ * Call selectMapMode(this) on the parent mapFrame. */ + @Override public void actionPerformed(ActionEvent e) { if (Main.isDisplayingMapView()) { @@ -110,10 +111,17 @@ } + @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: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6084) @@ -211,4 +211,5 @@ * This is called whenever the keyboard modifier status changes */ + @Override public void eventDispatched(AWTEvent e) { if(oldEvent == null) @@ -445,4 +446,5 @@ // 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(); @@ -604,4 +606,5 @@ // click and switch back to SelectMode Main.worker.execute(new Runnable() { + @Override public void run() { Main.map.selectDrawTool(true); Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 6084) @@ -51,4 +51,5 @@ * Zoom to the rectangle on the map. */ + @Override public void selectionEnded(Rectangle r, MouseEvent e) { if (r.width >= 3 && r.height >= 3 && Main.isDisplayingMapView()) { Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 6084) @@ -126,4 +126,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) @@ -132,4 +133,5 @@ } + @Override public void actionPerformed(ActionEvent e, Map parameters) { if (parameters.get(SEARCH_EXPRESSION) == null) { @@ -726,4 +728,5 @@ } + @Override public List> getActionParameters() { return Collections.>singletonList(new SearchSettingsActionParameter(SEARCH_EXPRESSION)); Index: /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (revision 6084) @@ -21,4 +21,5 @@ public class ApiPreconditionCheckerHook implements UploadHook { + @Override public boolean checkUpload(APIDataSet apiData) { OsmApi api = OsmApi.getOsmApi(); Index: /trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java (revision 6084) @@ -43,4 +43,5 @@ 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"))) { Index: /trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 6084) @@ -97,4 +97,5 @@ } + @Override public boolean checkUpload(APIDataSet apiDataSet) { this.data = apiDataSet; Index: /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (revision 6084) @@ -43,4 +43,5 @@ * Validate the modified data before uploading */ + @Override public boolean checkUpload(APIDataSet apiDataSet) { Index: /trunk/src/org/openstreetmap/josm/command/Command.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/Command.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/command/Command.java (revision 6084) @@ -41,10 +41,13 @@ 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: /trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java (revision 6084) @@ -18,4 +18,5 @@ TableCellRenderer { + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, @@ -46,4 +47,5 @@ } + @Override public TableCellRenderer getCellRenderer(int row, int column) { if (getCorrectionTableModel().isBoldCell(row, column)) { Index: /trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 6084) @@ -24,4 +24,5 @@ } + @Override abstract public int getColumnCount(); @@ -42,4 +43,5 @@ } + @Override public int getRowCount() { return corrections.size(); @@ -72,4 +74,5 @@ } + @Override public Object getValueAt(int rowIndex, int colIndex) { if (colIndex == applyColumn) Index: /trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java (revision 6084) @@ -32,4 +32,5 @@ } + @Override public Object getCorrectionValueAt(int rowIndex, int colIndex) { TagCorrection tagCorrection = getCorrections().get(rowIndex); @@ -48,4 +49,5 @@ } + @Override protected boolean isBoldCell(int row, int column) { TagCorrection tagCorrection = getCorrections().get(row); Index: /trunk/src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 6084) @@ -337,4 +337,5 @@ ret, new Comparator() { + @Override public int compare(Relation o1, Relation o2) { return Integer.valueOf(uploadOrder.indexOf(o1)).compareTo(uploadOrder.indexOf(o2)); Index: /trunk/src/org/openstreetmap/josm/data/AutosaveTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (revision 6084) @@ -335,4 +335,5 @@ Main.worker.submit(openFileTsk); Main.worker.submit(new Runnable() { + @Override public void run() { for (File f: openFileTsk.getSuccessfullyOpenedFiles()) { Index: /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 6084) @@ -330,4 +330,5 @@ final ReadLocalPluginInformationTask task = new ReadLocalPluginInformationTask(); Runnable r = new Runnable() { + @Override public void run() { if (task.isCanceled()) return; @@ -338,4 +339,5 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { List availablePlugins = task.getAvailablePlugins(); Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6084) @@ -262,10 +262,13 @@ } + @Override public String getKey() { return key; } + @Override public Setting getOldValue() { return oldValue; } + @Override public Setting getNewValue() { return newValue; @@ -1267,10 +1270,13 @@ 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") @@ -1278,4 +1284,5 @@ this.changed = changed; } + @Override public void visit(MapListSetting setting) { changed = putListOfStructs(key, setting.getValue()); @@ -1550,4 +1557,5 @@ } + @Override public void visit(StringSetting setting) { if (noPassword && key.equals("osm-server.password")) @@ -1565,4 +1573,5 @@ } + @Override public void visit(ListSetting setting) { b.append(" \n"); @@ -1573,4 +1582,5 @@ } + @Override public void visit(ListListSetting setting) { b.append(" \n"); @@ -1585,4 +1595,5 @@ } + @Override public void visit(MapListSetting setting) { b.append(" \n"); Index: /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 6084) @@ -157,9 +157,12 @@ } + @Override public void layerRemoved(Layer oldLayer) { clean(oldLayer); } + @Override public void layerAdded(Layer newLayer) {} + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) {} Index: /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 6084) @@ -266,4 +266,5 @@ * @return the iterator */ + @Override public Iterator> iterator() { return conflicts.iterator(); Index: /trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (revision 6084) @@ -32,12 +32,15 @@ } + @Override public double getX() { return x; } + @Override public double getY() { return y; } + @Override public void setLocation (double x, double y) { this.x = x; Index: /trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java (revision 6084) @@ -47,4 +47,5 @@ } + @Override public Bounds getBounds() { if (bounds == null) @@ -54,12 +55,15 @@ } + @Override public Collection getWayPoints() { return wayPoints; } + @Override public double length() { return length; } + @Override public int getUpdateCount() { return 0; Index: /trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (revision 6084) @@ -113,4 +113,5 @@ } + @Override public int compareTo(WayPoint w) { return Double.compare(time, w.time); Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 6084) @@ -160,8 +160,10 @@ } + @Override public ChangesetModificationType getModificationType() { return modificationType; } + @Override public HistoryOsmPrimitive getPrimitive() { return primitive; @@ -176,8 +178,10 @@ } + @Override public boolean hasNext() { return typeIterator.hasNext(); } + @Override public ChangesetDataSetEntry next() { Entry next = typeIterator.next(); @@ -187,4 +191,5 @@ } + @Override public void remove() { throw new UnsupportedOperationException(); Index: /trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java (revision 6084) @@ -21,13 +21,17 @@ } + @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: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java (revision 6084) @@ -55,4 +55,5 @@ } + @Override public int compare(OsmPrimitive a, OsmPrimitive b) { if (a.getType().equals(b.getType())) Index: /trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java (revision 6084) @@ -49,4 +49,5 @@ boolean firstIteration; + @Override public void visit(Node n) { if (!visitedNodeIds.add(n.getUniqueId())) @@ -54,4 +55,5 @@ (firstIteration ? directlyAdded : referenced).add(n.save()); } + @Override public void visit(Way w) { if (!visitedWayIds.add(w.getUniqueId())) @@ -63,4 +65,5 @@ } } + @Override public void visit(Relation r) { if (!visitedRelationIds.add(r.getUniqueId())) Index: /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 6084) @@ -508,4 +508,5 @@ clear(); } + @Override public void clear() { root = new QBLevel(); @@ -517,4 +518,5 @@ }*/ } + @Override public boolean add(T n) { root.add(n); @@ -523,4 +525,5 @@ } + @Override public boolean retainAll(Collection objects) { @@ -534,4 +537,5 @@ return true; } + @Override public boolean removeAll(Collection objects) { @@ -542,4 +546,5 @@ return changed; } + @Override public boolean addAll(Collection objects) { @@ -550,4 +555,5 @@ return changed; } + @Override public boolean containsAll(Collection objects) { @@ -558,4 +564,5 @@ return true; } + @Override public boolean remove(Object o) { @SuppressWarnings("unchecked") T t = (T) o; @@ -568,4 +575,5 @@ return false; } + @Override public boolean contains(Object o) { @SuppressWarnings("unchecked") T t = (T) o; @@ -585,8 +593,10 @@ return a; } + @Override public Object[] toArray() { return this.toArrayList().toArray(); } + @Override public A[] toArray(A[] template) { @@ -626,4 +636,5 @@ iterated_over = 0; } + @Override public boolean hasNext() { @@ -660,4 +671,5 @@ return current_node.content.get(content_index); } + @Override public T next() { @@ -675,4 +687,5 @@ return ret; } + @Override public void remove() { @@ -686,12 +699,15 @@ } } + @Override public Iterator iterator() { return new QuadBucketIterator(this); } + @Override public int size() { return size; } + @Override public boolean isEmpty() { Index: /trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (revision 6084) @@ -171,4 +171,5 @@ * PrimitiveId implementation. Returns the same value as getMember().getType() */ + @Override public OsmPrimitiveType getType() { return member.getType(); @@ -178,8 +179,10 @@ * PrimitiveId implementation. Returns the same value as getMemberType().getUniqueId() */ + @Override public long getUniqueId() { return member.getUniqueId(); } + @Override public boolean isNew() { return member.isNew(); Index: /trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java (revision 6084) @@ -15,12 +15,15 @@ } + @Override public OsmPrimitiveType getType() { return type; } + @Override public long getUniqueId() { return id; } + @Override public boolean isNew() { return id <= 0; Index: /trunk/src/org/openstreetmap/josm/data/osm/Storage.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 6084) @@ -90,8 +90,10 @@ 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; @@ -361,7 +363,9 @@ 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); @@ -389,12 +393,15 @@ } + @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; @@ -403,8 +410,10 @@ } + @Override public boolean containsValue(Object value) { return Storage.this.contains(value); } + @Override public T get(Object o) { @SuppressWarnings("unchecked") K key = (K) o; @@ -413,4 +422,5 @@ } + @Override public T put(K key, T value) { if (!fHash.equals(key, value)) throw new IllegalArgumentException("inconsistent key"); @@ -418,4 +428,5 @@ } + @Override public T remove(Object o) { modCount++; @@ -426,4 +437,5 @@ } + @Override public void putAll(Map m) { if (m instanceof Storage.FMap) { @@ -436,16 +448,20 @@ } + @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(); @@ -461,4 +477,5 @@ } + @Override public boolean hasNext() { align(); @@ -466,4 +483,5 @@ } + @Override public T next() { if (!hasNext()) throw new NoSuchElementException(); @@ -471,4 +489,5 @@ } + @Override public void remove() { throw new UnsupportedOperationException(); @@ -492,4 +511,5 @@ } + @Override public boolean hasNext() { align(); @@ -497,4 +517,5 @@ } + @Override public T next() { if (!hasNext()) throw new NoSuchElementException(); @@ -503,4 +524,5 @@ } + @Override public void remove() { if (removeSlot == -1) throw new IllegalStateException(); Index: /trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 6084) @@ -485,4 +485,5 @@ * @return the iterator */ + @Override public Iterator iterator() { return tags.iterator(); Index: /trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java (revision 6084) @@ -20,32 +20,40 @@ } + @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: /trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 6084) @@ -98,4 +98,5 @@ } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { if (oldLayer != null) { @@ -127,4 +128,5 @@ } + @Override public void processDatasetEvent(AbstractDatasetChangedEvent event) { fireEvents(normalListeners, event); @@ -134,4 +136,5 @@ private final Runnable edtRunnable = new Runnable() { + @Override public void run() { while (!eventsInEDT.isEmpty()) { Index: /trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 6084) @@ -68,4 +68,5 @@ } + @Override public void selectionChanged(Collection newSelection) { fireEvents(normalListeners, newSelection); @@ -81,4 +82,5 @@ private final Runnable edtRunnable = new Runnable() { + @Override public void run() { if (selection != null) { Index: /trunk/src/org/openstreetmap/josm/data/osm/history/History.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/History.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/History.java (revision 6084) @@ -67,4 +67,5 @@ copy, new Comparator() { + @Override public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) { return o1.compareTo(o2); @@ -80,4 +81,5 @@ copy, new Comparator() { + @Override public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) { return o2.compareTo(o1); @@ -92,4 +94,5 @@ this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getTimestamp().compareTo(fromDate) >= 0; @@ -103,4 +106,5 @@ this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getTimestamp().compareTo(untilDate) <= 0; @@ -118,4 +122,5 @@ this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getVersion() >= fromVersion; @@ -129,4 +134,5 @@ this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getVersion() <= untilVersion; @@ -144,4 +150,5 @@ this, new FilterPredicate() { + @Override public boolean matches(HistoryOsmPrimitive primitive) { return primitive.getUser() != null && primitive.getUser().getId() == uid; Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 6084) @@ -164,6 +164,9 @@ /* 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; Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 6084) @@ -149,4 +149,5 @@ public abstract OsmPrimitiveType getType(); + @Override public int compareTo(HistoryOsmPrimitive o) { if (this.id != o.id) Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java (revision 6084) @@ -13,4 +13,5 @@ public abstract class AbstractVisitor implements Visitor { + @Override public void visit(Changeset cs) { // do nothing Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (revision 6084) @@ -26,4 +26,5 @@ * Nodes have only itself as nodes. */ + @Override public void visit(Node n) { nodes.add(n); @@ -33,4 +34,5 @@ * Ways have their way nodes. */ + @Override public void visit(Way w) { if (w.isIncomplete()) return; @@ -44,4 +46,5 @@ * if so, use AutomatchVisitor! */ + @Override public void visit(Relation e) { for (RelationMember m : e.getMembers()) Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 6084) @@ -25,8 +25,10 @@ private ProjectionBounds bounds = null; + @Override public void visit(Node n) { visit(n.getEastNorth()); } + @Override public void visit(Way w) { if (w.isIncomplete()) return; @@ -36,4 +38,5 @@ } + @Override public void visit(Relation e) { // only use direct members Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (revision 6084) @@ -126,8 +126,10 @@ } + @Override public void visit(Node n) { rememberNode(n); } + @Override public void visit(Way w) { // remember all nodes this way refers to ... @@ -140,4 +142,5 @@ } + @Override public void visit(Relation r) { // first, remember all primitives members refer to (only if necessary, see Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java (revision 6084) @@ -103,4 +103,5 @@ } + @Override public void preferenceChanged(PreferenceChangeEvent e) { load(); Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java (revision 6084) @@ -39,8 +39,10 @@ private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() { + @Override public void mapPaintStylesUpdated() { backgroundColorCache = null; } + @Override public void mapPaintStyleEntryUpdated(int idx) { mapPaintStylesUpdated(); Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 6084) @@ -154,4 +154,5 @@ * @param bounds display boundaries */ + @Override public void render(DataSet data, boolean virtual, Bounds bounds) { BBox bbox = new BBox(bounds); Index: /trunk/src/org/openstreetmap/josm/gui/BookmarkList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (revision 6084) @@ -67,4 +67,5 @@ } + @Override public int compareTo(Bookmark b) { return name.toLowerCase().compareTo(b.name.toLowerCase()); @@ -224,4 +225,5 @@ } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6084) @@ -138,4 +138,5 @@ * @return the name */ + @Override public String format(Node node) { StringBuilder name = new StringBuilder(); @@ -203,4 +204,5 @@ }; + @Override public Comparator getNodeComparator() { return nodeComparator; @@ -214,4 +216,5 @@ * @return the name */ + @Override public String format(Way way) { StringBuilder name = new StringBuilder(); @@ -293,4 +296,5 @@ }; + @Override public Comparator getWayComparator() { return wayComparator; @@ -304,4 +308,5 @@ * @return the name */ + @Override public String format(Relation relation) { StringBuilder name = new StringBuilder(); @@ -401,4 +406,5 @@ }; + @Override public Comparator getRelationComparator() { return relationComparator; @@ -484,4 +490,5 @@ * @return the name */ + @Override public String format(Changeset changeset) { return tr("Changeset {0}",changeset.getId()); @@ -547,4 +554,5 @@ * @return the name */ + @Override public String format(HistoryNode node) { StringBuilder sb = new StringBuilder(); @@ -578,4 +586,5 @@ * @return the name */ + @Override public String format(HistoryWay way) { StringBuilder sb = new StringBuilder(); @@ -619,4 +628,5 @@ * @return the name */ + @Override public String format(HistoryRelation relation) { StringBuilder sb = new StringBuilder(); Index: /trunk/src/org/openstreetmap/josm/gui/FileDrop.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 6084) @@ -75,4 +75,5 @@ true, // Recursive new FileDrop.Listener(){ + @Override public void filesDropped( java.io.File[] files ){ // start asynchronous loading of files @@ -272,5 +273,6 @@ { // 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." ); @@ -299,4 +301,5 @@ } // end dragEnter + @Override public void dragOver( java.awt.dnd.DropTargetDragEvent evt ) { // This is called continually as long as the mouse is @@ -304,4 +307,5 @@ } // end dragOver + @Override public void drop( java.awt.dnd.DropTargetDropEvent evt ) { log( out, "FileDrop: drop event." ); @@ -389,4 +393,5 @@ } // end drop + @Override public void dragExit( java.awt.dnd.DropTargetEvent evt ) { log( out, "FileDrop: dragExit event." ); @@ -399,4 +404,5 @@ } // end dragExit + @Override public void dropActionChanged( java.awt.dnd.DropTargetDragEvent evt ) { log( out, "FileDrop: dropActionChanged event." ); @@ -481,5 +487,6 @@ // 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(); @@ -813,4 +820,5 @@ * @since 1.1 */ + @Override public java.awt.datatransfer.DataFlavor[] getTransferDataFlavors() { @@ -839,4 +847,5 @@ * @since 1.1 */ + @Override public Object getTransferData( java.awt.datatransfer.DataFlavor flavor ) throws java.awt.datatransfer.UnsupportedFlavorException, java.io.IOException @@ -862,4 +871,5 @@ * @since 1.1 */ + @Override public boolean isDataFlavorSupported( java.awt.datatransfer.DataFlavor flavor ) { Index: /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6084) @@ -53,4 +53,5 @@ } + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { Index: /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 6084) @@ -113,4 +113,5 @@ } + @Override public void actionPerformed(ActionEvent e) { pane.setValue(value); @@ -168,4 +169,5 @@ HelpUtil.setHelpContext(b, helpTopic); Action a = new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { HelpBrowser.setUrlForHelpTopic(helpTopic); @@ -271,4 +273,5 @@ 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); @@ -324,4 +327,5 @@ 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: /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java (revision 6084) @@ -60,4 +60,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals("active")) { @@ -69,4 +70,5 @@ } + @Override public void destroy() { Action action = getAction(); Index: /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6084) @@ -239,4 +239,5 @@ /* interface PreferenceChangeListener */ /* ------------------------------------------------------------------- */ + @Override public void preferenceChanged(PreferenceChangeEvent evt) { if (evt.getKey().equals("osm-server.username")) { Index: /trunk/src/org/openstreetmap/josm/gui/MainApplet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainApplet.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/MainApplet.java (revision 6084) @@ -42,4 +42,5 @@ Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true); } + @Override public void actionPerformed(ActionEvent e) { ((ServerSidePreferences)Main.pref).upload(); @@ -164,12 +165,15 @@ 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 { @@ -181,12 +185,15 @@ } + @Override public URL getDocumentBase() { return getCodeBase(); } + @Override public String getParameter(String k) { return null; } + @Override public boolean isActive() { return true; Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 6084) @@ -353,4 +353,5 @@ GuiHelper.runInEDT(new Runnable() { + @Override public void run() { splash.setVisible(false); @@ -381,4 +382,5 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (AutosaveTask.PROP_AUTOSAVE_ENABLED.get()) { Index: /trunk/src/org/openstreetmap/josm/gui/MapMover.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 6084) @@ -40,4 +40,5 @@ this.action = action; } + @Override public void actionPerformed(ActionEvent e) { if (action.equals(".") || action.equals(",")) { @@ -121,4 +122,5 @@ * 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; @@ -187,4 +189,5 @@ * @param e The wheel event. */ + @Override public void mouseWheelMoved(MouseWheelEvent e) { nc.zoomToFactor(e.getX(), e.getY(), Math.pow(Math.sqrt(2), e.getWheelRotation())); @@ -194,4 +197,5 @@ * Emulates dragging on Mac OSX */ + @Override public void mouseMoved(MouseEvent e) { if (!movementInPlace) Index: /trunk/src/org/openstreetmap/josm/gui/MapScaler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapScaler.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/MapScaler.java (revision 6084) @@ -46,4 +46,5 @@ } + @Override public String helpTopic() { return ht("/MapView/Scaler"); Index: /trunk/src/org/openstreetmap/josm/gui/MapSlider.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapSlider.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/MapSlider.java (revision 6084) @@ -29,4 +29,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (getModel().getValueIsAdjusting()) return; @@ -54,4 +55,5 @@ } + @Override public void stateChanged(ChangeEvent e) { if (preventChange) return; @@ -65,4 +67,5 @@ } + @Override public String helpTopic() { return ht("/MapView/Slider"); Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 6084) @@ -455,4 +455,5 @@ popup = null; EventQueue.invokeLater(new Runnable(){ + @Override public void run() { staticPopup.hide(); Index: /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 6084) @@ -599,4 +599,5 @@ private class MouseScrollListener implements MouseWheelListener { + @Override public void mouseWheelMoved(MouseWheelEvent mwe) { if (menu.getComponents().length > scrollCount) { Index: /trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java (revision 6084) @@ -212,4 +212,5 @@ * @see #removeLayoutComponent */ + @Override public void addLayoutComponent(String name, Component child) { if (name == null) @@ -224,4 +225,5 @@ * @see #addLayoutComponent */ + @Override public void removeLayoutComponent(Component child) { String name = child.getName(); @@ -321,4 +323,5 @@ } + @Override public Dimension preferredLayoutSize(Container parent) { Dimension size = preferredNodeSize(getModel()); @@ -326,4 +329,5 @@ } + @Override public Dimension minimumLayoutSize(Container parent) { Dimension size = minimumNodeSize(getModel()); @@ -760,4 +764,5 @@ * with a matching Leaf Node. */ + @Override public void layoutContainer(Container parent) { checkLayout(getModel()); Index: /trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java (revision 6084) @@ -157,4 +157,5 @@ private class DefaultDividerPainter extends DividerPainter { + @Override public void paint(Graphics g, Divider divider) { if ((divider == activeDivider()) && !isContinuousLayout()) { @@ -202,4 +203,5 @@ * {@inheritDoc} */ + @Override protected void paintChildren(Graphics g) { super.paintChildren(g); @@ -353,25 +355,32 @@ 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) { @@ -379,8 +388,11 @@ } } + @Override public void keyReleased(KeyEvent e) { } + @Override public void keyTyped(KeyEvent e) { } } + @Override public AccessibleContext getAccessibleContext() { if( accessibleContext == null ) { @@ -391,4 +403,5 @@ protected class AccessibleMultiSplitPane extends AccessibleJPanel { + @Override public AccessibleRole getAccessibleRole() { return AccessibleRole.SPLIT_PANE; Index: /trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 6084) @@ -42,4 +42,5 @@ * 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); @@ -50,4 +51,5 @@ * 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); Index: /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 6084) @@ -67,7 +67,11 @@ 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(); @@ -88,4 +92,5 @@ } + @Override public void setIndeterminate(boolean newValue) { UIManager.put("ProgressBar.cycleTime", UIManager.getInt("ProgressBar.repaintInterval") * 100); @@ -104,4 +109,5 @@ * @param text */ + @Override public void setCustomText(String text) { if(text == null || text.trim().length() == 0) { @@ -117,4 +123,5 @@ } + @Override public void setCurrentAction(String text) { currentAction.setText(text); @@ -127,4 +134,5 @@ * @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 ) Index: /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 6084) @@ -86,4 +86,5 @@ } else { EventQueue.invokeAndWait(new Runnable() { + @Override public void run() { finish(); @@ -103,4 +104,5 @@ } else { EventQueue.invokeAndWait(new Runnable() { + @Override public void run() { afterFinish(); @@ -113,4 +115,5 @@ // Exception has to thrown in EDT to be shown to user SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (e instanceof RuntimeException) { @@ -132,4 +135,5 @@ } + @Override public final void run() { if (canceled) @@ -138,4 +142,5 @@ if (EventQueue.isDispatchThread()) { new Thread(new Runnable() { + @Override public void run() { doRealRun(); @@ -147,4 +152,5 @@ } + @Override public void operationCanceled() { cancel(); Index: /trunk/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java (revision 6084) @@ -41,4 +41,5 @@ ActionMap map = new ActionMapUIResource(); map.put("pressed", new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { grabFocus(); @@ -135,10 +136,10 @@ } /** Filter: No one may change the armed/selected/pressed status except us. */ - public void setArmed(boolean b) { } - public void setSelected(boolean b) { } - public void setPressed(boolean b) { } + @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. */ - public void setEnabled(boolean b) { + @Override public void setEnabled(boolean b) { setFocusable(b); other.setEnabled(b); @@ -146,40 +147,40 @@ /** All these methods simply delegate to the "other" model * that is being decorated. */ - public boolean isArmed() { return other.isArmed(); } - public boolean isSelected() { return other.isSelected(); } - public boolean isEnabled() { return other.isEnabled(); } - public boolean isPressed() { return other.isPressed(); } - public boolean isRollover() { return other.isRollover(); } - public void setRollover(boolean b) { other.setRollover(b); } - public void setMnemonic(int key) { other.setMnemonic(key); } - public int getMnemonic() { return other.getMnemonic(); } - public void setActionCommand(String s) { + @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); } - public String getActionCommand() { + @Override public String getActionCommand() { return other.getActionCommand(); } - public void setGroup(ButtonGroup group) { + @Override public void setGroup(ButtonGroup group) { other.setGroup(group); } - public void addActionListener(ActionListener l) { + @Override public void addActionListener(ActionListener l) { other.addActionListener(l); } - public void removeActionListener(ActionListener l) { + @Override public void removeActionListener(ActionListener l) { other.removeActionListener(l); } - public void addItemListener(ItemListener l) { + @Override public void addItemListener(ItemListener l) { other.addItemListener(l); } - public void removeItemListener(ItemListener l) { + @Override public void removeItemListener(ItemListener l) { other.removeItemListener(l); } - public void addChangeListener(ChangeListener l) { + @Override public void addChangeListener(ChangeListener l) { other.addChangeListener(l); } - public void removeChangeListener(ChangeListener l) { + @Override public void removeChangeListener(ChangeListener l) { other.removeChangeListener(l); } - public Object[] getSelectedObjects() { + @Override public Object[] getSelectedObjects() { return other.getSelectedObjects(); } Index: /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 6084) @@ -70,4 +70,5 @@ private Timer timer = new Timer(100, new ActionListener() { + @Override public void actionPerformed(ActionEvent arg0) { ScrollViewport.this.scroll(); Index: /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (revision 6084) @@ -123,4 +123,5 @@ selectionEndedListener.addPropertyChangeListener(this); eventSource.addPropertyChangeListener("scale", new PropertyChangeListener(){ + @Override public void propertyChange(PropertyChangeEvent evt) { if (mousePosStart != null) { @@ -146,4 +147,5 @@ * If the correct button, from the "drawing rectangle" mode */ + @Override public void mousePressed(MouseEvent e) { if (e.getButton() == MouseEvent.BUTTON1) { @@ -158,4 +160,5 @@ * 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); @@ -188,4 +191,5 @@ * Check the state of the keys and buttons and set the selection accordingly. */ + @Override public void mouseReleased(MouseEvent e) { if (e.getButton() != MouseEvent.BUTTON1) @@ -273,4 +277,5 @@ * 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) { @@ -362,7 +367,11 @@ } + @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: /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 6084) @@ -154,4 +154,5 @@ } + @Override public void setCustomText(String message) { if(message.isEmpty()) @@ -161,4 +162,5 @@ } + @Override public void setIndeterminate(boolean indeterminate) { progressBar.setIndeterminate(indeterminate); @@ -166,4 +168,5 @@ } + @Override public void setMaximum(int maximum) { progressBar.setMaximum(maximum); @@ -179,4 +182,5 @@ * task titles together with their execution time. */ + @Override public void setTaskTitle(String taskTitle) { @@ -207,4 +211,5 @@ } + @Override public void setValue(int value) { progressBar.setValue(value); Index: /trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 6084) @@ -175,4 +175,5 @@ } + @Override public void tableChanged(TableModelEvent e) { updateMessage(); @@ -205,4 +206,5 @@ 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)); @@ -322,4 +324,5 @@ } + @Override public void actionPerformed(ActionEvent e) { setCanceled(false); @@ -335,4 +338,5 @@ } + @Override public void actionPerformed(ActionEvent e) { setCanceled(true); Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 6084) @@ -340,4 +340,5 @@ } + @Override public Bounds getBoundingBox() { return bbox; @@ -350,4 +351,5 @@ * @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 Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 6084) @@ -190,4 +190,5 @@ } + @Override public void actionPerformed(ActionEvent e) { moveTask.setDirectionX(direction); @@ -203,4 +204,5 @@ } + @Override public void actionPerformed(ActionEvent e) { moveTask.setDirectionY(direction); @@ -313,4 +315,5 @@ private class ZoomInAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { iSlippyMapChooser.zoomIn(); @@ -320,4 +323,5 @@ private class ZoomOutAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { iSlippyMapChooser.zoomOut(); Index: /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 6084) @@ -134,4 +134,5 @@ * */ + @Override public Bounds getBoundingBox() { return bbox; @@ -143,4 +144,5 @@ * @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); @@ -196,4 +198,5 @@ */ class TileBoundsChangeListener implements PropertyChangeListener { + @Override public void propertyChange(PropertyChangeEvent evt) { if (!evt.getPropertyName().equals(TileGridInputPanel.TILE_BOUNDS_PROP)) return; @@ -371,4 +374,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TileAddressInputPanel.TILE_BOUNDS_PROP)) { @@ -385,4 +389,5 @@ class ZomeLevelChangeHandler implements ChangeListener { + @Override public void stateChanged(ChangeEvent e) { int zoomLevel = (Integer)spZoomLevel.getValue(); @@ -410,14 +415,18 @@ } + @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(); @@ -506,4 +515,5 @@ } + @Override public void actionPerformed(ActionEvent e) { TileBounds tb = valTileAddress.getTileBounds(); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java (revision 6084) @@ -14,4 +14,5 @@ setOpaque(true); } + @Override public Component getListCellRendererComponent( JList list, Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 6084) @@ -168,4 +168,5 @@ * @see PropertiesMergeModel */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TagMergeModel.PROP_NUM_UNDECIDED_TAGS)) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6084) @@ -842,4 +842,5 @@ } + @Override public Object getElementAt(int index) { if (index < compareModes.size()) @@ -848,12 +849,15 @@ } + @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); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6084) @@ -437,4 +437,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = myEntriesTable.getSelectedRows(); @@ -442,4 +443,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(!myEntriesTable.getSelectionModel().isSelectionEmpty()); @@ -464,4 +466,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = myEntriesTable.getSelectedRows(); @@ -469,4 +472,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(!myEntriesTable.getSelectionModel().isSelectionEmpty()); @@ -491,4 +495,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] myRows = myEntriesTable.getSelectedRows(); @@ -500,4 +505,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled( @@ -525,4 +531,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] myRows = myEntriesTable.getSelectedRows(); @@ -534,4 +541,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled( @@ -554,4 +562,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = theirEntriesTable.getSelectedRows(); @@ -559,4 +568,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(!theirEntriesTable.getSelectionModel().isSelectionEmpty()); @@ -576,4 +586,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = theirEntriesTable.getSelectedRows(); @@ -581,4 +592,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(!theirEntriesTable.getSelectionModel().isSelectionEmpty()); @@ -598,4 +610,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] myRows = theirEntriesTable.getSelectedRows(); @@ -607,4 +620,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled( @@ -627,4 +641,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] myRows = theirEntriesTable.getSelectedRows(); @@ -636,4 +651,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled( @@ -652,4 +668,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { model.copyAll(ListRole.MY_ENTRIES); @@ -661,8 +678,10 @@ } + @Override public void update(Observable o, Object arg) { updateEnabledState(); } + @Override public void propertyChange(PropertyChangeEvent evt) { updateEnabledState(); @@ -678,4 +697,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { model.copyAll(ListRole.THEIR_ENTRIES); @@ -687,8 +707,10 @@ } + @Override public void update(Observable o, Object arg) { updateEnabledState(); } + @Override public void propertyChange(PropertyChangeEvent evt) { updateEnabledState(); @@ -708,4 +730,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = mergedEntriesTable.getSelectedRows(); @@ -713,4 +736,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { int [] rows = mergedEntriesTable.getSelectedRows(); @@ -740,4 +764,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = mergedEntriesTable.getSelectedRows(); @@ -745,4 +770,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { int [] rows = mergedEntriesTable.getSelectedRows(); @@ -772,4 +798,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int [] rows = mergedEntriesTable.getSelectedRows(); @@ -777,4 +804,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { int [] rows = mergedEntriesTable.getSelectedRows(); @@ -803,4 +831,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { // do nothing @@ -818,4 +847,5 @@ addPropertyChangeListener( new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(PROP_SELECTED)) { @@ -827,4 +857,5 @@ } + @Override public void itemStateChanged(ItemEvent e) { int state = e.getStateChange(); @@ -867,4 +898,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) { @@ -877,4 +909,5 @@ } + @Override public void update(Observable o, Object arg) { lblMyVersion.setText( @@ -935,4 +968,5 @@ * */ + @Override public void adjustmentValueChanged(AdjustmentEvent e) { if (! enabledMap.get(e.getAdjustable())) @@ -1001,4 +1035,5 @@ // view.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { switch(e.getStateChange()) { @@ -1019,4 +1054,5 @@ observable.addObserver( new Observer() { + @Override public void update(Observable o, Object arg) { boolean sync = isParticipatingInSynchronizedScrolling(adjustable); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 6084) @@ -53,4 +53,5 @@ } + @Override public void populate(Conflict conflict) { Way myWay = (Way)conflict.getMy(); @@ -61,4 +62,5 @@ } + @Override public void deletePrimitive(boolean deleted) { if (deleted) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 6084) @@ -151,4 +151,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 6084) @@ -381,4 +381,5 @@ } + @Override public void update(Observable o, Object arg) { updateCoordinates(); @@ -397,8 +398,10 @@ } + @Override public void actionPerformed(ActionEvent e) { model.decideCoordsConflict(MergeDecisionType.KEEP_MINE); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord()); @@ -412,8 +415,10 @@ } + @Override public void actionPerformed(ActionEvent e) { model.decideCoordsConflict(MergeDecisionType.KEEP_THEIR); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord()); @@ -427,8 +432,10 @@ } + @Override public void actionPerformed(ActionEvent e) { model.decideCoordsConflict(MergeDecisionType.UNDECIDED); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasCoordConflict() && model.isDecidedCoord()); @@ -442,8 +449,10 @@ } + @Override public void actionPerformed(ActionEvent e) { model.decideDeletedStateConflict(MergeDecisionType.KEEP_MINE); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState()); @@ -457,8 +466,10 @@ } + @Override public void actionPerformed(ActionEvent e) { model.decideDeletedStateConflict(MergeDecisionType.KEEP_THEIR); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState()); @@ -472,8 +483,10 @@ } + @Override public void actionPerformed(ActionEvent e) { model.decideDeletedStateConflict(MergeDecisionType.UNDECIDED); } + @Override public void update(Observable o, Object arg) { setEnabled(model.hasDeletedStateConflict() && model.isDecidedDeletedState()); @@ -481,4 +494,5 @@ } + @Override public void deletePrimitive(boolean deleted) { if (deleted) { @@ -491,4 +505,5 @@ } + @Override public void populate(Conflict conflict) { model.populate(conflict); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (revision 6084) @@ -49,4 +49,5 @@ } + @Override public void populate(Conflict conflict) { Relation myRel = (Relation)conflict.getMy(); @@ -61,4 +62,5 @@ } + @Override public void deletePrimitive(boolean deleted) { if (deleted) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java (revision 6084) @@ -37,4 +37,5 @@ } + @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) @@ -49,4 +50,5 @@ } + @Override public Object getCellEditorValue() { return editor.getText(); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 6084) @@ -147,4 +147,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (revision 6084) @@ -23,4 +23,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int col) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 6084) @@ -280,4 +280,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int rows[] = mineTable.getSelectedRows(); @@ -288,4 +289,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(mineTable.getSelectedRowCount() > 0); @@ -310,4 +312,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int rows[] = theirTable.getSelectedRows(); @@ -318,4 +321,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(theirTable.getSelectedRowCount() > 0); @@ -346,4 +350,5 @@ } + @Override public void adjustmentValueChanged(AdjustmentEvent e) { for (Adjustable a : synchronizedAdjustables) { @@ -405,4 +410,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { int rows[] = mergedTable.getSelectedRows(); @@ -412,4 +418,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { setEnabled(mergedTable.getSelectedRowCount() > 0); @@ -417,4 +424,5 @@ } + @Override public void deletePrimitive(boolean deleted) { // Use my entries, as it doesn't really matter @@ -425,4 +433,5 @@ } + @Override public void populate(Conflict conflict) { model.populate(conflict.getMy(), conflict.getTheir()); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 6084) @@ -389,4 +389,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { setCanceled(true); @@ -404,4 +405,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { setVisible(false); @@ -414,4 +416,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { @@ -444,12 +447,15 @@ } + @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)) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 6084) @@ -129,4 +129,5 @@ } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { MultiValueResolutionDecision decision = (MultiValueResolutionDecision)value; @@ -136,4 +137,5 @@ } + @Override public Object getCellEditorValue() { return editor.getSelectedItem(); @@ -180,4 +182,5 @@ } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (revision 6084) @@ -124,4 +124,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 6084) @@ -272,4 +272,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { setVisible(false); @@ -287,4 +288,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { setVisible(false); @@ -305,4 +307,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { @@ -334,4 +337,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { @@ -471,4 +475,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java (revision 6084) @@ -23,4 +23,5 @@ /* TableCellEditor */ /* --------------------------------------------------------------------------------- */ + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { setSelectedItem(value); @@ -32,8 +33,10 @@ private RelationMemberConflictDecisionType originalValue; + @Override public void addCellEditorListener(CellEditorListener l) { tableCellEditorSupport.addCellEditorListener(l); } + @Override public void cancelCellEditing() { setSelectedItem(originalValue); @@ -41,20 +44,25 @@ } + @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(); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (revision 6084) @@ -40,4 +40,5 @@ /* TableCellRenderer */ /* --------------------------------------------------------------------------------- */ + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { @@ -58,4 +59,5 @@ /* ListCellRenderer */ /* --------------------------------------------------------------------------------- */ + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (revision 6084) @@ -148,4 +148,5 @@ } + @Override public void actionPerformed(ActionEvent e) { model.applyRole(tfRole.getText()); @@ -154,4 +155,5 @@ class ToggleTagRelationsAction implements ChangeListener { + @Override public void stateChanged(ChangeEvent e) { ButtonModel buttonModel = ((AbstractButton) e.getSource()).getModel(); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java (revision 6084) @@ -52,4 +52,5 @@ */ class SelectNextColumnCellAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { run(); @@ -82,4 +83,5 @@ class SelectPreviousColumnCellAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { run(); @@ -105,8 +107,10 @@ } + @Override public void gotoNextDecision() { selectNextColumnCellAction.run(); } + @Override public void gotoPreviousDecision() { selectPreviousColumnCellAction.run(); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (revision 6084) @@ -52,4 +52,5 @@ cbShowTagsWithConflictsOnly.addChangeListener( new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { model.setShowTagsWithConflictsOnly(cbShowTagsWithConflictsOnly.isSelected()); @@ -63,4 +64,5 @@ cbShowTagsWithMultiValuesOnly.addChangeListener( new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { model.setShowTagsWithMultiValuesOnly(cbShowTagsWithMultiValuesOnly.isSelected()); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6084) @@ -65,4 +65,5 @@ displayedKeys, new Comparator() { + @Override public int compare(String key1, String key2) { if (decisions.get(key1).isDecided() && ! decisions.get(key2).isDecided()) Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java (revision 6084) @@ -54,4 +54,5 @@ */ class SelectNextColumnCellAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { run(); @@ -84,4 +85,5 @@ class SelectPreviousColumnCellAction extends AbstractAction { + @Override public void actionPerformed(ActionEvent e) { run(); @@ -107,8 +109,10 @@ } + @Override public void gotoNextDecision() { selectNextColumnCellAction.run(); } + @Override public void gotoPreviousDecision() { selectPreviousColumnCellAction.run(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 6084) @@ -268,4 +268,5 @@ class FilterChangeHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { Main.pref.put("changeset-dialog.for-selected-objects-only", cbInSelectionOnly.isSelected()); @@ -305,4 +306,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (Main.main.getEditLayer() == null) @@ -321,4 +323,5 @@ } + @Override public void itemStateChanged(ItemEvent arg0) { updateEnabledState(); @@ -326,4 +329,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -343,4 +347,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { ChangesetListModel model = getCurrentChangesetListModel(); @@ -356,4 +361,5 @@ } + @Override public void itemStateChanged(ItemEvent arg0) { updateEnabledState(); @@ -361,4 +367,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -378,4 +385,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { List sel = getCurrentChangesetListModel().getSelectedOpenChangesets(); @@ -389,8 +397,10 @@ } + @Override public void itemStateChanged(ItemEvent arg0) { updateEnabledState(); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -410,4 +420,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { Set sel = getCurrentChangesetListModel().getSelectedChangesets(); @@ -429,8 +440,10 @@ } + @Override public void itemStateChanged(ItemEvent arg0) { updateEnabledState(); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -463,4 +476,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { ChangesetListModel model = getCurrentChangesetListModel(); @@ -485,4 +499,5 @@ Runnable r = new Runnable() { + @Override public void run() { // first, wait for the download task to finish, if a download @@ -515,7 +530,9 @@ } + @Override public void itemStateChanged(ItemEvent arg0) { } + @Override public void valueChanged(ListSelectionEvent e) { } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 6084) @@ -154,4 +154,5 @@ } + @Override public void valueChanged(TreeSelectionEvent e) { if (source == undoTree) { @@ -182,4 +183,5 @@ tree.addTreeSelectionListener(new TreeSelectionListener() { + @Override public void valueChanged(TreeSelectionEvent e) { updater.updateEnabledState(); @@ -188,16 +190,20 @@ 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(); @@ -315,4 +321,5 @@ c.getParticipatingPrimitives(), new Predicate(){ + @Override public boolean evaluate(OsmPrimitive o) { OsmPrimitive p = currentLayer.data.getPrimitiveById(o); @@ -324,4 +331,5 @@ } + @Override public void commandChanged(int queueSize, int redoSize) { if (!isVisible()) @@ -413,4 +421,5 @@ } + @Override public void actionPerformed(ActionEvent e) { lastOperation = type; @@ -437,4 +446,5 @@ } + @Override public void updateEnabledState() { // do not allow execution if nothing is selected or a sub command was selected Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6084) @@ -101,4 +101,5 @@ lstConflicts.addMouseListener(new MouseEventHandler()); addListSelectionListener(new ListSelectionListener(){ + @Override public void valueChanged(ListSelectionEvent e) { Main.map.mapView.repaint(); @@ -231,4 +232,5 @@ // 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); @@ -240,4 +242,5 @@ g.drawLine(p1.x, p1.y, p2.x, p2.y); } + @Override public void visit(Way w) { Node lastN = null; @@ -251,4 +254,5 @@ } } + @Override public void visit(Relation e) { if (!visited.contains(e)) { @@ -272,4 +276,5 @@ } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { if (oldLayer != null) { @@ -306,8 +311,10 @@ } + @Override public void onConflictsAdded(ConflictCollection conflicts) { refreshView(); } + @Override public void onConflictsRemoved(ConflictCollection conflicts) { System.err.println("1 conflict has been resolved."); @@ -315,4 +322,5 @@ } + @Override public void selectionChanged(Collection newSelection) { lstConflicts.clearSelection(); @@ -355,4 +363,5 @@ } + @Override public void addListDataListener(ListDataListener l) { if (l != null) { @@ -361,4 +370,5 @@ } + @Override public void removeListDataListener(ListDataListener l) { listeners.remove(l); @@ -378,4 +388,5 @@ } + @Override public Object getElementAt(int index) { if (index < 0) return null; @@ -384,4 +395,5 @@ } + @Override public int getSize() { if (conflicts == null) return 0; @@ -412,8 +424,10 @@ } + @Override public void actionPerformed(ActionEvent e) { resolve(); } + @Override public void valueChanged(ListSelectionEvent e) { ListSelectionModel model = (ListSelectionModel)e.getSource(); @@ -432,4 +446,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Collection sel = new LinkedList(); @@ -443,4 +458,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { ListSelectionModel model = (ListSelectionModel)e.getSource(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 6084) @@ -143,4 +143,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { closeDialog(); @@ -159,4 +160,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { HelpBrowser.setUrlForHelpTopic(ht("/Dialog/Conflict")); @@ -180,4 +182,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { if (! resolver.isResolvedCompletely()) { @@ -214,4 +217,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ConflictResolver.RESOLVED_COMPLETELY_PROP)) { @@ -233,4 +237,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ConflictResolver.MY_PRIMITIVE_PROP)) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 6084) @@ -215,4 +215,5 @@ // Toggle filter "enabled" on Enter InputMapUtils.addEnterAction(userTable, new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { int index = userTable.getSelectedRow(); @@ -225,4 +226,5 @@ // Toggle filter "hiding" on Spacebar InputMapUtils.addSpacebarAction(userTable, new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { int index = userTable.getSelectedRow(); @@ -256,4 +258,5 @@ 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(); @@ -267,4 +270,5 @@ public void updateDialogHeader() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { setTitle(tr("Filter Hidden:{0} Disabled:{1}", filterModel.disabledAndHiddenCount, filterModel.disabledCount)); @@ -315,32 +319,40 @@ } + @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: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 6084) @@ -236,8 +236,10 @@ } + @Override public int getRowCount() { return filters.size(); } + @Override public int getColumnCount() { return 5; @@ -306,4 +308,5 @@ } + @Override public Object getValueAt(int row, int column) { Filter f = filters.get(row); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (revision 6084) @@ -134,8 +134,10 @@ /* interface HistoryDataSetListener */ /* ----------------------------------------------------------------------------- */ + @Override public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) { model.refresh(); } + @Override public void historyDataSetCleared(HistoryDataSet source) { model.refresh(); @@ -207,4 +209,5 @@ } + @Override public void selectionChanged(Collection newSelection) { data.clear(); @@ -268,4 +271,5 @@ } + @Override public void actionPerformed(ActionEvent e) { int [] rows = historyTable.getSelectedRows(); @@ -282,4 +286,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -308,4 +313,5 @@ } + @Override public void actionPerformed(ActionEvent e) { int [] rows = historyTable.getSelectedRows(); @@ -318,4 +324,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 6084) @@ -294,12 +294,15 @@ 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(); @@ -308,12 +311,15 @@ 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(); @@ -322,4 +328,5 @@ static class TextFieldFocusHandler implements FocusListener { + @Override public void focusGained(FocusEvent e) { Component c = e.getComponent(); @@ -329,4 +336,5 @@ } } + @Override public void focusLost(FocusEvent e) {} } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 6084) @@ -275,4 +275,5 @@ // Activate layer on Enter key press InputMapUtils.addEnterAction(layerList, new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { activateLayerAction.actionPerformed(null); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (revision 6084) @@ -35,4 +35,5 @@ this.layer = layer; } + @Override public void actionPerformed(ActionEvent e) { JOptionPane.showMessageDialog( Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 6084) @@ -119,4 +119,5 @@ }); cbWireframe.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Main.main.menu.wireFrameToggleAction.actionPerformed(null); @@ -315,4 +316,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) { if (value == null) @@ -400,4 +402,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6084) @@ -235,4 +235,5 @@ } + @Override public void actionPerformed(ActionEvent e) { toggleButtonHook(); @@ -311,4 +312,5 @@ } + @Override public void buttonShown() { unfurlDialog(); @@ -486,4 +488,5 @@ buttonsHide.addActionListener( new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { setIsButtonHiding(buttonHiding == ButtonHiddingType.ALWAYS_SHOWN?ButtonHiddingType.DYNAMIC:ButtonHiddingType.ALWAYS_SHOWN); @@ -503,4 +506,5 @@ pref.addActionListener( new ActionListener(){ + @Override @SuppressWarnings("unchecked") public void actionPerformed(ActionEvent e) { @@ -524,4 +528,5 @@ sticky.addActionListener( new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { detach(); @@ -538,4 +543,5 @@ close.addActionListener( new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { hideDialog(); @@ -744,4 +750,5 @@ } + @Override public String helpTopic() { String help = getClass().getName(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 6084) @@ -106,8 +106,10 @@ * @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) { @@ -118,8 +120,10 @@ } + @Override public void layerAdded(Layer newLayer) { // do nothing } + @Override public void layerRemoved(Layer oldLayer) { // do nothing @@ -164,4 +168,5 @@ } + @Override public void actionPerformed(ActionEvent e) { select(); @@ -172,4 +177,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -234,4 +240,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -262,4 +269,5 @@ this.percent = percent; } + @Override public int compareTo(UserInfo o) { if (count < o.count) return 1; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (revision 6084) @@ -88,4 +88,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 6084) @@ -204,12 +204,15 @@ /* interface ChangesetDownloadTask */ /* ------------------------------------------------------------------------------- */ + @Override public Set getDownloadedChangesets() { return downloadedChangesets; } + @Override public boolean isCanceled() { return canceled; } + @Override public boolean isFailed() { return lastException != null; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 6084) @@ -167,4 +167,5 @@ /* interface PropertyChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if(!evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) @@ -185,4 +186,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { if (currentChangeset == null) return; @@ -250,4 +252,5 @@ Runnable r = new Runnable() { + @Override public void run() { try { @@ -265,4 +268,5 @@ } catch (final Exception e) { GuiHelper.runInEDT(new Runnable() { + @Override public void run() { BugReportExceptionHandler.handleException(e); @@ -280,4 +284,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { Set selected = model.getSelectedPrimitives(); @@ -286,4 +291,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -316,4 +322,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) @@ -344,8 +351,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { updateEnabledState(); @@ -378,4 +387,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) @@ -407,8 +417,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { updateEnabledState(); @@ -447,4 +459,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { if (current == null) return; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java (revision 6084) @@ -55,4 +55,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 6084) @@ -84,4 +84,5 @@ data, new Comparator() { + @Override public int compare(ChangesetDataSetEntry c1, ChangesetDataSetEntry c2) { if (c1.getModificationType().equals(c2.getModificationType())) { @@ -115,12 +116,15 @@ /* 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) { @@ -148,7 +152,9 @@ } + @Override public ChangesetModificationType getModificationType() { return modificationType; } + @Override public HistoryOsmPrimitive getPrimitive() { return primitive; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 6084) @@ -255,4 +255,5 @@ /* interface PropertyChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (! evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) @@ -272,4 +273,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { if (current == null) @@ -294,4 +296,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { if (current == null) return; @@ -330,4 +333,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { if (current == null) return; @@ -378,4 +382,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) @@ -404,4 +409,5 @@ } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { updateEnabledState(); @@ -437,4 +443,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) @@ -464,4 +471,5 @@ } + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { updateEnabledState(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 6084) @@ -147,4 +147,5 @@ } Runnable r = new Runnable() { + @Override public void run() { ChangesetCache.getInstance().update(downloadedChangesets); @@ -192,12 +193,15 @@ /* interface ChangesetDownloadTask */ /* ------------------------------------------------------------------------------- */ + @Override public Set getDownloadedChangesets() { return downloadedChangesets; } + @Override public boolean isCanceled() { return canceled; } + @Override public boolean isFailed() { return lastException != null; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java (revision 6084) @@ -19,4 +19,5 @@ /* Interface SelectionChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void selectionChanged(Collection newSelection) { initFromPrimitives(newSelection); @@ -26,4 +27,5 @@ /* Interface LayerChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { if (newLayer == null) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (revision 6084) @@ -47,4 +47,5 @@ } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 6084) @@ -144,4 +144,5 @@ data, new Comparator() { + @Override public int compare(Changeset cs1, Changeset cs2) { if (cs1.getId() > cs2.getId()) return -1; @@ -183,4 +184,5 @@ /* Interface ChangesetCacheListener */ /* ---------------------------------------------------------------------------- */ + @Override public void changesetCacheUpdated(ChangesetCacheEvent event) { Set sel = getSelectedChangesets(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (revision 6084) @@ -47,4 +47,5 @@ /* interface PropertyChangeListener */ /* ---------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (!evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (revision 6084) @@ -29,20 +29,28 @@ /* 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 */} @@ -50,4 +58,5 @@ /* interface EditLayerListener */ /* ------------------------------------------------------------------------------ */ + @Override public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { // just init the model content. Don't register as DataSetListener. The mode Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 6084) @@ -85,4 +85,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { if (!isEnabled()) @@ -101,12 +102,15 @@ } + @Override public void changedUpdate(DocumentEvent arg0) { updateEnabledState(); } + @Override public void insertUpdate(DocumentEvent arg0) { updateEnabledState(); } + @Override public void removeUpdate(DocumentEvent arg0) { updateEnabledState(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6084) @@ -259,4 +259,5 @@ } + @Override public void itemStateChanged(ItemEvent e) { if (e.getSource() == cbUserRestriction) { @@ -617,4 +618,5 @@ class UserRestrictionChangedHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { tfUid.setEnabled(rbRestrictToUid.isSelected()); @@ -819,4 +821,5 @@ class TimeRestrictionChangedHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { tfClosedAfterDate1.setEnabled(rbClosedAfter.isSelected()); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 6084) @@ -245,4 +245,5 @@ */ class SelectQueryHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { BasicQuery q = getSelectedQuery(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 6084) @@ -176,4 +176,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { try { @@ -219,4 +220,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { cancel(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 6084) @@ -80,4 +80,5 @@ pnl.getEditorPane().addHyperlinkListener( new HyperlinkListener() { + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) { @@ -194,12 +195,15 @@ } } + @Override public void changedUpdate(DocumentEvent e) { validate(); } + @Override public void insertUpdate(DocumentEvent e) { validate(); } + @Override public void removeUpdate(DocumentEvent e) { validate(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (revision 6084) @@ -56,4 +56,5 @@ this.presetHandler = presetHandler; } + @Override public void mouseClicked(MouseEvent arg0) { Collection selection = tag.createSelection(presetHandler.getSelection()); @@ -67,11 +68,15 @@ } + @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: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 6084) @@ -93,4 +93,5 @@ Comparator defaultACItemComparator = new Comparator() { + @Override public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue()); @@ -309,4 +310,5 @@ 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 @@ -494,4 +496,5 @@ 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(); @@ -591,4 +594,5 @@ popupMenu.add(new AbstractAction(tr("Set number of recently added tags")) { + @Override public void actionPerformed(ActionEvent e) { selectNumberOfTags(); @@ -597,4 +601,5 @@ JCheckBoxMenuItem rememberLastTags = new JCheckBoxMenuItem( new AbstractAction(tr("Remember last used tags")){ + @Override public void actionPerformed(ActionEvent e) { boolean sel=((JCheckBoxMenuItem) e.getSource()).getState(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 6084) @@ -200,4 +200,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) @@ -206,4 +207,5 @@ } + @Override public void valueChanged(TreeSelectionEvent e) { refreshEnabled(); @@ -226,4 +228,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) @@ -262,4 +265,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) @@ -268,4 +272,5 @@ } + @Override public void valueChanged(TreeSelectionEvent e) { updateEnabledState(); @@ -416,4 +421,5 @@ } SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { Main.map.repaint(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (revision 6084) @@ -135,4 +135,5 @@ SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { curLayer.mergeFrom(dataSet); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 6084) @@ -98,4 +98,5 @@ SwingUtilities.invokeAndWait( new Runnable() { + @Override public void run() { layer.mergeFrom(allDownloads); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 6084) @@ -34,4 +34,5 @@ * replies the table cell editor */ + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { @@ -44,4 +45,5 @@ } + @Override public Object getCellEditorValue() { return editor.getText(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (revision 6084) @@ -65,4 +65,5 @@ } + @Override abstract public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 6084) @@ -87,4 +87,5 @@ /* Interface SelectionChangedListener */ /* --------------------------------------------------------------------------- */ + @Override public void selectionChanged(Collection newSelection) { if (Main.main.getEditLayer() != this.layer) return; @@ -98,4 +99,5 @@ /* Interface DataSetListener */ /* --------------------------------------------------------------------------- */ + @Override public void dataChanged(DataChangedEvent event) { // just trigger a repaint - the display name of the relation members may @@ -106,7 +108,10 @@ } + @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 @@ -115,4 +120,5 @@ } + @Override public void relationMembersChanged(RelationMembersChangedEvent event) { // ignore - the relation in the editor might become out of sync with the relation @@ -121,4 +127,5 @@ } + @Override public void tagsChanged(TagsChangedEvent event) { // just refresh the respective table cells @@ -133,6 +140,8 @@ } + @Override public void wayNodesChanged(WayNodesChangedEvent event) {/* ignore */} + @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignore */} /* --------------------------------------------------------------------------- */ @@ -164,12 +173,15 @@ } + @Override public int getColumnCount() { return 3; } + @Override public int getRowCount() { return members.size(); } + @Override public Object getValueAt(int rowIndex, int columnIndex) { switch (columnIndex) { @@ -726,4 +738,5 @@ } + @Override public void tableChanged(TableModelEvent e) { connectionType = null; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 6084) @@ -173,4 +173,5 @@ SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { getLayer().onPostDownloadFromServer(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 6084) @@ -98,4 +98,5 @@ } + @Override public void actionPerformed(ActionEvent e) { boolean full = cbReadFull.isSelected(); @@ -108,4 +109,5 @@ task.setContinuation( new Runnable() { + @Override public void run() { if (task.isCanceled() || task.hasError()) @@ -118,12 +120,15 @@ } + @Override public void contentsChanged(ListDataEvent e) { refreshEnabled(); } + @Override public void intervalAdded(ListDataEvent e) { refreshEnabled(); } + @Override public void intervalRemoved(ListDataEvent e) { refreshEnabled(); @@ -147,4 +152,5 @@ } + @Override public void actionPerformed(ActionEvent e) { run(); @@ -160,4 +166,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { refreshEnabled(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (revision 6084) @@ -37,8 +37,10 @@ } + @Override public Object getElementAt(int index) { return referrers.get(index); } + @Override public int getSize() { return referrers.size(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 6084) @@ -183,4 +183,5 @@ * */ + @Override public void layerRemoved(Layer oldLayer) { if (oldLayer == null || ! (oldLayer instanceof OsmDataLayer)) @@ -200,8 +201,10 @@ } + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { // do nothing } + @Override public void layerAdded(Layer newLayer) { // do nothing Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 6084) @@ -81,8 +81,10 @@ 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(); @@ -141,4 +143,5 @@ SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { model.refreshNode(path); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (revision 6084) @@ -62,4 +62,5 @@ } + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (revision 6084) @@ -189,20 +189,25 @@ /* 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; @@ -211,4 +216,5 @@ } + @Override public void addTreeModelListener(TreeModelListener l) { if (l != null) { @@ -217,8 +223,10 @@ } + @Override public void removeTreeModelListener(TreeModelListener l) { listeners.remove(l); } + @Override public void valueForPathChanged(TreePath path, Object newValue) { // do nothing Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java (revision 6084) @@ -11,6 +11,8 @@ } + @Override public abstract void run(); + @Override public void actionPerformed(ActionEvent arg0) { run(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 6084) @@ -64,4 +64,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 6084) @@ -45,8 +45,10 @@ } + @Override public int getColumnCount() { return 1; } + @Override public int getRowCount() { if (Main.map.mapView.getEditLayer() != layer) @@ -55,8 +57,10 @@ } + @Override public Object getValueAt(int rowIndex, int columnIndex) { return cache.get(rowIndex); } + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { if (oldLayer == layer) { @@ -69,8 +73,10 @@ } + @Override public void layerAdded(Layer newLayer) { // do nothing } + @Override public void layerRemoved(Layer oldLayer) { if (oldLayer == layer) { @@ -81,4 +87,5 @@ } + @Override public void selectionChanged(Collection newSelection) { if (layer == Main.map.mapView.getEditLayer()) { Index: /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 6084) @@ -105,4 +105,5 @@ } + @Override public void addGui(final DownloadDialog gui) { JPanel dlg = new JPanel(new GridBagLayout()); @@ -112,4 +113,5 @@ bookmarks = new BookmarkList(); bookmarks.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent e) { Bookmark b = (Bookmark)bookmarks.getSelectedValue(); @@ -161,4 +163,5 @@ * @param area the download area. */ + @Override public void setDownloadArea(Bounds area) { if (area == null) return; @@ -180,4 +183,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (currentArea == null) { @@ -213,4 +217,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Object[] sels = bookmarks.getSelectedValues(); @@ -225,4 +230,5 @@ setEnabled(bookmarks.getSelectedIndices().length > 0); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -238,4 +244,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Object[] sels = bookmarks.getSelectedValues(); @@ -261,4 +268,5 @@ setEnabled(bookmarks.getSelectedIndices().length == 1); } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); Index: /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 6084) @@ -81,4 +81,5 @@ } + @Override public void addGui(final DownloadDialog gui) { buildDownloadAreaInputFields(); @@ -123,4 +124,5 @@ } + @Override public void setDownloadArea(Bounds area) { updateBboxFields(area); @@ -212,4 +214,5 @@ } + @Override public void actionPerformed(ActionEvent e) { check(); @@ -244,4 +247,5 @@ } + @Override public void actionPerformed(ActionEvent e) { check(); @@ -262,6 +266,9 @@ 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); } } @@ -298,4 +305,5 @@ } + @Override public void actionPerformed(ActionEvent e) { refreshBounds(); Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6084) @@ -136,4 +136,5 @@ 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()); @@ -153,4 +154,5 @@ /* 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); @@ -198,4 +200,5 @@ getRootPane().getActionMap().put("checkClipboardContents", new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { String clip = Utils.getClipboardContent(); @@ -400,4 +403,5 @@ } + @Override public void actionPerformed(ActionEvent e) { run(); @@ -439,4 +443,5 @@ } + @Override public void actionPerformed(ActionEvent e) { run(); Index: /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6084) @@ -133,4 +133,5 @@ * This method is, for all intents and purposes, the constructor for this class. */ + @Override public void addGui(final DownloadDialog gui) { JPanel panel = new JPanel(); @@ -164,4 +165,5 @@ } + @Override public void setDownloadArea(Bounds area) { tblSearchResults.clearSelection(); @@ -291,4 +293,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled() || cbSearchExpression.getText().trim().length() == 0) @@ -304,12 +307,15 @@ } + @Override public void changedUpdate(DocumentEvent e) { updateEnabledState(); } + @Override public void insertUpdate(DocumentEvent e) { updateEnabledState(); } + @Override public void removeUpdate(DocumentEvent e) { updateEnabledState(); @@ -473,4 +479,5 @@ class ListSelectionHandler implements ListSelectionListener { + @Override public void valueChanged(ListSelectionEvent lse) { SearchResult r = model.getSelectedSearchResult(); @@ -524,4 +531,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (revision 6084) @@ -37,4 +37,5 @@ } + @Override public void addGui(final DownloadDialog gui) { iGui = gui; @@ -42,4 +43,5 @@ } + @Override public void setDownloadArea(Bounds area) { pnlSlippyMapBBoxChooser.setBoundingBox(area); @@ -47,4 +49,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(BBoxChooser.BBOX_PROP)) { Index: /trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java (revision 6084) @@ -31,4 +31,5 @@ } + @Override public void addGui(final DownloadDialog gui) { gui.addDownloadAreaSelector(chooser, tr("Tile Numbers")); @@ -36,8 +37,10 @@ } + @Override public void setDownloadArea(Bounds area) { chooser.setBoundingBox(area); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(BBoxChooser.BBOX_PROP)) { Index: /trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java (revision 6084) @@ -50,4 +50,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (helpTopic != null) { Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6084) @@ -84,4 +84,5 @@ final HelpBrowser browser = getInstance(); Runnable r = new Runnable() { + @Override public void run() { browser.openHelpTopic(helpTopic); @@ -190,4 +191,5 @@ 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); @@ -428,4 +430,5 @@ } + @Override public void actionPerformed(ActionEvent e) { OpenBrowser.displayUrl(getUrl()); @@ -440,4 +443,5 @@ } + @Override public void actionPerformed(ActionEvent e) { String url = getUrl(); @@ -472,4 +476,5 @@ } + @Override public void actionPerformed(ActionEvent e) { openUrl(getUrl()); @@ -488,7 +493,9 @@ } + @Override public void actionPerformed(ActionEvent e) { history.back(); } + @Override public void update(Observable o, Object arg) { //System.out.println("BackAction: canGoBoack=" + history.canGoBack() ); @@ -508,7 +515,9 @@ } + @Override public void actionPerformed(ActionEvent e) { history.forward(); } + @Override public void update(Observable o, Object arg) { setEnabled(history.canGoForward()); @@ -523,4 +532,5 @@ } + @Override public void actionPerformed(ActionEvent e) { openHelpTopic("/"); @@ -581,4 +591,5 @@ } + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) Index: /trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (revision 6084) @@ -58,4 +58,5 @@ * */ + @Override public void adjustmentValueChanged(AdjustmentEvent e) { if (! enabledMap.get(e.getAdjustable())) @@ -124,4 +125,5 @@ // view.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { switch(e.getStateChange()) { @@ -142,4 +144,5 @@ observable.addObserver( new Observer() { + @Override public void update(Observable o, Object arg) { boolean sync = isParticipatingInSynchronizedScrolling(adjustable); Index: /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 6084) @@ -281,4 +281,5 @@ } + @Override public void update(Observable o, Object arg) { refresh(); @@ -294,4 +295,5 @@ } + @Override protected void build() { setLayout(new GridBagLayout()); @@ -319,4 +321,5 @@ } + @Override protected void refresh() { HistoryOsmPrimitive p = getPrimitive(); Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 6084) @@ -122,4 +122,5 @@ /* interface HistoryDataSetListener */ /* ---------------------------------------------------------------------------------- */ + @Override public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) { if (primitiveId == null || primitiveId.equals(browser.getHistory().getPrimitiveId())) { @@ -128,4 +129,5 @@ } + @Override public void historyDataSetCleared(HistoryDataSet source) { closeAction.run(); @@ -146,4 +148,5 @@ } + @Override public void actionPerformed(ActionEvent e) { run(); @@ -158,4 +161,5 @@ } + @Override public void actionPerformed(ActionEvent e) { HistoryLoadTask task = new HistoryLoadTask(); Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6084) @@ -124,7 +124,10 @@ /* 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: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 6084) @@ -682,4 +682,5 @@ /* DataSetListener */ /* ---------------------------------------------------------------------- */ + @Override public void nodeMoved(NodeMovedEvent event) { Node node = event.getNode(); @@ -689,4 +690,5 @@ } + @Override public void primitivesAdded(PrimitivesAddedEvent event) { for (OsmPrimitive p: event.getPrimitives()) { @@ -697,4 +699,5 @@ } + @Override public void primitivesRemoved(PrimitivesRemovedEvent event) { for (OsmPrimitive p: event.getPrimitives()) { @@ -705,4 +708,5 @@ } + @Override public void relationMembersChanged(RelationMembersChangedEvent event) { Relation r = event.getRelation(); @@ -712,4 +716,5 @@ } + @Override public void tagsChanged(TagsChangedEvent event) { OsmPrimitive prim = event.getPrimitive(); @@ -719,4 +724,5 @@ } + @Override public void wayNodesChanged(WayNodesChangedEvent event) { Way way = event.getChangedWay(); @@ -726,4 +732,5 @@ } + @Override public void dataChanged(DataChangedEvent event) { OsmPrimitive primitive = event.getDataset().getPrimitiveById(history.getId(), history.getType()); @@ -738,4 +745,5 @@ } + @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) { // Irrelevant @@ -745,4 +753,5 @@ /* LayerChangeListener */ /* ---------------------------------------------------------------------- */ + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { if (oldLayer != null && oldLayer instanceof OsmDataLayer) { @@ -768,5 +777,7 @@ } + @Override public void layerAdded(Layer newLayer) {} + @Override public void layerRemoved(Layer oldLayer) {} @@ -778,4 +789,5 @@ private HistoryOsmPrimitive clone; + @Override public void visit(Node n) { clone = new HistoryNode(n.getId(), n.getVersion(), n.isVisible(), getCurrentUser(), 0, null, n.getCoor(), false); @@ -783,4 +795,5 @@ } + @Override public void visit(Relation r) { clone = new HistoryRelation(r.getId(), r.getVersion(), r.isVisible(), getCurrentUser(), 0, null, false); @@ -792,4 +805,5 @@ } + @Override public void visit(Way w) { clone = new HistoryWay(w.getId(), w.getVersion(), w.isVisible(), getCurrentUser(), 0, null, false); Index: /trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 6084) @@ -47,4 +47,5 @@ // 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: /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 6084) @@ -202,4 +202,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; @@ -248,4 +249,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (!isEnabled()) return; @@ -263,4 +265,5 @@ } Runnable r = new Runnable() { + @Override public void run() { final History h = HistoryDataSet.getInstance().getHistory(primitiveId); Index: /trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 6084) @@ -76,4 +76,5 @@ // 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: /trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (revision 6084) @@ -26,4 +26,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { DefaultListSelectionModel referenceModel = (DefaultListSelectionModel)e.getSource(); Index: /trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 6084) @@ -75,4 +75,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 6084) @@ -133,4 +133,5 @@ } + @Override public void update(Observable o, Object arg) { lblInfo.setText(getInfoText()); Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 6084) @@ -82,4 +82,5 @@ } + @Override public void update(Observable o, Object arg) { repaint(); @@ -164,4 +165,5 @@ 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); @@ -196,4 +198,5 @@ } + @Override public void itemStateChanged(ItemEvent e) { fireEditingStopped(); @@ -205,4 +208,5 @@ setHorizontalAlignment(hAlignment); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) { String v = value.toString(); Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (revision 6084) @@ -88,4 +88,5 @@ * Runs the task */ + @Override public abstract void run(); Index: /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (revision 6084) @@ -40,4 +40,5 @@ private ActionListener al = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { fireEditingStopped(); @@ -60,4 +61,5 @@ b.addActionListener(al); am.put(b.getText(), new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { b.setSelected(!b.isSelected()); @@ -85,4 +87,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { updateCheckboxes(value); @@ -90,4 +93,5 @@ } + @Override public void addCellEditorListener(CellEditorListener l) { if (l != null) { @@ -108,8 +112,10 @@ } + @Override public void cancelCellEditing() { fireEditingCanceled(); } + @Override public Object getCellEditorValue() { boolean[] values = new boolean[2]; @@ -119,16 +125,20 @@ } + @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(); @@ -136,4 +146,5 @@ } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { updateCheckboxes(value); Index: /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 6084) @@ -60,4 +60,5 @@ hcbUploadComment.getEditor().addActionListener( new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { changesetCommentModel.setComment(hcbUploadComment.getText()); @@ -101,4 +102,5 @@ hcbUploadComment.getEditor().getEditorComponent().addKeyListener( new KeyListener() { + @Override public void keyTyped(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_TAB) { @@ -106,6 +108,8 @@ } } + @Override public void keyReleased(KeyEvent e) {} + @Override public void keyPressed(KeyEvent e) {} } @@ -151,4 +155,5 @@ */ class ChangesetCommentObserver implements Observer { + @Override public void update(Observable o, Object arg) { if (!(o instanceof ChangesetCommentModel)) return; Index: /trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 6084) @@ -41,4 +41,5 @@ } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Index: /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6084) @@ -222,12 +222,15 @@ /* Interface ListDataListener */ /* ---------------------------------------------------------------------------- */ + @Override public void contentsChanged(ListDataEvent e) { refreshGUI(); } + @Override public void intervalAdded(ListDataEvent e) { refreshGUI(); } + @Override public void intervalRemoved(ListDataEvent e) { refreshGUI(); @@ -240,4 +243,5 @@ */ class ChangesetListItemStateListener implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem(); @@ -255,4 +259,5 @@ */ class CloseAfterUploadItemStateListener implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { if (e.getItemSelectable() != cbCloseAfterUpload) @@ -276,4 +281,5 @@ */ class RadioButtonHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { if (rbUseNew.isSelected()) { @@ -304,4 +310,5 @@ } + @Override public void actionPerformed(ActionEvent e) { DownloadOpenChangesetsTask task = new DownloadOpenChangesetsTask(ChangesetManagementPanel.this); @@ -322,4 +329,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem(); @@ -337,4 +345,5 @@ } + @Override public void itemStateChanged(ItemEvent e) { refreshEnabledState(); Index: /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 6084) @@ -122,4 +122,5 @@ } + @Override public void actionPerformed(ActionEvent e) { setCanceled(false); @@ -131,4 +132,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { refreshEnabledState(); @@ -149,4 +151,5 @@ } + @Override public void actionPerformed(ActionEvent e) { cancel(); Index: /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 6084) @@ -59,4 +59,5 @@ SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { ChangesetCache.getInstance().update(closedChangesets); Index: /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (revision 6084) @@ -81,4 +81,5 @@ } GuiHelper.runInEDTAndWait(new Runnable() { + @Override public void run() { layer.mergeFrom(ds); Index: /trunk/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java (revision 6084) @@ -69,4 +69,5 @@ } + @Override public void addCellEditorListener(CellEditorListener l) { if (l != null) { @@ -87,24 +88,30 @@ } + @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("")) { @@ -126,4 +133,5 @@ } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { SaveLayerInfo info = (SaveLayerInfo)value; @@ -139,4 +147,5 @@ } + @Override public void actionPerformed(ActionEvent e) { File f = SaveActionBase.createAndOpenSaveFileChooser(tr("Select filename"), "osm"); Index: /trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 6084) @@ -76,4 +76,5 @@ /** renderer used while not editing the file path **/ + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { @@ -93,4 +94,5 @@ /** renderer used while the file path is being edited **/ + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { @@ -178,4 +180,5 @@ } + @Override public void addCellEditorListener(CellEditorListener l) { if (l != null) { @@ -196,24 +199,30 @@ } + @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("")) { @@ -232,4 +241,5 @@ } + @Override public void actionPerformed(ActionEvent e) { File f = SaveActionBase.createAndOpenSaveFileChooser(tr("Select filename"), "osm"); Index: /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 6084) @@ -62,4 +62,5 @@ /* ChangesetCacheListener */ /* ------------------------------------------------------------------------------------ */ + @Override public void changesetCacheUpdated(ChangesetCacheEvent event) { refresh(); Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 6084) @@ -117,4 +117,5 @@ } + @Override public int compareTo(SaveLayerInfo o) { if (isDoSaveAndUpload()) { Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 6084) @@ -325,4 +325,5 @@ } + @Override public void actionPerformed(ActionEvent e) { cancel(); @@ -347,8 +348,10 @@ } + @Override public void actionPerformed(ActionEvent e) { setUserAction(UserAction.PROCEED); closeDialog(); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { @@ -405,4 +408,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (! confirmSaveLayerInfosOK()) @@ -411,4 +415,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { @@ -550,4 +555,5 @@ } + @Override public void run() { model.setMode(SaveLayersModel.Mode.UPLOADING_AND_SAVING); Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 6084) @@ -65,4 +65,5 @@ layerInfo, new Comparator() { + @Override public int compare(SaveLayerInfo o1, SaveLayerInfo o2) { return o1.compareTo(o2); Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java (revision 6084) @@ -19,4 +19,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 6084) @@ -31,4 +31,5 @@ } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (revision 6084) @@ -121,4 +121,5 @@ /* Interface TableChangeListener */ /* -------------------------------------------------------------------------- */ + @Override public void tableChanged(TableModelEvent e) { String uploadComment = getUploadComment(); @@ -132,4 +133,5 @@ */ class ChangesetCommentObserver implements Observer { + @Override public void update(Observable o, Object arg) { if (!(o instanceof ChangesetCommentModel)) return; Index: /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 6084) @@ -79,4 +79,5 @@ } GuiHelper.runInEDTAndWait(new Runnable() { + @Override public void run() { layer.mergeFrom(ds); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java (revision 6084) @@ -55,4 +55,5 @@ } + @Override public void setCustomText(String message) { lblCustomText.setText(message); @@ -60,4 +61,5 @@ } + @Override public void setIndeterminate(boolean indeterminate) { progressBar.setIndeterminate(indeterminate); @@ -65,4 +67,5 @@ } + @Override public void setMaximum(int maximum) { progressBar.setMaximum(maximum); @@ -70,4 +73,5 @@ } + @Override public void setTaskTitle(String taskTitle) { lblTaskTitle.setText(taskTitle); @@ -75,4 +79,5 @@ } + @Override public void setValue(int value) { progressBar.setValue(value); @@ -80,4 +85,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6084) @@ -214,7 +214,9 @@ pnlBasicUploadSettings.getUploadParameterSummaryPanel().setConfigurationParameterRequestListener( new ConfigurationParameterRequestHandler() { + @Override public void handleUploadStrategyConfigurationRequest() { tpConfigPanels.setSelectedIndex(3); } + @Override public void handleChangesetConfigurationRequest() { tpConfigPanels.setSelectedIndex(2); @@ -225,4 +227,5 @@ pnlBasicUploadSettings.setUploadCommentDownFocusTraversalHandler( new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { btnUpload.requestFocusInWindow(); @@ -440,4 +443,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (getUploadComment().trim().length() < 10) { @@ -473,4 +477,5 @@ } + @Override public void actionPerformed(ActionEvent e) { setCanceled(true); @@ -506,4 +511,5 @@ /* Interface PropertyChangeListener */ /* -------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) { @@ -520,4 +526,5 @@ /* Interface PreferenceChangedListener */ /* -------------------------------------------------------------------------- */ + @Override public void preferenceChanged(PreferenceChangeEvent e) { if (e.getKey() == null || ! e.getKey().equals("osm-server.url")) Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 6084) @@ -183,4 +183,5 @@ /* Interface HyperlinkListener /* --------------------------------------------------------------------- */ + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { @@ -198,4 +199,5 @@ /* Interface PropertyChangeListener /* --------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) { Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 6084) @@ -221,4 +221,5 @@ // Runnable r = new Runnable() { + @Override public void run() { layer.cleanupAfterUpload(processedPrimitives); @@ -318,4 +319,5 @@ // - to map editing GuiHelper.runInEDT(new Runnable() { + @Override public void run() { // if the changeset is still open after this upload we want it to Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 6084) @@ -210,4 +210,5 @@ new Comparator() { private DefaultNameFormatter formatter = DefaultNameFormatter.getInstance(); + @Override public int compare(OsmPrimitive o1, OsmPrimitive o2) { int ret = OsmPrimitiveType.from(o1).compareTo(OsmPrimitiveType.from(o2)); @@ -233,4 +234,5 @@ } + @Override public Object getElementAt(int index) { if (data == null) @@ -239,4 +241,5 @@ } + @Override public int getSize() { if (data == null) @@ -270,4 +273,5 @@ } + @Override public void actionPerformed(ActionEvent e) { setCanceled(true); @@ -284,4 +288,5 @@ } + @Override public void actionPerformed(ActionEvent e) { setCanceled(false); @@ -294,4 +299,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6084) @@ -374,4 +374,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals(UploadedObjectsSummaryPanel.NUM_OBJECTS_TO_UPLOAD_PROP)) { @@ -381,4 +382,5 @@ static class TextFieldFocusHandler implements FocusListener { + @Override public void focusGained(FocusEvent e) { Component c = e.getComponent(); @@ -388,4 +390,5 @@ } } + @Override public void focusLost(FocusEvent e) {} } @@ -426,16 +429,20 @@ } + @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 @@ -454,4 +461,5 @@ } + @Override public void itemStateChanged(ItemEvent e) { UploadStrategy strategy = getUploadStrategy(); @@ -468,10 +476,13 @@ } + @Override public void focusGained(FocusEvent arg0) {} + @Override public void focusLost(FocusEvent arg0) { notifyStrategy(); } + @Override public void actionPerformed(ActionEvent arg0) { notifyStrategy(); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 6084) @@ -174,4 +174,5 @@ } + @Override public Object getElementAt(int index) { if (primitives == null) return null; @@ -179,4 +180,5 @@ } + @Override public int getSize() { if (primitives == null) return 0; Index: /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6084) @@ -379,4 +379,5 @@ } + @Override public void actionPerformed(ActionEvent e) { SaveAction.getInstance().doSave(layer); @@ -394,4 +395,5 @@ } + @Override public void actionPerformed(ActionEvent e) { SaveAsAction.getInstance().doSave(layer); @@ -409,4 +411,5 @@ } + @Override public void actionPerformed(ActionEvent e) { new GpxExportAction().export(layer); Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6084) @@ -138,4 +138,5 @@ public int deletedRelations; + @Override public void visit(final Node n) { nodes++; @@ -145,4 +146,5 @@ } + @Override public void visit(final Way w) { ways++; @@ -152,4 +154,5 @@ } + @Override public void visit(final Relation r) { relations++; @@ -598,4 +601,5 @@ putValue("help", ht("/Action/ConvertToGpxLayer")); } + @Override public void actionPerformed(ActionEvent e) { Main.main.addLayer(new GpxLayer(toGpxData(), tr("Converted from: {0}", getName()))); @@ -694,4 +698,5 @@ } + @Override public void actionPerformed(ActionEvent e) { String result = DatasetConsistencyTest.runTests(data); @@ -716,4 +721,5 @@ } + @Override public void processDatasetEvent(AbstractDatasetChangedEvent event) { isChanged = true; @@ -722,4 +728,5 @@ } + @Override public void selectionChanged(Collection newSelection) { isChanged = true; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6084) @@ -134,4 +134,5 @@ private class LoadGpxDataActionListener implements ActionListener { + @Override public void actionPerformed(ActionEvent arg0) { FileFilter filter = new FileFilter(){ @@ -229,4 +230,5 @@ JList imgList; + @Override public void actionPerformed(ActionEvent arg0) { SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); @@ -329,8 +331,10 @@ 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(); @@ -340,4 +344,5 @@ imgList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent arg0) { int index = imgList.getSelectedIndex(); @@ -368,4 +373,5 @@ openButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent arg0) { JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null, JpegFileFilter.getInstance(), JFileChooser.FILES_ONLY, "geoimage.lastdirectory"); @@ -441,4 +447,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { // Construct the list of loaded GPX tracks @@ -771,15 +778,20 @@ } + @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(); @@ -829,7 +841,9 @@ 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(); @@ -842,4 +856,5 @@ private class AdjustActionListener implements ActionListener { + @Override public void actionPerformed(ActionEvent arg0) { @@ -892,4 +907,5 @@ // 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 @@ -975,4 +991,5 @@ private class AutoGuessActionListener implements ActionListener { + @Override public void actionPerformed(ActionEvent arg0) { GpxDataWrapper gpxW = selectedGPX(true); @@ -1096,4 +1113,5 @@ Collections.sort(dateImgLst, new Comparator() { + @Override public int compare(ImageEntry arg0, ImageEntry arg1) { return arg0.getExifTime().compareTo(arg1.getExifTime()); Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 6084) @@ -764,4 +764,5 @@ mapModeListener = new MapModeChangeListener() { + @Override public void mapModeChange(MapMode oldMapMode, MapMode newMapMode) { if (newMapMode == null || (newMapMode instanceof org.openstreetmap.josm.actions.mapmode.SelectAction)) { @@ -777,4 +778,5 @@ MapView.addLayerChangeListener(new LayerChangeListener() { + @Override public void activeLayerChange(Layer oldLayer, Layer newLayer) { if (newLayer == GeoImageLayer.this) { @@ -784,7 +786,9 @@ } + @Override public void layerAdded(Layer newLayer) { } + @Override public void layerRemoved(Layer oldLayer) { if (oldLayer == GeoImageLayer.this) { @@ -810,4 +814,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (NavigatableComponent.PROPNAME_CENTER.equals(evt.getPropertyName()) || NavigatableComponent.PROPNAME_SCALE.equals(evt.getPropertyName())) { @@ -843,8 +848,10 @@ } + @Override public void jumpToNextMarker() { showNextPhoto(); } + @Override public void jumpToPreviousMarker() { showPreviousPhoto(); Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 6084) @@ -67,4 +67,5 @@ } + @Override public void run() { Image img = Toolkit.getDefaultToolkit().createImage(file.getPath()); @@ -160,4 +161,5 @@ /** 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; @@ -232,4 +234,5 @@ /** Center the display on the point that has been clicked */ + @Override public void mouseClicked(MouseEvent e) { // Move the center to the clicked point. @@ -269,4 +272,5 @@ /** 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) { @@ -303,4 +307,5 @@ } + @Override public void mouseDragged(MouseEvent e) { if (! mouseIsDragging && selectedRect == null) @@ -351,4 +356,5 @@ } + @Override public void mouseReleased(MouseEvent e) { if (! mouseIsDragging && selectedRect == null) @@ -414,10 +420,13 @@ } + @Override public void mouseEntered(MouseEvent e) { } + @Override public void mouseExited(MouseEvent e) { } + @Override public void mouseMoved(MouseEvent e) { } Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 6084) @@ -136,4 +136,5 @@ } + @Override public int compareTo(ImageEntry image) { if (exifTime != null && image.exifTime != null) Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 6084) @@ -168,4 +168,5 @@ } + @Override public void actionPerformed(ActionEvent e) { if (COMMAND_NEXT.equals(action)) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 6084) @@ -35,4 +35,5 @@ } + @Override public void run() { System.err.println("Load Thumbnails"); Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (revision 6084) @@ -43,4 +43,5 @@ } + @Override public void actionPerformed(ActionEvent e) { final List points = new ArrayList(); Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (revision 6084) @@ -55,4 +55,5 @@ p.add(p2, BorderLayout.SOUTH); scale.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent ev) { p.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 6084) @@ -343,4 +343,5 @@ } + @Override public void jumpToNextMarker() { if (currentMarker == null) { @@ -360,4 +361,5 @@ } + @Override public void jumpToPreviousMarker() { if (currentMarker == null) { @@ -462,4 +464,5 @@ + @Override public void actionPerformed(ActionEvent e) { Main.pref.put("marker.show "+layer.getName(), layer.isTextOrIconShown() ? "hide" : "show"); Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6084) @@ -287,4 +287,5 @@ 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: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6084) @@ -51,4 +51,5 @@ } + @Override protected void init() { super.init(); @@ -90,4 +91,5 @@ } + @Override public InputStream getSourceInputStream() throws IOException { MirroredInputStream in = new MirroredInputStream(url); Index: /trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 6084) @@ -281,4 +281,5 @@ private boolean enabled; + @Override public void itemStateChanged(ItemEvent e) { if (!enabled) return; Index: /trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 6084) @@ -76,4 +76,5 @@ } + @Override public Component getListCellRendererComponent(JList list, Object value, int idx, boolean isSelected, boolean hasFocus) { AuthorizationProcedure procedure = (AuthorizationProcedure)value; Index: /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 6084) @@ -340,4 +340,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { Main.worker.submit(new FullyAutomaticAuthorisationTask(FullyAutomaticAuthorizationUI.this)); @@ -348,12 +349,15 @@ } + @Override public void changedUpdate(DocumentEvent e) { updateEnabledState(); } + @Override public void insertUpdate(DocumentEvent e) { updateEnabledState(); } + @Override public void removeUpdate(DocumentEvent e) { updateEnabledState(); @@ -371,4 +375,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { prepareUIForEnteringRequest(); @@ -386,4 +391,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { Main.worker.submit(new TestAccessTokenTask( @@ -511,4 +517,5 @@ protected void handleException(final OsmOAuthAuthorizationException e) { Runnable r = new Runnable() { + @Override public void run() { if (e instanceof OsmLoginFailedException) { @@ -550,4 +557,5 @@ if (canceled)return; GuiHelper.runInEDT(new Runnable() { + @Override public void run() { prepareUIForResultDisplay(); Index: /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6084) @@ -225,12 +225,15 @@ } } + @Override public void changedUpdate(DocumentEvent e) { build(); } + @Override public void insertUpdate(DocumentEvent e) { build(); } + @Override public void removeUpdate(DocumentEvent e) { build(); @@ -249,4 +252,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { TestAccessTokenTask task = new TestAccessTokenTask( @@ -263,4 +267,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (! evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP)) Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 6084) @@ -176,13 +176,17 @@ 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) {} } @@ -306,4 +310,5 @@ class AuthorisationProcedureChangeListener implements ItemListener { + @Override public void itemStateChanged(ItemEvent arg0) { refreshAuthorisationProcedurePanel(); @@ -323,4 +328,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { cancel(); @@ -338,4 +344,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { setCanceled(false); @@ -347,4 +354,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (!evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP)) @@ -363,4 +371,5 @@ static class ExternalBrowserLauncher implements HyperlinkListener { + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) { Index: /trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 6084) @@ -128,4 +128,5 @@ cbShowAdvancedParameters.addItemListener( new ItemListener() { + @Override public void itemStateChanged(ItemEvent evt) { getAdvancedPropertiesPanel().setVisible(evt.getStateChange() == ItemEvent.SELECTED); @@ -285,4 +286,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { transitionToRetrieveRequestToken(); @@ -359,4 +361,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { transitionToRetrieveRequestToken(); @@ -380,4 +383,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { final RetrieveRequestTokenTask task = new RetrieveRequestTokenTask( @@ -387,4 +391,5 @@ Main.worker.submit(task); Runnable r = new Runnable() { + @Override public void run() { if (task.isCanceled()) return; @@ -392,4 +397,5 @@ requestToken = task.getRequestToken(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { transitionToRetrieveAccessToken(); @@ -413,4 +419,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { final RetrieveAccessTokenTask task = new RetrieveAccessTokenTask( @@ -421,4 +428,5 @@ Main.worker.submit(task); Runnable r = new Runnable() { + @Override public void run() { if (task.isCanceled()) return; @@ -426,4 +434,5 @@ setAccessToken(task.getAccessToken()); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { transitionToShowAccessToken(); @@ -447,4 +456,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { TestAccessTokenTask task = new TestAccessTokenTask( Index: /trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (revision 6084) @@ -30,4 +30,5 @@ public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new AudioPreference(); @@ -55,4 +56,5 @@ private JosmTextField audioCalibration = new JosmTextField(8); + @Override public void addGui(PreferenceTabbedPane gui) { JPanel audio = new JPanel(new GridBagLayout()); @@ -125,4 +127,5 @@ } + @Override public boolean ok() { Main.pref.put("audio.menuinvisible", ! audioMenuVisible.isSelected()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 6084) @@ -56,4 +56,5 @@ public class PluginPreference extends DefaultTabPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new PluginPreference(); @@ -171,4 +172,5 @@ } + @Override public void addGui(final PreferenceTabbedPane gui) { GridBagConstraints gc = new GridBagConstraints(); @@ -225,4 +227,5 @@ } + @Override public boolean ok() { if (! pluginPreferencesActivated) @@ -247,7 +250,9 @@ 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()); @@ -273,10 +278,13 @@ } + @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()); @@ -330,4 +338,5 @@ try { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { HelpAwareOptionPane.showOptionDialog( @@ -345,4 +354,5 @@ } + @Override public void actionPerformed(ActionEvent e) { final List toUpdate = model.getSelectedPlugins(); @@ -359,4 +369,5 @@ // final Runnable pluginDownloadContinuation = new Runnable() { + @Override public void run() { if (pluginDownloadTask.isCanceled()) @@ -376,4 +387,5 @@ // final Runnable pluginInfoDownloadContinuation = new Runnable() { + @Override public void run() { if (pluginInfoDownloadTask.isCanceled()) @@ -416,4 +428,5 @@ } + @Override public void actionPerformed(ActionEvent e) { configureSites(); @@ -435,12 +448,15 @@ } + @Override public void changedUpdate(DocumentEvent arg0) { filter(); } + @Override public void insertUpdate(DocumentEvent arg0) { filter(); } + @Override public void removeUpdate(DocumentEvent arg0) { filter(); @@ -463,4 +479,5 @@ JPanel buttons = new JPanel(new GridBagLayout()); buttons.add(new JButton(new AbstractAction(tr("Add")){ + @Override public void actionPerformed(ActionEvent e) { String s = JOptionPane.showInputDialog( @@ -476,4 +493,5 @@ }), GBC.eol().fill(GBC.HORIZONTAL)); buttons.add(new JButton(new AbstractAction(tr("Edit")){ + @Override public void actionPerformed(ActionEvent e) { if (list.getSelectedValue() == null) { @@ -501,4 +519,5 @@ }), GBC.eol().fill(GBC.HORIZONTAL)); buttons.add(new JButton(new AbstractAction(tr("Delete")){ + @Override public void actionPerformed(ActionEvent event) { if (list.getSelectedValue() == null) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 6084) @@ -48,4 +48,5 @@ expert.setSelected(ExpertToggleAction.isExpert()); expert.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ExpertToggleAction.getInstance().actionPerformed(null); @@ -152,4 +153,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { cancel(); @@ -164,4 +166,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { for (ValidationListener listener: tpPreferences.validationListeners) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6084) @@ -267,4 +267,5 @@ // final Runnable continuation = new Runnable() { + @Override public void run() { boolean requiresRestart = false; @@ -332,4 +333,5 @@ Main.worker.submit( new Runnable() { + @Override public void run() { SwingUtilities.invokeLater(continuation); @@ -471,4 +473,5 @@ * 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 Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (revision 6084) @@ -21,4 +21,5 @@ public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new ServerAccessPreference(); @@ -106,4 +107,5 @@ } + @Override public void addGui(PreferenceTabbedPane gui) { GridBagConstraints gc = new GridBagConstraints(); @@ -129,4 +131,5 @@ * Saves the values to the preferences */ + @Override public boolean ok() { pnlApiUrlPreferences.saveToPreferences(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6084) @@ -484,8 +484,10 @@ } + @Override public int getColumnCount() { return isMapPaint ? 2 : 1; } + @Override public int getRowCount() { return data == null ? 0 : data.size(); @@ -748,4 +750,5 @@ } + @Override public void actionPerformed(ActionEvent e) { FileFilter ff; @@ -788,4 +791,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { EditSourceEntryDialog editEntryDialog = new EditSourceEntryDialog( @@ -820,8 +824,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { activeSourcesModel.removeSelected(); @@ -841,8 +847,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent evt) { int pos = tblActiveSources.getSelectedRow(); @@ -892,8 +900,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void tableChanged(TableModelEvent e) { updateEnabledState(); @@ -912,8 +922,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { List sources = availableSourcesModel.getSelected(); @@ -961,4 +973,5 @@ } + @Override public void actionPerformed(ActionEvent e) { activeSourcesModel.setActiveSources(getDefault()); @@ -977,4 +990,5 @@ } + @Override public void actionPerformed(ActionEvent e) { MirroredInputStream.cleanup(url); @@ -992,12 +1006,15 @@ } + @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); @@ -1064,4 +1081,5 @@ data, new Comparator() { + @Override public int compare(String o1, String o2) { if (o1.equals("") && o2.equals("")) @@ -1087,4 +1105,5 @@ } + @Override public void actionPerformed(ActionEvent e) { iconPathsModel.addPath(""); @@ -1105,8 +1124,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { iconPathsModel.removeSelected(); @@ -1126,8 +1147,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { int row = tblIconPaths.getSelectedRow(); @@ -1137,4 +1160,5 @@ static class SourceEntryListCellRenderer extends JLabel implements ListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -1358,4 +1382,5 @@ } + @Override public void addCellEditorListener(CellEditorListener l) { if (l != null) { @@ -1376,12 +1401,15 @@ } + @Override public void cancelCellEditing() { fireEditingCanceled(); } + @Override public Object getCellEditorValue() { return value; } + @Override public boolean isCellEditable(EventObject anEvent) { if (anEvent instanceof MouseEvent) @@ -1390,12 +1418,15 @@ } + @Override public void removeCellEditorListener(CellEditorListener l) { listeners.remove(l); } + @Override public boolean shouldSelectCell(EventObject anEvent) { return true; } + @Override public boolean stopCellEditing() { value = tfFileName.getText(); @@ -1413,4 +1444,5 @@ } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { setInitialValue((String)value); @@ -1451,4 +1483,5 @@ } + @Override public void actionPerformed(ActionEvent e) { JFileChooserManager fcm = new JFileChooserManager(true).createFileChooser(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java (revision 6084) @@ -96,4 +96,5 @@ ActionListener otherUploadEnabled = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { prefOtherUpload.setEnabled(prefOther.isSelected()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 6084) @@ -105,8 +105,10 @@ class EntryListModel extends AbstractListModel { + @Override public Object getElementAt(int index) { return (index+1) + ": " + data.get(index).toString(); } + @Override public int getSize() { return data.size(); @@ -131,4 +133,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { entryModel.add(new ArrayList()); @@ -148,8 +151,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { int idx = entryList.getSelectedIndices()[0]; @@ -159,4 +164,5 @@ class EntryListener implements ListSelectionListener { + @Override public void valueChanged(ListSelectionEvent e) { TableCellEditor editor = table.getCellEditor(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 6084) @@ -127,8 +127,10 @@ class EntryListModel extends AbstractListModel { + @Override public Object getElementAt(int index) { return tr("Entry {0}", index+1); } + @Override public int getSize() { return dataKeys.size(); @@ -155,4 +157,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { entryModel.add(); @@ -172,8 +175,10 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); } + @Override public void actionPerformed(ActionEvent e) { int idx = entryList.getSelectedIndices()[0]; @@ -183,4 +188,5 @@ class EntryListener implements ListSelectionListener { + @Override public void valueChanged(ListSelectionEvent e) { TableCellEditor editor = table.getCellEditor(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 6084) @@ -52,4 +52,5 @@ public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new ColorPreference(); @@ -141,4 +142,5 @@ } + @Override public void addGui(final PreferenceTabbedPane gui) { fixColorPrefixes(); @@ -147,4 +149,5 @@ colorEdit = new JButton(tr("Choose")); colorEdit.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { int sel = colors.getSelectedRow(); @@ -162,4 +165,5 @@ defaultSet = new JButton(tr("Set to default")); defaultSet.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { int sel = colors.getSelectedRow(); @@ -173,4 +177,5 @@ 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) @@ -186,4 +191,5 @@ remove = new JButton(tr("Remove")); remove.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { int sel = colors.getSelectedRow(); @@ -211,4 +217,5 @@ 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) @@ -262,4 +269,5 @@ } + @Override public boolean ok() { Boolean ret = false; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java (revision 6084) @@ -14,4 +14,5 @@ public class DisplayPreference extends DefaultTabPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new DisplayPreference(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 6084) @@ -27,4 +27,5 @@ public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new DrawingPreference(); @@ -48,4 +49,5 @@ private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas")); + @Override public void addGui(PreferenceTabbedPane gui) { //gui.display.setPreferredSize(new Dimension(400,600)); @@ -62,4 +64,5 @@ // directionHint directionHint.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { if (directionHint.isSelected()){ @@ -155,4 +158,5 @@ } + @Override public boolean ok() { gpxPanel.savePreferences(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 6084) @@ -128,4 +128,5 @@ drawRawGpsLinesActionListener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { boolean f=drawRawGpsLinesNone.isSelected()||drawRawGpsLinesGlobal.isSelected(); @@ -167,4 +168,5 @@ // drawGpsArrows drawGpsArrows.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { drawGpsArrowsFast.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled()); @@ -216,4 +218,5 @@ colorTypeVelocity.addChangeListener(new ChangeListener(){ + @Override public void stateChanged(ChangeEvent e) { colorTypeVelocityTune.setEnabled(colorTypeVelocity.isSelected()); @@ -222,4 +225,5 @@ }); colorTypeDilution.addChangeListener(new ChangeListener(){ + @Override public void stateChanged(ChangeEvent e) { colorDynamic.setEnabled(colorTypeVelocity.isSelected() || colorTypeDilution.isSelected()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 6084) @@ -32,4 +32,5 @@ public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new LafPreference(); @@ -48,4 +49,5 @@ private JCheckBox dynamicButtons = new JCheckBox(tr("Dynamic buttons in side menus")); + @Override public void addGui(PreferenceTabbedPane gui) { lafCombo = new JosmComboBox(UIManager.getInstalledLookAndFeels()); @@ -119,4 +121,5 @@ } + @Override public boolean ok() { boolean mod = false; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 6084) @@ -30,4 +30,5 @@ public class LanguagePreference implements SubPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new LanguagePreference(); @@ -40,4 +41,5 @@ private LanguageComboBoxModel model; + @Override public void addGui(final PreferenceTabbedPane gui) { model = new LanguageComboBoxModel(); @@ -59,4 +61,5 @@ } + @Override public boolean ok() { if(langCombo.getSelectedItem() == null) Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 6084) @@ -94,4 +94,5 @@ } + @Override protected boolean isImageryValid() { return !getImageryName().isEmpty() && !getTmsUrl().isEmpty(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 6084) @@ -166,4 +166,5 @@ } + @Override protected boolean isImageryValid() { if (getImageryName().isEmpty()) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 6084) @@ -427,4 +427,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { final AddImageryPanel p; @@ -552,4 +553,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { layerInfo.loadDefaults(true); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java (revision 6084) @@ -85,4 +85,5 @@ ActionListener autosaveEnabled = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { boolean enabled = autosave.isSelected(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6084) @@ -48,4 +48,5 @@ public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new MapPaintPreference(); @@ -53,4 +54,5 @@ } + @Override public void addGui(final PreferenceTabbedPane gui) { enableIconDefault = new JCheckBox(tr("Enable built-in icon defaults"), @@ -72,4 +74,5 @@ gui.getMapPreference().getTabPane().addChangeListener( new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { if (gui.getMapPreference().getTabPane().getSelectedComponent() == panel) { @@ -160,4 +163,5 @@ } + @Override public boolean ok() { boolean reload = Main.pref.put("mappaint.icon.enable-defaults", enableIconDefault.isSelected()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java (revision 6084) @@ -14,4 +14,5 @@ public class MapPreference extends DefaultTabPreferenceSetting { public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new MapPreference(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6084) @@ -174,4 +174,5 @@ gui.getMapPreference().getTabPane().addChangeListener( new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { if (gui.getMapPreference().getTabPane().getSelectedComponent() == panel) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 6084) @@ -122,4 +122,5 @@ } } + @Override public void actionPerformed(ActionEvent e) { // Select/unselect corresponding plugin in the model @@ -228,4 +229,5 @@ description.setText(pi.getDescriptionAsHtml()); description.getEditorPane().addHyperlinkListener(new HyperlinkListener() { + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if(e.getEventType() == EventType.ACTIVATED) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 6084) @@ -144,4 +144,5 @@ availablePlugins, new Comparator() { + @Override public int compare(PluginInformation o1, PluginInformation o2) { String n1 = o1.getName() == null ? "" : o1.getName().toLowerCase(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 6084) @@ -240,4 +240,5 @@ class TimeBasedPolicyChangeListener implements ChangeListener { + @Override public void stateChanged(ChangeEvent e) { lblUpdateInterval.setEnabled(!rbTimeBasedUpatePolicy.get(Policy.NEVER).isSelected()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 6084) @@ -57,4 +57,5 @@ public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new ProjectionPreference(); @@ -287,4 +288,5 @@ static private GBC projSubPrefPanelGBC = GBC.std().fill(GBC.BOTH).weight(1.0, 1.0); + @Override public void addGui(PreferenceTabbedPane gui) { ProjectionChoice pc = setupProjectionCombo(); @@ -450,4 +452,5 @@ projectionCombo.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ProjectionChoice pc = (ProjectionChoice) projectionCombo.getSelectedItem(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (revision 6084) @@ -137,4 +137,5 @@ */ class AuthenticationMethodChangeListener implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { if (rbBasicAuthentication.isSelected()) { @@ -151,4 +152,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (pnlOAuthPreferences != null) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 6084) @@ -69,4 +69,5 @@ cbShowAdvancedParameters.addItemListener( new ItemListener() { + @Override public void itemStateChanged(ItemEvent evt) { pnlAdvancedProperties.setVisible(evt.getStateChange() == ItemEvent.SELECTED); @@ -311,4 +312,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard( @@ -336,4 +338,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard( @@ -362,4 +365,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken(); @@ -375,4 +379,5 @@ } + @Override public void propertyChange(PropertyChangeEvent evt) { if (! evt.getPropertyName().equals(OsmApiUrlInputPanel.API_URL_PROP)) Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 6084) @@ -166,4 +166,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { final String url = tfOsmServerUrl.getText().trim(); @@ -171,8 +172,10 @@ 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()) { @@ -203,12 +206,15 @@ } + @Override public void changedUpdate(DocumentEvent arg0) { updateEnabledState(); } + @Override public void insertUpdate(DocumentEvent arg0) { updateEnabledState(); } + @Override public void removeUpdate(DocumentEvent arg0) { updateEnabledState(); @@ -259,4 +265,5 @@ */ class UseDefaultServerUrlChangeHandler implements ItemListener { + @Override public void itemStateChanged(ItemEvent e) { switch(e.getStateChange()) { @@ -280,4 +287,5 @@ } + @Override public void actionPerformed(ActionEvent e) { propagate(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java (revision 6084) @@ -21,4 +21,5 @@ public static class Factory implements PreferenceSettingFactory { + @Override public PreferenceSetting createPreferenceSetting() { return new ShortcutPreference(); Index: /trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 6084) @@ -65,8 +65,10 @@ =======*/ + @Override public void beginTask(String title) { beginTask(title, DEFAULT_TICKS); } + @Override public synchronized void beginTask(String title, int ticks) { this.taskTitle = title; @@ -78,4 +80,5 @@ } + @Override public synchronized void finishTask() { if (state != State.FINISHED) { @@ -91,4 +94,5 @@ } + @Override public synchronized void invalidate() { if (state == State.INIT) { @@ -98,4 +102,5 @@ } + @Override public synchronized void subTask(final String title) { if (state == State.IN_SUBTASK) { @@ -115,4 +120,5 @@ } + @Override public synchronized void indeterminateSubTask(String title) { if (state == State.IN_SUBTASK) { @@ -132,4 +138,5 @@ } + @Override public synchronized void setCustomText(String text) { if (state == State.IN_SUBTASK) { @@ -141,4 +148,5 @@ } + @Override public synchronized void setExtraText(String text) { if (state == State.IN_SUBTASK) { @@ -153,4 +161,5 @@ * Default implementation is empty. Override in subclasses to display the log messages. */ + @Override public void appendLogMessage(String message) { // do nothing @@ -177,16 +186,20 @@ } + @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); @@ -199,4 +212,5 @@ abstract void updateProgress(double value); + @Override public synchronized void setTicks(int ticks) { if (ticks >= ticksCount) { @@ -207,4 +221,5 @@ } + @Override public synchronized void setTicksCount(int ticks) { this.ticksCount = ticks; @@ -212,4 +227,5 @@ } + @Override public void worked(int ticks) { if (ticks == ALL_TICKS) { @@ -228,8 +244,10 @@ } + @Override public synchronized int getTicks() { return ticks; } + @Override public synchronized int getTicksCount() { return ticksCount; @@ -240,4 +258,5 @@ ==========*/ + @Override public synchronized ProgressMonitor createSubTaskMonitor(int ticks, boolean internal) { if (ticks == ALL_TICKS) { Index: /trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (revision 6084) @@ -14,20 +14,26 @@ } + @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() { } @@ -37,21 +43,27 @@ } + @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) { } @@ -60,7 +72,9 @@ } + @Override public void setExtraText(String text) { } + @Override public void appendLogMessage(String message) { } @@ -69,16 +83,21 @@ } + @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: /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (revision 6084) @@ -116,4 +116,5 @@ private ActionListener cancelListener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { cancel(); @@ -150,4 +151,5 @@ public void doBeginTask() { doInEDT(new Runnable() { + @Override public void run() { Main.currentProgressMonitor = PleaseWaitProgressMonitor.this; @@ -184,4 +186,5 @@ currentProgressValue = newValue; doInEDT(new Runnable() { + @Override public void run() { ProgressMonitorDialog dialog = getDialog(); @@ -199,4 +202,5 @@ this.customText = title; doInEDT(new Runnable() { + @Override public void run() { ProgressMonitorDialog dialog = getDialog(); @@ -213,4 +217,5 @@ this.title = title; doInEDT(new Runnable() { + @Override public void run() { ProgressMonitorDialog dialog = getDialog(); @@ -226,4 +231,5 @@ this.indeterminate = value; doInEDT(new Runnable() { + @Override public void run() { // Enable only if progress is at the beginning. Doing intermediate progress in the middle @@ -240,4 +246,5 @@ public void appendLogMessage(final String message) { doInEDT(new Runnable() { + @Override public void run() { ProgressMonitorDialog dialog = getDialog(); Index: /trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (revision 6084) @@ -34,4 +34,5 @@ public void doBeginTask() { GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setCustomText(""); @@ -52,4 +53,5 @@ currentProgressValue = newValue; GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setValue(currentProgressValue); @@ -63,4 +65,5 @@ checkState(State.IN_TASK, State.IN_SUBTASK); GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setCustomText(title); @@ -73,4 +76,5 @@ checkState(State.IN_TASK, State.IN_SUBTASK); GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setTaskTitle(title); @@ -82,4 +86,5 @@ protected void doSetIntermediate(final boolean value) { GuiHelper.runInEDT(new Runnable() { + @Override public void run() { delegate.setIndeterminate(value); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (revision 6084) @@ -86,4 +86,5 @@ * replies the table cell editor */ + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { @@ -115,4 +116,5 @@ } + @Override public Object getCellEditorValue() { return editor.getText(); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 6084) @@ -82,4 +82,5 @@ * @return the renderer component */ + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int rowIndex, int vColIndex) { Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 6084) @@ -169,6 +169,8 @@ editor.addFocusListener( new FocusListener() { + @Override public void focusLost(FocusEvent e) { } + @Override public void focusGained(FocusEvent e) { // save unix system selection (middle mouse paste) @@ -305,4 +307,5 @@ } + @Override public Component getListCellRendererComponent( JList list, Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 6084) @@ -194,12 +194,15 @@ } + @Override public Component getEditorComponent() { return this; } + @Override public Object getItem() { return getText(); } + @Override public void setItem(Object anObject) { if (anObject == null) { @@ -226,4 +229,5 @@ private String originalValue; + @Override public void addCellEditorListener(CellEditorListener l) { tableCellEditorSupport.addCellEditorListener(l); @@ -238,7 +242,9 @@ } + @Override public void removeCellEditorListener(CellEditorListener l) { tableCellEditorSupport.removeCellEditorListener(l); } + @Override public void cancelCellEditing() { restoreOriginalValue(); @@ -247,16 +253,20 @@ } + @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(); @@ -264,4 +274,5 @@ } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { setText( value == null ? "" : value.toString()); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java (revision 6084) @@ -63,4 +63,5 @@ * 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); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 6084) @@ -276,8 +276,10 @@ } + @Override public int getColumnCount() { return 1; } + @Override public int getRowCount() { @@ -285,4 +287,5 @@ } + @Override public Object getValueAt(int rowIndex, int columnIndex) { return list == null ? null : getFilteredItem(rowIndex); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (revision 6084) @@ -116,4 +116,5 @@ } + @Override public int compareTo(AutoCompletionListItem other) { int ret = other.priority.compareTo(priority); // higher priority items come first in the list Index: /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 6084) @@ -55,4 +55,5 @@ public static void executeByMainWorkerInEDT(final Runnable task) { Main.worker.submit(new Runnable() { + @Override public void run() { runInEDTAndWait(task); @@ -138,4 +139,5 @@ if (pane != null) { pane.addHierarchyListener(new HierarchyListener() { + @Override public void hierarchyChanged(HierarchyEvent e) { Window window = SwingUtilities.getWindowAncestor(pane); Index: /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 6084) @@ -135,6 +135,8 @@ /* interface FocusListener */ /* -------------------------------------------------------------------------------- */ + @Override public void focusGained(FocusEvent arg0) {} + @Override public void focusLost(FocusEvent arg0) { validate(); @@ -144,4 +146,5 @@ /* interface ActionListener */ /* -------------------------------------------------------------------------------- */ + @Override public void actionPerformed(ActionEvent arg0) { validate(); @@ -151,12 +154,15 @@ /* interface DocumentListener */ /* -------------------------------------------------------------------------------- */ + @Override public void changedUpdate(DocumentEvent arg0) { validate(); } + @Override public void insertUpdate(DocumentEvent arg0) { validate(); } + @Override public void removeUpdate(DocumentEvent arg0) { validate(); @@ -166,4 +172,5 @@ /* interface PropertyChangeListener */ /* -------------------------------------------------------------------------------- */ + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals("enabled")) { Index: /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 6084) @@ -203,6 +203,9 @@ 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: /trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (revision 6084) @@ -80,4 +80,5 @@ } + @Override public Iterator iterator() { return new Iterator() { @@ -85,8 +86,10 @@ private int position = -1; + @Override public void remove() { removeElementAt(position); } + @Override public boolean hasNext() { if(position < getSize()-1 && getSize()>0) @@ -95,4 +98,5 @@ } + @Override public AutoCompletionListItem next() { position++; Index: /trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (revision 6084) @@ -167,4 +167,5 @@ } + @Override public void undoableEditHappened(UndoableEditEvent e) { undoManager.addEdit(e.getEdit()); @@ -172,4 +173,5 @@ } + @Override public void actionPerformed(ActionEvent e) { try { Index: /trunk/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java (revision 6084) @@ -35,20 +35,25 @@ } + @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: /trunk/src/org/openstreetmap/josm/io/FileImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 6084) @@ -103,4 +103,5 @@ } + @Override public int compareTo(FileImporter other) { return (new Double(this.getPriority())).compareTo(other.getPriority()); Index: /trunk/src/org/openstreetmap/josm/io/GpxExporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 6084) @@ -242,4 +242,5 @@ ActionListener authorActionListener = new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { boolean b = author.isSelected(); @@ -278,4 +279,5 @@ predefined.addActionListener(new ActionListener(){ + @Override public void actionPerformed(ActionEvent e) { final String[] licenses = { Index: /trunk/src/org/openstreetmap/josm/io/GpxImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/GpxImporter.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/GpxImporter.java (revision 6084) @@ -105,4 +105,5 @@ // FIXME: remove UI stuff from the IO subsystem GuiHelper.runInEDT(new Runnable() { + @Override public void run() { if (data.markerLayer != null) { Index: /trunk/src/org/openstreetmap/josm/io/NMEAImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (revision 6084) @@ -36,4 +36,5 @@ GuiHelper.runInEDT(new Runnable() { + @Override public void run() { Main.main.addLayer(gpxLayer); Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 6084) @@ -296,4 +296,5 @@ GuiHelper.executeByMainWorkerInEDT(new Runnable() { + @Override public void run() { String[] tags = null; Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java (revision 6084) @@ -80,4 +80,5 @@ * The main loop, spawns a {@link RequestProcessor} for each connection */ + @Override public void run() { Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 6084) @@ -132,4 +132,5 @@ * The work is done here. */ + @Override public void run() { Writer out = null; Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (revision 6084) @@ -131,4 +131,5 @@ if (args.containsKey("addtags")) { GuiHelper.executeByMainWorkerInEDT(new Runnable() { + @Override public void run() { DataSet ds = Main.main.getCurrentDataSet(); @@ -144,4 +145,5 @@ // select objects after downloading, zoom to selection. GuiHelper.executeByMainWorkerInEDT(new Runnable() { + @Override public void run() { HashSet newSel = new HashSet(); @@ -195,4 +197,5 @@ if (Main.isDisplayingMapView()) { GuiHelper.executeByMainWorkerInEDT(new Runnable() { + @Override public void run() { BoundingXYVisitor bbox = new BoundingXYVisitor(); Index: /trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java (revision 6084) @@ -107,4 +107,5 @@ link.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { cl.show(cards, "link"); @@ -112,4 +113,5 @@ }); include.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { cl.show(cards, "include"); @@ -127,4 +129,5 @@ export.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.DESELECTED) { Index: /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (revision 6084) @@ -74,4 +74,5 @@ } + @Override public void actionPerformed(ActionEvent e) { SaveAction.getInstance().doSave(layer); @@ -139,4 +140,5 @@ link.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { cl.show(cards, "link"); @@ -144,4 +146,5 @@ }); include.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { cl.show(cards, "include"); @@ -159,4 +162,5 @@ export.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.DESELECTED) { Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6084) @@ -145,4 +145,5 @@ } + @Override public int compareTo(DeprecatedPlugin o) { return name.compareTo(o.name); @@ -575,4 +576,5 @@ toLoad, new Comparator() { + @Override public int compare(PluginInformation o1, PluginInformation o2) { if (o1.stage < o2.stage) return -1; @@ -973,4 +975,5 @@ final File[] files = pluginDir.listFiles(new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.endsWith(".jar.new"); @@ -1199,4 +1202,5 @@ 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(); Index: /trunk/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java (revision 6084) @@ -13,4 +13,5 @@ } + @Override public PreferenceSetting createPreferenceSetting() { return plugin.getPreferenceSetting(); Index: /trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (revision 6084) @@ -74,4 +74,5 @@ File[] siteCacheFiles = pluginsDirectory.listFiles( new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.matches("^([0-9]+-)?site.*\\.txt$"); @@ -99,4 +100,5 @@ File[] siteCacheFiles = pluginsDirectory.listFiles( new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.matches("^([0-9]+-)?site.*plugin-icons\\.zip$"); @@ -127,4 +129,5 @@ File[] pluginFiles = pluginsDirectory.listFiles( new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.endsWith(".jar") || name.endsWith(".jar.new"); Index: /trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 6084) @@ -331,4 +331,5 @@ File [] f = new File(location).listFiles( new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return name.matches("^([0-9]+-)?site.*\\.txt$") || Index: /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 6084) @@ -39,4 +39,5 @@ private static boolean suppressExceptionDialogs = false; + @Override public void uncaughtException(Thread t, Throwable e) { handleException(e); Index: /trunk/src/org/openstreetmap/josm/tools/CopyList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/CopyList.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/tools/CopyList.java (revision 6084) @@ -178,8 +178,10 @@ int expectedModCount = modCount; + @Override public boolean hasNext() { return cursor != size; } + @Override public E next() { checkForComodification(); @@ -194,4 +196,5 @@ } + @Override public void remove() { if (lastRet == -1) Index: /trunk/src/org/openstreetmap/josm/tools/Diff.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 6084) @@ -407,4 +407,5 @@ static class ReverseScript implements ScriptBuilder { + @Override public change build_script( final boolean[] changed0,int len0, @@ -440,4 +441,5 @@ /** 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, Index: /trunk/src/org/openstreetmap/josm/tools/I18n.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 6084) @@ -330,4 +330,5 @@ l = v.toArray(l); Arrays.sort(l, new Comparator() { + @Override public int compare(Locale o1, Locale o2) { return o1.toString().compareTo(o2.toString()); Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6084) @@ -693,4 +693,5 @@ parser.setEntityResolver(new EntityResolver() { + @Override public InputSource resolveEntity (String publicId, String systemId) { return new InputSource(new ByteArrayInputStream(new byte[0])); Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 6084) @@ -46,4 +46,5 @@ } } + @Override public Object invoke (Object proxy, Method method, Object[] args) throws Throwable { Boolean handled = Boolean.TRUE; Index: /trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java (revision 6084) @@ -10,4 +10,5 @@ public class PresetTextComparator implements Comparator, Serializable { + @Override public int compare(JMenuItem arg0, JMenuItem arg1) { if (Main.main.menu.presetSearchAction.equals(arg0.getAction())) Index: /trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java (revision 6083) +++ /trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java (revision 6084) @@ -41,4 +41,5 @@ } + @Override public boolean hasNext() { findNext(); @@ -46,4 +47,5 @@ } + @Override public T next() { findNext(); @@ -55,4 +57,5 @@ } + @Override public void remove() { throw new UnsupportedOperationException();