Index: trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 5890) @@ -244,4 +244,5 @@ } + @Override public void actionPerformed(ActionEvent e) { Collection selection = getCurrentDataSet().getSelected(); @@ -259,6 +260,6 @@ } - /** Paste tags from arbitrary text - * @return false if action was successful + /** Paste tags from arbitrary text, not using JOSM buffer + * @return true if action was successful */ public static boolean pasteTagsFromText(Collection selection, String text) { @@ -268,5 +269,5 @@ TextTagParser.showBadBufferMessage(helpUrl); return false; - }; + } if (!TextTagParser.validateTags(tags)) return false; String v; @@ -280,7 +281,6 @@ /** Paste tags from JOSM buffer - * @param selection objects - * @param commands - * @return + * @param selection objects that will have the tags + * @return false if JOSM buffer was empty */ public static boolean pasteTagsFromJOSMBuffer(Collection selection) { Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 5890) @@ -201,5 +201,5 @@ * Default values are not saved. * Preference keys matching specified pattern are saved - * @param filename - where to export + * @param fileName - where to export * @param append - if true, resulting file cause appending to exuisting preferences * @param pattern - Regexp pattern forh preferences keys you need to export (".*imagery.*", for example) Index: trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 5890) @@ -1356,6 +1356,4 @@ /** * Replies the collection of plugin site URLs from where plugin lists can be downloaded - * - * @return */ public Collection getPluginSites() { Index: trunk/src/org/openstreetmap/josm/data/osm/Changeset.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (revision 5890) @@ -162,8 +162,10 @@ } + @Override public Map getKeys() { return tags; } + @Override public void setKeys(Map keys) { this.tags = keys; @@ -178,16 +180,20 @@ } + @Override public void put(String key, String value) { this.tags.put(key, value); } + @Override public String get(String key) { return this.tags.get(key); } + @Override public void remove(String key) { this.tags.remove(key); } + @Override public void removeAll() { this.tags.clear(); @@ -256,8 +262,10 @@ } + @Override public boolean hasKeys() { return !tags.keySet().isEmpty(); } + @Override public Collection keySet() { return tags.keySet(); Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 5890) @@ -65,5 +65,5 @@ protected void fireChangesetCacheEvent(final ChangesetCacheEvent e) { GuiHelper.runInEDT(new Runnable() { - public void run() { + @Override public void run() { for(ChangesetCacheListener l: listeners) { l.changesetCacheUpdated(e); @@ -188,4 +188,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/dialogs/changeset/ChangesetCacheManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 5890) @@ -344,4 +344,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { cancelAndClose(); @@ -359,4 +360,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { ChangesetQueryDialog dialog = new ChangesetQueryDialog(ChangesetCacheManager.this); @@ -389,4 +391,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { List selected = model.getSelectedChangesets(); @@ -398,4 +401,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -416,4 +420,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { List selected = model.getSelectedChangesets(); @@ -439,4 +444,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -456,4 +462,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { List selected = model.getSelectedChangesets(); @@ -466,4 +473,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -483,4 +491,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetCacheManager.this,model.getSelectedChangesetIds()); @@ -492,4 +501,5 @@ } + @Override public void valueChanged(ListSelectionEvent e) { updateEnabledState(); @@ -505,4 +515,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { showDetails(); @@ -530,4 +541,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { JosmUserIdentityManager im = JosmUserIdentityManager.getInstance(); @@ -580,4 +592,5 @@ class ChangesetDetailViewSynchronizer implements ListSelectionListener { + @Override public void valueChanged(ListSelectionEvent e) { List selected = model.getSelectedChangesets(); @@ -628,5 +641,5 @@ Main.worker.submit(task); Runnable r = new Runnable() { - public void run() { + @Override public void run() { if (task.isCanceled() || task.isFailed()) return; setSelectedChangesets(task.getDownloadedChangesets()); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 5890) @@ -125,12 +125,15 @@ } + @Override public int getColumnCount() { return 5; } + @Override public int getRowCount() { return data.size(); } + @Override public Object getValueAt(int row, int column) { return data.get(row); @@ -161,5 +164,5 @@ this.data, new Comparator() { - public int compare(Changeset o1, Changeset o2) { + @Override public int compare(Changeset o1, Changeset o2) { if (o1.getId() < o2.getId()) return 1; if (o1.getId() == o2.getId()) return 0; @@ -173,4 +176,5 @@ /* interface ChangesetCacheListener */ /* ------------------------------------------------------------------------------ */ + @Override public void changesetCacheUpdated(ChangesetCacheEvent event) { List selected = getSelectedChangesets(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 5890) @@ -117,5 +117,5 @@ // Runnable r = new Runnable() { - public void run() { + @Override public void run() { ChangesetCache.getInstance().update(downloadedChangesets); } @@ -187,5 +187,4 @@ // thrown if user cancel the authentication dialog canceled = true; - return; } catch(OsmTransferException e) { if (canceled) @@ -198,12 +197,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/io/DownloadOpenChangesetsTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (revision 5890) @@ -37,7 +37,6 @@ /** - * - * @param model provides the user id of the current user and accepts the changesets - * after download + * Constructs the task + * @param parent is a component to show error messages */ public DownloadOpenChangesetsTask(Component parent) { @@ -87,5 +86,5 @@ SwingUtilities.invokeLater( new Runnable() { - public void run() { + @Override public void run() { ChangesetCache.getInstance().update(changesets); } @@ -102,6 +101,6 @@ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance(); try { - OsmServerUserInfoReader reader = new OsmServerUserInfoReader(); - UserInfo info = reader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false)); + OsmServerUserInfoReader infoReader = new OsmServerUserInfoReader(); + UserInfo info = infoReader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false)); im.setFullyIdentified(info.getDisplayName(), info); } catch(OsmTransferException e) { Index: trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java (revision 5889) +++ trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java (revision 5890) @@ -115,5 +115,4 @@ * @param ticks Number of work units that should be done when subtask finishes * @param internal If true then subtask can't modify task title/custom text - * @return */ ProgressMonitor createSubTaskMonitor(int ticks, boolean internal);