Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 2801) @@ -461,5 +461,4 @@ } - /** * The type of a command line parameter, to be used in switch statements. @@ -532,5 +531,4 @@ Main.worker.execute(new PostDownloadHandler(task, future)); } - public static void determinePlatformHook() { Index: trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (revision 2801) @@ -19,5 +19,5 @@ /** * This action toggles the visibility of the {@see ChangesetCacheManager} dialog. - * + * */ public class ChangesetManagerToggleAction extends JosmAction { Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 2801) Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java (revision 2801) Index: trunk/src/org/openstreetmap/josm/data/oauth/OsmPrivileges.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/oauth/OsmPrivileges.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/data/oauth/OsmPrivileges.java (revision 2801) Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 2801) @@ -27,10 +27,10 @@ * {@see #removeChangesetCacheListener(ChangesetCacheListener)} to unregister as * cache event listener. - * + * * The cache itself listens to {@see java.util.prefs.PreferenceChangeEvent}s. It * clears itself if the OSM API URL is changed in the preferences. - * + * * {@see ChangesetCacheEvent}s are delivered on the EDT. - * + * */ public class ChangesetCache implements PreferenceChangedListener{ @@ -42,5 +42,5 @@ /** * Replies the unique instance of the cache - * + * * @return the unique instance of the cache */ @@ -162,5 +162,5 @@ * Removes the changesets in changesets from the cache. A * {@see ChangesetCacheEvent} is fired. - * + * * @param changesets the changesets to remove. Ignored if null. */ Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java (revision 2801) @@ -1,5 +1,4 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.osm; - public interface ChangesetCacheListener { Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 2801) @@ -33,5 +33,5 @@ /** * Remembers a history primitive with the given modification type - * + * * @param primitive the primitive. Must not be null. * @param cmt the modification type. Must not be null. @@ -71,5 +71,5 @@ * Replies true if the primitive with id id was created in this * changeset. Replies false, if id is null. - * + * * @param id the id * @return true if the primitive with id id was created in this @@ -84,5 +84,5 @@ * Replies true if the primitive with id id was updated in this * changeset. Replies false, if id is null. - * + * * @param id the id * @return true if the primitive with id id was updated in this @@ -97,5 +97,5 @@ * Replies true if the primitive with id id was deleted in this * changeset. Replies false, if id is null. - * + * * @param id the id * @return true if the primitive with id id was deleted in this @@ -109,5 +109,5 @@ /** * Replies the set of primitives with a specific modification type - * + * * @param cmt the modification type. Must not be null. * @return the set of primitives @@ -127,5 +127,5 @@ /** * Replies the number of objects in the dataset - * + * * @return the number of objects in the dataset */ @@ -137,5 +137,5 @@ * Replies the {@see HistoryOsmPrimitive} with id id from this * dataset. null, if there is no such primitive in the data set. - * + * * @param id the id * @return the {@see HistoryOsmPrimitive} with id id from this @@ -146,5 +146,4 @@ return primitives.get(id); } - public Iterator iterator() { Index: trunk/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java (revision 2801) @@ -40,5 +40,5 @@ /** - * + * * @return List of events that caused this DataChangedEvent. Might be null */ Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java (revision 2801) @@ -65,5 +65,4 @@ load(); } - public boolean isUseRealWidth() { Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (revision 2801) @@ -54,5 +54,4 @@ private final Collection regionalNameOrder; - public MapPainter(MapPaintSettings settings, Graphics2D g, boolean inactive, NavigatableComponent nc, boolean virtual, double dist, double circum) { this.g = g; @@ -151,5 +150,4 @@ } - public void drawNodeIcon(Node n, ImageIcon icon, boolean annotate, boolean selected, String name) { Point p = nc.getPoint(n); @@ -175,5 +173,4 @@ } } - /** Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 2801) @@ -169,6 +169,6 @@ name += " ("; String nameTag = null; - for (String n : getNamingtagsForRelations()) { - if (n.equals("name")) { + for (String n : getNamingtagsForRelations()) { + if (n.equals("name")) { if (Main.pref.getBoolean("osm-primitives.localize-name", true)) { nameTag = relation.getLocalName(); Index: trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 2801) @@ -268,5 +268,4 @@ } - /** * Explains a {@see UnknownHostException} which has caused an {@see OsmTransferException}. Index: trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 2801) @@ -13,23 +13,23 @@ * JosmUserStateManager is a global object which keeps track of what JOSM knows about * the identity of the current user. - * + * * JOSM can be operated anonymously provided the current user never invokes an operation * on the OSM server which required authentication. In this case JOSM neither knows * the user name of the OSM account of the current user nor its unique id. Perhaps the * user doesn't have one. - * + * * If the current user supplies a user name and a password in the JOSM preferences JOSM * can partially identify the user. - * + * * The current user is fully identified if JOSM knows both the user name and the unique * id of the users OSM account. The later is retrieved from the OSM server with a * GET /api/0.6/user/details request, submitted with the user name and password * of the current user. - * + * * The global JosmUserStateManager listens to {@see PreferenceChangeEvent}s and keeps track * of what the current JOSM instance knows about the current user. Other subsystems can * let the global JosmUserStateManager know in case they fully identify the current user, see * {@see #setFullyIdentified(String, long)}. - * + * * The information kept by the JosmUserStateManager can be used to * - * + * * The dialog offers actions to download and to close changesets. It can also launch an external * browser with information about a changeset. Furthermore, it can select all objects in * the current data layer being assigned to a specific changeset. - * + * */ public class ChangesetDialog extends ToggleDialog{ @@ -85,5 +85,4 @@ private LaunchChangesetManagerAction launchChangesetManagerAction; - protected void buildChangesetsLists() { DefaultListSelectionModel selectionModel = new DefaultListSelectionModel(); @@ -117,5 +116,4 @@ MapView.addEditLayerChangeListener(inSelectionModel); DataSet.selListeners.add(inSelectionModel); - // let the model for changesets in the current layer listen to various @@ -360,5 +358,5 @@ /** * Downloads selected changesets - * + * */ class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener{ @@ -395,5 +393,5 @@ /** * Closes the currently selected changesets - * + * */ class CloseOpenChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener { @@ -427,5 +425,5 @@ /** * Show information about the currently selected changesets - * + * */ class ShowChangesetInfoAction extends AbstractAction implements ListSelectionListener, ItemListener { @@ -467,5 +465,5 @@ /** * Show information about the currently selected changesets - * + * */ class LaunchChangesetManagerAction extends AbstractAction implements ListSelectionListener, ItemListener { @@ -558,5 +556,4 @@ } - class ChangesetPopupMenuLauncher extends PopupMenuLauncher { @Override Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 2801) Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 2801) Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 2801) Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 2801) Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 2801) Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 2801) @@ -690,5 +690,5 @@ /* * Sort a collection of relation members by the way they are linked. - * + * * @param relationMembers collection of relation members * @return sorted collection of relation members Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 2801) @@ -88,5 +88,4 @@ SwingUtilities.invokeLater(r); } - /** Index: trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 2801) @@ -149,5 +149,4 @@ } - public UploadParameterSummaryPanel getUploadParameterSummaryPanel() { return pnlUploadParameterSummary; Index: trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 2801) @@ -33,7 +33,7 @@ * ChangesetManagementPanel allows to configure changeset to be used in the next * upload. - * + * * It is displayed as one of the configuration panels in the {@see UploadDialog}. - * + * * ChangesetManagementPanel is a source for {@see PropertyChangeEvent}s. Clients can listen * to @@ -185,5 +185,5 @@ * Replies the currently selected changeset. null, if no changeset is * selected or if the user has chosen to use a new changeset. - * + * * @return the currently selected changeset. null, if no changeset is * selected. @@ -198,5 +198,5 @@ * Replies true if the user has chosen to close the changeset after the * next upload - * + * */ public boolean isCloseChangesetAfterUpload() { Index: trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 2801) @@ -15,5 +15,5 @@ * A combobox model for the list of open changesets. The model is populated with the list * of open changesets kept in the {@see ChangesetCache}. - * + * */ public class OpenChangesetComboBoxModel extends DefaultComboBoxModel implements ChangesetCacheListener { Index: trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (revision 2801) @@ -99,5 +99,5 @@ /** * Replies the map with the current tags in the tag editor model. - * + * * @return the map with the current tags in the tag editor model. */ Index: trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 2801) @@ -46,5 +46,5 @@ /** * Creates the task - * + * * @param layer the layer in which primitives are updated. Must not be null. * @param toUpdate a collection of primitives to update from the server. Set to Index: trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 2801) @@ -52,5 +52,5 @@ /** * Creates the task - * + * * @param strategy the upload strategy. Must not be null. * @param layer the OSM data layer for which data is uploaded. Must not be null. Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 2801) @@ -39,5 +39,5 @@ * Replies the value which is written to the preferences for a specific * upload strategy - * + * * @return the value which is written to the preferences for a specific * upload strategy @@ -54,11 +54,11 @@ /** * Replies the upload strategy currently configured in the preferences. - * + * * First checks for the preference key 
osm-server.upload-strategy
. If not * present, checks for the legacy preference key 
osm-server.atomic-upload
. - * + * * If both are missing or if the preference value is illegal, {@see #DEFAULT_UPLOAD_STRATEGY} * is replied. - * + * * @return the upload strategy currently configured in the preferences. */ @@ -92,5 +92,5 @@ /** * Saves the upload strategy strategy to the preferences. - * + * * @param strategy the strategy to save */ Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 2801) @@ -37,5 +37,5 @@ /** * UploadStrategySelectionPanel is a panel for selecting an upload strategy. - * + * * Clients can listen for property change events for the property * {@see #UPLOAD_STRATEGY_SPECIFICATION_PROP}. Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (revision 2801) @@ -1,11 +1,9 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.gui.io; - - /** * An UploadStrategySpecification consists of the parameter describing the strategy * for uploading a collection of {@see OsmPrimitive}. - * + * * This includes: * - * + * * In addition, it manages an OAuth Access Token for accessing the OSM server. */ @@ -51,9 +51,8 @@ public CredentialsManagerResponse getCredentials(RequestorType requestorType, boolean noSuccessWithLastResponse) throws CredentialsManagerException; - /** * Lookup the current OAuth Access Token to access the OSM server. Replies null, if no * Access Token is currently managed by this CredentialManager. - * + * * @return the current OAuth Access Token to access the OSM server. * @throws CredentialsManagerException thrown if something goes wrong @@ -63,5 +62,5 @@ /** * Stores the OAuth Access Token accessToken. - * + * * @param accessToken the access Token. null, to remove the Access Token. * @throws CredentialsManagerException thrown if something goes wrong Index: trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerFactory.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerFactory.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerFactory.java (revision 2801) @@ -4,7 +4,7 @@ /** * CredentialManagerFactory is a factory for the single credential manager used. - * + * * Currently, it defaults to replying an instance of {@see JosmPreferencesCredentialManager}. - * + * */ public class CredentialsManagerFactory { @@ -13,5 +13,5 @@ /** * Replies the single credential manager used in JOSM - * + * * @return the single credential manager used in JOSM */ Index: trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerResponse.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerResponse.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerResponse.java (revision 2801) @@ -4,9 +4,9 @@ /** * CredentialsManagerResponse represents the response from {@see CredentialsManager#getCredentials(java.net.Authenticator.RequestorType, boolean)}. - * + * * The response consists of the username and the password the requested credentials consists of. * In addition, it provides information whether authentication was canceled by the user, i.e. * because he or she canceled a username/password dialog (see {@see #isCanceled()}. - * + * */ public class CredentialsManagerResponse { Index: trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java (revision 2801) @@ -14,5 +14,5 @@ * for the OSM API and an optional proxy server to the currently configured * {@see CredentialsManager}. - * + * */ public class DefaultAuthenticator extends Authenticator { @@ -33,5 +33,5 @@ /** - * + * * @param credentialManager the credential manager */ @@ -40,10 +40,8 @@ } - - /** * Called by the Java http stack when either the OSM API server or a proxy requires * authentication. - * + * */ @Override protected PasswordAuthentication getPasswordAuthentication() { Index: trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java (revision 2801) @@ -106,9 +106,8 @@ } - /** * Lookup the current OAuth Access Token to access the OSM server. Replies null, if no * Access Token is currently managed by this CredentialManager. - * + * * @return the current OAuth Access Token to access the OSM server. * @throws CredentialsManagerException thrown if something goes wrong @@ -124,5 +123,5 @@ /** * Stores the OAuth Access Token accessToken. - * + * * @param accessToken the access Token. null, to remove the Access Token. * @throws CredentialsManagerException thrown if something goes wrong Index: trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (revision 2800) +++ trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (revision 2801) @@ -15,5 +15,4 @@ private CheckParameterUtil(){} - public static void ensureValidPrimitiveId(PrimitiveId id, String parameterName) throws IllegalArgumentException { @@ -36,5 +35,5 @@ /** * Ensures that id is non-null primitive id of type {@see OsmPrimitiveType#NODE} - * + * * @param id the primitive id * @param parameterName the name of the parameter to be checked