Index: /trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java (revision 6223) @@ -10,5 +10,5 @@ import javax.swing.table.TableCellRenderer; -public abstract class CorrectionTable> +public abstract class CorrectionTable> extends JTable { @@ -34,5 +34,5 @@ private static BoldRenderer boldRenderer = null; - protected CorrectionTable(TM correctionTableModel) { + protected CorrectionTable(T correctionTableModel) { super(correctionTableModel); @@ -58,6 +58,6 @@ @SuppressWarnings("unchecked") - public TM getCorrectionTableModel() { - return (TM)getModel(); + public T getCorrectionTableModel() { + return (T)getModel(); } Index: /trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 6223) @@ -39,4 +39,5 @@ * * @param name the name + * @return a new local user with the given name */ public static User createLocalUser(String name) { @@ -57,4 +58,5 @@ * @param uid the user id * @param name the name + * @return a new OSM user with the given name and uid */ public static User createOsmUser(long uid, String name) { @@ -107,4 +109,8 @@ } + /** + * Replies the anonymous user + * @return The anonymous user + */ public static User getAnonymous() { return anonymous; @@ -175,8 +181,16 @@ } + /** + * Determines if this user is known to OSM + * @return {@code true} if this user is known to OSM, {@code false} otherwise + */ public boolean isOsmUser() { return uid > 0; } + /** + * Determines if this user is local + * @return {@code true} if this user is local, {@code false} otherwise + */ public boolean isLocalUser() { return uid < 0; @@ -205,7 +219,7 @@ public String toString() { StringBuffer s = new StringBuffer(); - s.append("id:"+uid); + s.append("id:").append(uid); if (names.size() == 1) { - s.append(" name:"+getName()); + s.append(" name:").append(getName()); } else if (names.size() > 1) { Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 6223) @@ -52,5 +52,5 @@ boolean add=true; - if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url.toString())) { + if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url)) { add = false; } else if (historyPos == history.size() -1) { Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6223) @@ -188,8 +188,9 @@ @Override public boolean evaluate(OsmPrimitive p) { - if (hds.getHistory(p.getPrimitiveId()) == null) + History h = hds.getHistory(p.getPrimitiveId()); + if (h == null) // reload if the history is not in the cache yet return true; - else if (!p.isNew() && hds.getHistory(p.getPrimitiveId()).getByVersion(p.getUniqueId()) == null) + else if (!p.isNew() && h.getByVersion(p.getUniqueId()) == null) // reload if the history object of the selected object is not in the cache yet return true; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6223) @@ -33,4 +33,5 @@ import java.util.Comparator; import java.util.Date; +import java.util.Dictionary; import java.util.Hashtable; import java.util.List; @@ -73,4 +74,5 @@ import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.gui.widgets.JosmComboBox; +import org.openstreetmap.josm.gui.widgets.JosmTextField; import org.openstreetmap.josm.io.GpxReader; import org.openstreetmap.josm.tools.ExifReader; @@ -79,5 +81,4 @@ import org.openstreetmap.josm.tools.PrimaryDateParser; import org.xml.sax.SAXException; -import org.openstreetmap.josm.gui.widgets.JosmTextField; /** This class displays the window to select the GPX file and the offset (timezone + delta). @@ -881,5 +882,5 @@ final JSlider sldTimezone = new JSlider(-24, 24, 0); sldTimezone.setPaintLabels(true); - Hashtable labelTable = new Hashtable(); + Dictionary labelTable = new Hashtable(); labelTable.put(-24, new JLabel("-12:00")); labelTable.put(-12, new JLabel( "-6:00")); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6223) @@ -201,5 +201,5 @@ @Override public boolean identify(TabPreferenceSetting tps, Object name) { - return name != null && tps != null && tps.getIconName() != null && tps.getIconName().equals(name); + return name != null && tps != null && tps.getIconName() != null && name.equals(tps.getIconName()); }}, name); } Index: /trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 6223) @@ -129,5 +129,5 @@ sb.append("/full"); } else if (version > 0) { - sb.append("/"+version); + sb.append("/").append(version); } Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 6223) @@ -19,10 +19,7 @@ import java.util.StringTokenizer; import java.util.TreeMap; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler; @@ -78,4 +75,5 @@ /** * Spawns a new thread for the request + * @param request The request to process */ public static void processRequest(Socket request) { @@ -214,6 +212,5 @@ String usage = getUsageAsHtml(); String websiteDoc = HelpUtil.getWikiBaseHelpUrl() +"/Help/Preferences/RemoteControl"; - String help = "No command specified! The following commands are available:
    " - + usage.toString() + String help = "No command specified! The following commands are available:
      " + usage + "
    " + "See "+websiteDoc+" for complete documentation."; sendBadRequest(out, help); @@ -449,5 +446,5 @@ /** * Reports HTML message with the description of all available commands - * @return + * @return HTML message with the description of all available commands * @throws IllegalAccessException * @throws InstantiationException Index: /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 6223) @@ -38,10 +38,10 @@ if(code.matches("[^_]+_[^_]+")) { code = code.substring(0,2); - if(code == "en") + if ("en".equals(code)) return null; } else { return null; } - } else if(type == LocaleType.DEFAULTNOTENGLISH && code == "en") + } else if(type == LocaleType.DEFAULTNOTENGLISH && "en".equals(code)) return null; return code.substring(0,1).toUpperCase() + code.substring(1) + ":"; Index: /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 6223) @@ -30,5 +30,5 @@ private static final long DIALOG_DELAY = 1000; - private static final String STATUS_BAR_ID = new String("multikeyShortcut"); + private static final String STATUS_BAR_ID = "multikeyShortcut"; private Map myActions = new HashMap(); @@ -120,4 +120,8 @@ private static MultikeyActionsHandler instance; + /** + * Replies the unique instance of this class. + * @return The unique instance of this class + */ public static MultikeyActionsHandler getInstance() { if (instance == null) { @@ -203,6 +207,10 @@ } + /** + * Registers an action and its shortcut + * @param action The action to add + */ public void addAction(MultikeyShortcutAction action) { - if(action.getMultikeyShortcut() != null) { + if (action.getMultikeyShortcut() != null) { MyAction myAction = new MyAction(action); myActions.put(action, myAction); @@ -211,5 +219,8 @@ } - // unregister action and its shortcut completely + /** + * Unregisters an action and its shortcut completely + * @param action The action to remove + */ public void removeAction(MultikeyShortcutAction action) { MyAction a = myActions.get(action); Index: /trunk/src/org/openstreetmap/josm/tools/Property.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Property.java (revision 6222) +++ /trunk/src/org/openstreetmap/josm/tools/Property.java (revision 6223) @@ -4,6 +4,9 @@ /** * Small interface to define a property with both read and write access. + * @param Object type + * @param

    Property type */ -public interface Property { +public interface Property { + /** * Get the value of the property. @@ -11,5 +14,6 @@ * @return the value of the property for the object obj */ - public PropertyType get(ObjectType obj); + public P get(O obj); + /** * Set the value of the property for the object. @@ -17,4 +21,4 @@ * @param value the value the property is set to */ - public void set(ObjectType obj, PropertyType value); + public void set(O obj, P value); }