Index: /trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 2711) @@ -60,5 +60,4 @@ } - 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 2710) +++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 2711) @@ -34,5 +34,5 @@ * Does nothing if there either isn't a current map view or if there isn't a current data * layer. - * + * */ public static void zoomToSelection() { Index: /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 2711) @@ -179,5 +179,4 @@ } } - // create the new way and apply the new node list Index: /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 2711) @@ -176,5 +176,4 @@ return null; - Set relationToNodeReferences = RelationToChildReference.getRelationToChildReferences(nodes); Index: /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 2711) @@ -434,5 +434,4 @@ } - return new SplitWayResult(new SequenceCommand(tr("Split way {0} into {1} parts", way.getDisplayName(DefaultNameFormatter.getInstance()), Index: /trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (revision 2711) @@ -42,5 +42,5 @@ public void updateLayer(OsmDataLayer layer) { - + } Index: /trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 2711) @@ -670,6 +670,4 @@ } - - private Match parseKV(String key, String value) throws ParseError { if (value == null) { Index: /trunk/src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 2711) @@ -213,5 +213,5 @@ /** * Replies the number of objects to upload - * + * * @return the number of objects to upload */ Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 2711) @@ -134,5 +134,4 @@ private final CopyOnWriteArrayList listeners = new CopyOnWriteArrayList(); - public void addPreferenceChangeListener(PreferenceChangedListener listener) { if (listener != null) { @@ -364,5 +363,4 @@ return put(key, Long.toString(value)); } - /** Index: /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 2711) @@ -203,5 +203,5 @@ * Replies a clone of this lat LatLon, rounded to OSM precisions, i.e. to * MAX_SERVER_PRECISION - * + * * @return a clone of this lat LatLon */ @@ -212,5 +212,4 @@ ); } - @Override Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheEvent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheEvent.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheEvent.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 2711) @@ -30,5 +30,4 @@ import org.openstreetmap.josm.data.osm.event.TagsChangedEvent; import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent; - /** Index: /trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java (revision 2711) @@ -1,5 +1,4 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.osm; - public interface NameFormatter { Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 2711) @@ -154,5 +154,5 @@ /** * Replies the collection of referring primitives for the primitives in primitives. - * + * * @param primitives the collection of primitives. * @return the collection of referring primitives for the primitives in primitives; @@ -167,5 +167,4 @@ return ret; } - /* mappaint data */ @@ -249,5 +248,5 @@ /** * Creates a new primitive for the given id. - * + * * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing. * If allowNegativeId is not set, then id will have to be 0 (in that case new unique id will be generated) or @@ -571,5 +570,5 @@ * Replies a list of direction-dependent keys that make an object * direction dependent. - * + * * @return a list of direction-dependent keys that make an object * direction dependent. @@ -628,10 +627,9 @@ } - /** * Replies the id of the changeset this primitive was last uploaded to. * 0 if this primitive wasn't uploaded to a changeset yet or if the * changeset isn't known. - * + * * @return the id of the changeset this primitive was last uploaded to. */ @@ -640,9 +638,8 @@ } - /** * Sets the changeset id of this primitive. Can't be set on a new * primitive. - * + * * @param changesetId the id. >= 0 required. * @throws IllegalStateException thrown if this primitive is new. @@ -1137,5 +1134,4 @@ } - /** * true if this object has direction dependent tags (e.g. oneway) Index: /trunk/src/org/openstreetmap/josm/data/osm/PrimitiveId.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/PrimitiveId.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/PrimitiveId.java (revision 2711) @@ -9,5 +9,5 @@ /** * Replies true if this id represents a new primitive. - * + * * @return true if this id represents a new primitive. */ Index: /trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 2711) @@ -120,5 +120,5 @@ /* * Returns the list of user names - * + * * @returns list of names */ @@ -129,5 +129,5 @@ /* * Adds a user name to the list if it is not there, yet. - * + * * @param name */ @@ -138,5 +138,5 @@ /* * Returns true if the name is in the names list - * + * * @param name */ Index: /trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java (revision 2711) @@ -6,5 +6,4 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.OsmPrimitive; - public abstract class AbstractDatasetChangedEvent { Index: /trunk/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java (revision 2711) @@ -6,5 +6,4 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.OsmPrimitive; - public class ChangesetIdChangedEvent extends AbstractDatasetChangedEvent { Index: /trunk/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java (revision 2711) @@ -7,5 +7,4 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.OsmPrimitive; - public class DataChangedEvent extends AbstractDatasetChangedEvent { Index: /trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java (revision 2711) @@ -21,5 +21,4 @@ package org.openstreetmap.josm.data.osm.event; - /** Index: /trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 2711) @@ -12,5 +12,4 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer; - /** * This class allows to add DatasetListener to currently active dataset. If active @@ -18,5 +17,5 @@ * (it's no longer necessary to register for layer events and reregister every time * new layer is selected) - * + * * Events in EDT are supported, see {@link #addDatasetListener(DataSetListener, boolean)} * Index: /trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java (revision 2711) @@ -32,5 +32,5 @@ /** - * + * * @return True if primitive was in dataset before (so it's not really added), but it was incomplete */ Index: /trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java (revision 2711) @@ -32,5 +32,5 @@ /** - * + * * @return True if primitive wasn't really removed from the dataset, it only become incomplete again */ Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNameFormatter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNameFormatter.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNameFormatter.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 2711) @@ -192,6 +192,4 @@ } - - @Override public int hashCode() { Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 2711) @@ -80,5 +80,5 @@ /** * Replies true if this way is closed. - * + * * @return true if this way is closed. */ Index: /trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java (revision 2711) @@ -7,5 +7,5 @@ /** - * Represents a relation member in the the context of a historical view on + * Represents a relation member in the context of a historical view on * OSM data. * Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 2711) @@ -208,5 +208,5 @@ /** * Builds a default tooltip text for the primitive primitive. - * + * * @param primitive the primitmive * @return the tooltip text @@ -244,9 +244,8 @@ } - /** * Decorates the name of primitive with its id, if the preference * osm-primitives.showid is set. - * + * * The id is append to the {@see StringBuilder} passed in in name. * @@ -259,5 +258,4 @@ } } - /** @@ -324,5 +322,4 @@ return sb.toString(); } - /** @@ -373,5 +370,5 @@ /** * Builds a default tooltip text for an HistoryOsmPrimitive primitive. - * + * * @param primitive the primitmive * @return the tooltip text Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 2711) @@ -193,5 +193,5 @@ private boolean setupDone = false; - + /** * This is called by showDialog(). Index: /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 2711) @@ -89,5 +89,5 @@ /** * Removes a layer change listener - * + * * @param listener the listener. Ignored if null or already registered. */ @@ -100,9 +100,7 @@ } - - /** * Adds a layer change listener - * + * * @param listener the listener. Ignored if null or already registered. */ @@ -303,5 +301,4 @@ } - /** * Determines the next active data layer according to the following Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java (revision 2711) @@ -14,5 +14,5 @@ /** - * {@see TableCellEditor} for the the role column in a table for {@see RelationMember}s. + * {@see TableCellEditor} for the role column in a table for {@see RelationMember}s. * */ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 2711) @@ -124,6 +124,4 @@ } - - @Override public void tearDown() { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 2711) @@ -51,5 +51,5 @@ * Invoke before the panel is discarded. This will in turn call {@see ToggleDialog#tearDown()} * on every dialog. - * + * */ public void tearDown() { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 2711) @@ -128,5 +128,4 @@ buttonPanel.add(new SideButton(mergeLayerAction)); - //-- delete layer action DeleteLayerAction deleteLayerAction = new DeleteLayerAction(); @@ -772,8 +771,8 @@ /** - * Replies true if the the currently selected layers can move up + * Replies true if the currently selected layers can move up * by one position * - * @return true if the the currently selected layers can move up + * @return true if the currently selected layers can move up * by one position */ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 2711) @@ -264,5 +264,5 @@ /** - * Closes the the detached dialog if this toggle dialog is currently displayed + * Closes the detached dialog if this toggle dialog is currently displayed * in a detached dialog. * Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 2711) @@ -210,5 +210,5 @@ JOptionPane.showMessageDialog( Main.parent, - tr("Failed to create an URL because the encoding ''{0}'' was
" + tr("Failed to create an URL because the encoding ''{0}''
" + "was missing on this system.", "UTF-8"), tr("Missing encoding"), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 2711) @@ -59,5 +59,5 @@ * downloading, querying, closing changesets, in addition to removing changesets from * the local cache. - * + * */ public class ChangesetCacheManager extends JFrame { @@ -68,5 +68,5 @@ /** * Replies the unique instance of the changeset cache manager - * + * * @return the unique instance of the changeset cache manager */ @@ -81,5 +81,5 @@ * Hides and destroys the unique instance of the changeset cache * manager. - * + * */ public static void destroyInstance() { @@ -91,5 +91,4 @@ } - private ChangesetCacheManagerModel model; private JSplitPane spContent; @@ -102,5 +101,4 @@ private JTable tblChangesets; - /** * Creates the various models required @@ -119,5 +117,5 @@ /** * builds the toolbar panel in the heading of the dialog - * + * * @return the toolbar panel */ @@ -135,5 +133,5 @@ /** * builds the button panel in the footer of the dialog - * + * * @return the button row pane */ @@ -156,5 +154,5 @@ /** * Builds the panel with the changeset details - * + * * @return the panel with the changeset details */ @@ -181,5 +179,5 @@ tp.setToolTipTextAt(0, tr("Display the basic properties of the changeset")); tp.setTitleAt(1, tr("Tags")); - tp.setToolTipTextAt(1, tr("Display the the tags of the changeset")); + tp.setToolTipTextAt(1, tr("Display the tags of the changeset")); tp.setTitleAt(2, tr("Content")); tp.setToolTipTextAt(2, tr("Display the objects created, updated, and deleted by the changeset")); @@ -191,5 +189,5 @@ /** * builds the content panel of the dialog - * + * * @return the content panel */ @@ -210,5 +208,5 @@ * Builds the table with actions which can be applied to the currently visible changesets * in the changeset table. - * + * * @return */ @@ -241,5 +239,5 @@ /** * Builds the panel with the table of changesets - * + * * @return the panel with the table of changesets */ @@ -266,5 +264,4 @@ } - protected void build() { setTitle(tr(("Changeset Management Dialog"))); @@ -289,5 +286,4 @@ addWindowListener(new WindowEventHandler()); } - public ChangesetCacheManager() { @@ -594,5 +590,5 @@ * Selects the changesets in changests, provided the * respective changesets are already present in the local changeset cache. - * + * * @param ids the collection of changesets. If null, the selection is cleared. */ @@ -608,5 +604,5 @@ * Selects the changesets with the ids in ids, provided the * respective changesets are already present in the local changeset cache. - * + * * @param ids the collection of ids. If null, the selection is cleared. */ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 2711) @@ -49,5 +49,5 @@ * Sets the changeset currently displayed in the detail view. Fires a property change event * for the property {@see #CHANGESET_IN_DETAIL_VIEW_PROP} if necessary. - * + * * @param cs the changeset currently displayed in the detail view. */ @@ -62,5 +62,5 @@ /** * Replies true if there is at least one selected changeset - * + * * @return true if there is at least one selected changeset */ @@ -71,5 +71,5 @@ /** * Replies the list of selected changesets - * + * * @return the list of selected changesets */ @@ -87,5 +87,5 @@ /** * Replies a set of ids of the selected changesets - * + * * @return a set of ids of the selected changesets */ @@ -100,5 +100,5 @@ /** * Selects the changesets in selected. - * + * * @param selected the collection of changesets to select. Ignored if empty. */ @@ -117,5 +117,5 @@ /** * Selects the changeset displayed at row row - * + * * @param row the row. Ignored if < 0 or >= {@see #getRowCount()} */ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheSortSpecification.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheSortSpecification.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheSortSpecification.java (revision 2711) @@ -17,4 +17,3 @@ } - } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java (revision 2711) @@ -9,5 +9,5 @@ /** * The column model for the changeset table - * + * */ public class ChangesetCacheTableColumnModel extends DefaultTableColumnModel { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 2711) @@ -43,5 +43,5 @@ /** * Initialize the task with a collection of changeset ids to download - * + * * @param ids the collection of ids. May be null. */ @@ -61,5 +61,5 @@ /** * Creates a download task for a single changeset - * + * * @param changesetId the changeset id. >0 required. * @throws IllegalArgumentException thrown if changesetId <= 0 @@ -75,5 +75,5 @@ * Creates a download task for a collection of changesets. null values and id <=0 in * the collection are sillently discarded. - * + * * @param changesetIds the changeset ids. Empty collection assumed, if null. */ @@ -85,5 +85,5 @@ /** * Creates a download task for a single changeset - * + * * @param parent the parent component for the {@see PleaseWaitDialog}. Must not be null. * @param changesetId the changeset id. >0 required. @@ -101,5 +101,5 @@ * Creates a download task for a collection of changesets. null values and id <=0 in * the collection are sillently discarded. - * + * * @param parent the parent component for the {@see PleaseWaitDialog}. Must not be null. * @param changesetIds the changeset ids. Empty collection assumed, if null. @@ -114,5 +114,5 @@ * Replies true if the local {@see ChangesetCache} already includes the changeset with * id changesetId. - * + * * @param changsetId the changeset id * @return true if the local {@see ChangesetCache} already includes the changeset with @@ -126,5 +126,5 @@ * Downloads the changeset with id changesetId (only "header" * information, no content) - * + * * @param changesetId the changeset id * @throws OsmTransferException thrown if something went wrong Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 2711) @@ -58,5 +58,5 @@ * It listens to property change events for {@see ChangesetCacheManagerModel#CHANGESET_IN_DETAIL_VIEW_PROP} * and updates its view accordingly. - * + * */ public class ChangesetContentPanel extends JPanel implements PropertyChangeListener{ @@ -167,5 +167,4 @@ setCurrentChangeset(cs); } - /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java (revision 2711) @@ -55,5 +55,4 @@ } - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java (revision 2711) @@ -11,5 +11,5 @@ /** * The column model for the changeset content - * + * */ public class ChangesetContentTableColumnModel extends DefaultTableColumnModel { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 2711) @@ -32,5 +32,5 @@ /** * Replies true if there is at least one selected primitive in the table model - * + * * @return true if there is at least one selected primitive in the table model */ @@ -64,5 +64,5 @@ * Populates the model with the content of a model. If ds is null, the * table is cleared. - * + * * @param ds the changeset content. */ @@ -133,5 +133,5 @@ * The type used internally to keep information about {@see HistoryOsmPrimitive} * with their {@see ChangesetModificationType}. - * + * */ static private class ChangesetContentEntry implements ChangesetDataSetEntry{ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 2711) @@ -45,5 +45,5 @@ * This panel displays the properties of the currently selected changeset in the * {@see ChangesetCacheManager}. - * + * */ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener{ @@ -315,5 +315,4 @@ } - /** * Updates the current changeset from the OSM server @@ -348,7 +347,7 @@ /** - * Selects the primitives in the content of this changeset in the the current + * Selects the primitives in the content of this changeset in the current * data layer. - * + * */ class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{ @@ -417,7 +416,7 @@ /** - * Zooms to the primitives in the content of this changeset in the the current + * Zooms to the primitives in the content of this changeset in the current * data layer. - * + * */ class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDownloadTask.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 2711) @@ -29,8 +29,8 @@ * This is an asynchronous task for downloading a collection of changests from the OSM * server. - * + * * The task only downloads the changeset properties without the changeset content. It * updates the global {@see ChangesetCache}. - * + * */ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask{ @@ -38,7 +38,7 @@ /** * Builds a download task from for a collection of changesets. - * + * * Ignores null values and changesets with {@see Changeset#isNew()} == true. - * + * * @param changesets the collection of changesets. Assumes an empty collection if null. * @return the download task @@ -50,7 +50,7 @@ /** * Builds a download task from for a collection of changesets. - * + * * Ignores null values and changesets with {@see Changeset#isNew()} == true. - * + * * @param parent the parent component relative to which the {@see PleaseWaitDialog} is displayed. * Must not be null. @@ -78,5 +78,4 @@ } - private Set idsToDownload; @@ -104,7 +103,7 @@ * Creates the download task for a collection of changeset ids. Uses a {@see PleaseWaitDialog} * whose parent is {@see Main#parent}. - * + * * Null ids or or ids <= 0 in the id collection are ignored. - * + * * @param ids the collection of ids. Empty collection assumed if null. */ @@ -118,7 +117,7 @@ * Creates the download task for a collection of changeset ids. Uses a {@see PleaseWaitDialog} * whose parent is the parent window of dialogParent. - * + * * Null ids or or ids <= 0 in the id collection are ignored. - * + * * @param dialogParent the parent reference component for the {@see PleaseWaitDialog}. Must not be null. * @param ids the collection of ids. Empty collection assumed if null. Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java (revision 2711) @@ -23,5 +23,4 @@ } - /* ---------------------------------------------------------------------------- */ /* Interface LayerChangeListener */ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 2711) @@ -183,5 +183,5 @@ /** * Replies true if there is at least one selected open changeset - * + * * @return true if there is at least one selected open changeset */ @@ -192,5 +192,5 @@ /** * Replies the selected open changesets - * + * * @return the selected open changesets */ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (revision 2711) @@ -16,5 +16,5 @@ /** * This panel displays the tags of the currently selected changeset in the {@see ChangesetCacheManager} - * + * */ public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener{ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java (revision 2711) @@ -21,5 +21,5 @@ /** * This is the list model for the list of changeset in the current edit layer. - * + * */ public class ChangesetsInActiveDataLayerListModel extends ChangesetListModel implements DataSetListener, EditLayerChangeListener { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 2711) @@ -26,5 +26,5 @@ * This panel allows to enter the ID of single changeset and to download * the respective changeset. - * + * */ public class SingleChangesetDownloadPanel extends JPanel { @@ -63,5 +63,5 @@ * Replies the changeset id entered in this panel. 0 if no changeset id * or an invalid changeset id is currently entered. - * + * * @return the changeset id entered in this panel */ @@ -117,5 +117,5 @@ /** * Validator for a changeset ID entered in a {@see JTextComponent}. - * + * */ static private class ChangesetIdValidator extends AbstractTextComponentValidator { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/ListOfUsedTags.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/ListOfUsedTags.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/ListOfUsedTags.java (revision 2711) @@ -35,5 +35,5 @@ /** - * + * * @param key * @return List of used values or empty list if key is not used Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 2711) @@ -36,5 +36,5 @@ /** * Creates the download task - * + * * @param relations a collection of relations. Must not be null. * @param layer the layer which data is to be merged into Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 2711) @@ -184,5 +184,5 @@ /** * Creates the toolbar - * + * * @return the toolbar */ @@ -487,5 +487,4 @@ tb.setFloatable(false); - // -- add at end action AddSelectedAtEndAction addSelectedAtEndAction = new AddSelectedAtEndAction(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 2711) @@ -315,5 +315,5 @@ /** * Replies the set of incomplete primitives - * + * * @return the set of incomplete primitives */ @@ -330,5 +330,5 @@ /** * Replies the set of selected incomplete primitives - * + * * @return the set of selected incomplete primitives */ @@ -345,5 +345,5 @@ /** * Replies true if at least one the relation members is incomplete - * + * * @return true if at least one the relation members is incomplete */ @@ -358,5 +358,5 @@ /** * Replies true if at least one of the selected members is incomplete - * + * * @return true if at least one of the selected members is incomplete */ @@ -632,5 +632,5 @@ * Replies true if primitive is currently selected in the layer this * model is attached to - * + * * @param primitive the primitive * @return true if primitive is currently selected in the layer this Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 2711) @@ -203,5 +203,4 @@ } - /* ----------------------------------------------------------------------- */ /* property change support */ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 2711) @@ -58,5 +58,4 @@ } - protected void renderPrimitive(OsmPrimitive primitive) { setIcon(ImageProvider.get(primitive.getPrimitiveId().getType())); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 2711) @@ -105,5 +105,5 @@ /** * Replies the primitive at row row in this model - * + * * @param row the row * @return the primitive at row row in this model Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 2711) @@ -26,5 +26,5 @@ /** - * Loads the the object history of an collection of objects from the + * Loads the object history of an collection of objects from the * server. * @@ -58,5 +58,5 @@ /** * Creates a new task - * + * * @param parent the component to be used as reference to find the parent for {@see PleaseWaitDialog}. * Must not be null. Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/ConfigurationParameterRequestHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ConfigurationParameterRequestHandler.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/ConfigurationParameterRequestHandler.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/MaxChangesetSizeExceededPolicy.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/MaxChangesetSizeExceededPolicy.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/MaxChangesetSizeExceededPolicy.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 2711) @@ -82,5 +82,4 @@ private boolean canceled = false; - /** @@ -183,5 +182,4 @@ pnlBasicUploadSettings.addPropertyChangeListener(pnlTagSettings); - // make sure the the configuration panels listen to each other // changes @@ -240,5 +238,5 @@ * @param toUpload the dataset with the objects to upload. If null, assumes the empty * set of objects to upload - * + * */ public void setUploadedPrimitives(APIDataSet toUpload) { @@ -299,5 +297,5 @@ /** * Replies the {@see UploadStrategySpecification} the user entered in the dialog. - * + * * @return the {@see UploadStrategySpecification} the user entered in the dialog. */ Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 2711) @@ -47,5 +47,5 @@ /** * Creates the upload task - * + * * @param strategy the upload strategy specification * @param layer the layer. Must not be null. Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 2711) @@ -77,5 +77,4 @@ import org.xml.sax.SAXException; - /** This class displays the window to select the GPX file and the offset (timezone + delta). * Then it correlates the images of the layer with that GPX file. @@ -546,10 +545,8 @@ panelTf.add(panelCb, gbc); - gbc = GBC.eol().fill(GBC.HORIZONTAL).insets(0,0,0,12); gbc.gridx = 0; gbc.gridy = y++; panelTf.add(new JSeparator(SwingConstants.HORIZONTAL), gbc); - gbc = GBC.std(); @@ -664,5 +661,4 @@ outerPanel.setLayout(new BorderLayout()); outerPanel.add(statusBar, BorderLayout.PAGE_END); - syncDialog = new ExtendedDialog( @@ -766,5 +762,4 @@ } - for (ImageEntry ie : yLayer.data) { ie.applyTmp(); @@ -772,5 +767,4 @@ yLayer.updateBufferAndRepaint(); - break; @@ -883,6 +877,4 @@ tfTimezone.getDocument().addDocumentListener(statusBarListener); tfOffset.getDocument().addDocumentListener(statusBarListener); - - lblMatches.setText(statusBarText.getText() + tr("
(Time difference of {0} days)", Math.abs(dayOffset))); @@ -1229,5 +1221,4 @@ } - private String formatTimezone(double timezone) { StringBuffer ret = new StringBuffer(); @@ -1252,5 +1243,4 @@ String error = tr("Error while parsing timezone.\nExpected format: {0}", "+H:MM"); - if (timezone.length() == 0) Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 2711) @@ -73,5 +73,5 @@ List data; GpxLayer gpxLayer; - + private Icon icon = ImageProvider.get("dialogs/geoimage/photo-marker"); private Icon selectedIcon = ImageProvider.get("dialogs/geoimage/photo-marker-selected"); @@ -709,6 +709,6 @@ } } - - public void loadThumbs() { + + public void loadThumbs() { if (useThumbs && !thumbsLoaded) { thumbsLoaded = true; @@ -719,5 +719,5 @@ } } - + public void updateBufferAndRepaint() { updateOffscreenBuffer = true; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 2711) @@ -52,5 +52,5 @@ private String osdText = null; - + private static int DRAG_BUTTON = Main.pref.getBoolean("geoimage.agpifo-style-drag-and-zoom", false) ? 1 : 3; private static int ZOOM_BUTTON = DRAG_BUTTON == 1 ? 3 : 1; @@ -130,6 +130,6 @@ // Calculate the mouse cursor position in image coordinates, so that we can center the zoom - // on that mouse position. - // To avoid issues when the user tries to zoom in on the image borders, this point is not calculated + // on that mouse position. + // To avoid issues when the user tries to zoom in on the image borders, this point is not calculated // again if there was less than 1.5seconds since the last event. if (e.getWhen() - lastTimeForMousePoint > 1500 || mousePointInImg == null) { @@ -536,5 +536,5 @@ return calculateDrawImageRectangle(visibleRect, new Rectangle(0, 0, getSize().width, getSize().height)); } - + /** * calculateDrawImageRectangle Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 2711) @@ -115,3 +115,2 @@ } } - Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 2711) @@ -219,5 +219,4 @@ } - private GeoImageLayer currentLayer = null; private ImageEntry currentEntry = null; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java (revision 2711) @@ -18,5 +18,5 @@ return instance; } - + @Override public boolean accept(File f) { if (f.isDirectory()) { @@ -32,3 +32,2 @@ } } - Index: /trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java (revision 2711) @@ -99,5 +99,5 @@ /** * Asynchronously loads available translations - * + * */ protected void reloadAvailableTranslations() { @@ -107,5 +107,5 @@ /** * Asynchronous task to lookup the available translations. - * + * */ private class AvailableTranslationsLoader extends PleaseWaitRunnable { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java (revision 2711) @@ -30,6 +30,4 @@ public class ProxyPreferences implements PreferenceSetting { - - public static class Factory implements PreferenceSettingFactory { Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (revision 2711) @@ -47,5 +47,5 @@ * to edit the key of a tag. In this case the auto completion list is * initialized with the set of standard key values and the set of current key - * values from the the current JOSM data set. Keys already present in the + * values from the current JOSM data set. Keys already present in the * current tag model are removed from the auto completion list. * Index: /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/gui/widgets/SelectAllOnFocusGainedDecorator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/SelectAllOnFocusGainedDecorator.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/SelectAllOnFocusGainedDecorator.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/io/CacheFiles.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/CacheFiles.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/CacheFiles.java (revision 2711) @@ -57,8 +57,8 @@ this(ident, true); } - + public CacheFiles(String ident, boolean isPlugin) { String pref = isPlugin ? Main.pref.getPluginsDirFile().getPath() : Main.pref.getPreferencesDir(); - + boolean dir_writeable; this.ident = ident; Index: /trunk/src/org/openstreetmap/josm/io/Capabilities.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/Capabilities.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/Capabilities.java (revision 2711) @@ -77,5 +77,5 @@ * don't include this parameter or if the parameter value is illegal (not a number, * a negative number) - * + * * @return the max number of objects in a changeset */ Index: /trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java (revision 2711) @@ -51,5 +51,5 @@ /** * Replies true if errorHeader matches with {@see #ERROR_HEADER_PATTERN} - * + * * @param errorHeader the error header * @return true if errorHeader matches with {@see #ERROR_HEADER_PATTERN} @@ -91,5 +91,5 @@ /** * Creates the exception with the given errorHeader - * + * * @param errorHeader the error header */ @@ -103,5 +103,5 @@ * Creates the exception with the given error header and the given * source. - * + * * @param errorHeader the error header * @param source the source for the exception @@ -115,5 +115,5 @@ /** * Creates the exception - * + * * @param changesetId the id if the closed changeset * @param closedOn the date the changeset was closed on @@ -129,5 +129,5 @@ /** * Replies the id of the changeset which was closed - * + * * @return the id of the changeset which was closed */ @@ -138,5 +138,5 @@ /** * Replies the date the changeset was closed - * + * * @return the date the changeset was closed. May be null if the date isn't known. */ @@ -147,5 +147,5 @@ /** * Replies the source where the exception was thrown - * + * * @return the source */ Index: /trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 2711) @@ -20,9 +20,9 @@ * Replies a changeset query object from the query part of a OSM API URL for querying * changesets. - * + * * @param query the query part * @return the query object * @throws ChangesetQueryUrlException thrown if query doesn't consist of valid query parameters - * + * */ static public ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{ @@ -48,5 +48,5 @@ /** * Restricts the query to changesets owned by the user with id uid. - * + * * @param uid the uid of the user. >0 expected. * @return the query object with the applied restriction @@ -64,8 +64,8 @@ /** * Restricts the query to changesets owned by the user with user name username. - * + * * Caveat: for historical reasons the username might not be unique! It is recommended to use * {@see #forUser(int)} to restrict the query to a specific user. - * + * * @param username the username. Must not be null. * @return the query object with the applied restriction @@ -83,5 +83,5 @@ * Replies true if this query is restricted to user whom we only know the user name * for. - * + * * @return true if this query is restricted to user whom we only know the user name * for @@ -94,5 +94,5 @@ * Replies the user name which this query is restricted to. null, if this query isn't * restricted to a user name, i.e. if {@see #isRestrictedToPartiallyIdentifiedUser()} is false. - * + * * @return the user name which this query is restricted to */ @@ -103,5 +103,5 @@ /** * Replies true if this query is restricted to user whom know the user id for. - * + * * @return true if this query is restricted to user whom know the user id for */ @@ -112,10 +112,10 @@ /** * Replies a query which is restricted to a bounding box. - * + * * @param minLon min longitude of the bounding box. Valid longitude value expected. * @param minLat min latitude of the bounding box. Valid latitude value expected. * @param maxLon max longitude of the bounding box. Valid longitude value expected. * @param maxLat max latitude of the bounding box. Valid latitude value expected. - * + * * @return the restricted changeset query * @throws IllegalArgumentException thrown if either of the parameters isn't a valid longitude or @@ -137,8 +137,8 @@ /** * Replies a query which is restricted to a bounding box. - * + * * @param min the min lat/lon coordinates of the bounding box. Must not be null. * @param max the max lat/lon coordiantes of the bounding box. Must not be null. - * + * * @return the restricted changeset query * @throws IllegalArgumentException thrown if min is null @@ -154,5 +154,5 @@ /** * Replies a query which is restricted to a bounding box given by bbox. - * + * * @param bbox the bounding box. Must not be null. * @return the changeset query @@ -168,5 +168,5 @@ * Restricts the result to changesets which have been closed after the date given by d. * d d is a date relative to the current time zone. - * + * * @param d the date . Must not be null. * @return the restricted changeset query @@ -183,5 +183,5 @@ * habe been created before createdBefore. Both dates are expressed relative to the current * time zone. - * + * * @param closedAfter only reply changesets closed after this date. Must not be null. * @param createdBefore only reply changesets created before this date. Must not be null. @@ -201,5 +201,5 @@ * Restricts the result to changesets which are or aren't open, depending on the value of * isOpen - * + * * @param isOpen whether changesets should or should not be open * @return the restricted changeset query @@ -213,5 +213,5 @@ * Restricts the result to changesets which are or aren't closed, depending on the value of * isClosed - * + * * @param isClosed whether changesets should or should not be open * @return the restricted changeset query @@ -224,5 +224,5 @@ /** * Replies the query string to be used in a query URL for the OSM API. - * + * * @return the query string */ @@ -268,5 +268,4 @@ return sb.toString(); } - public static class ChangesetQueryUrlException extends Exception { @@ -408,13 +407,13 @@ * Parses the changeset query given as URL query parameters and replies a * {@see ChangesetQuery} - * + * * query is the query part of a API url for querying changesets, * see OSM API. - * + * * Example for an query string:
* 
          *    uid=1234&open=true
          *
- * + * * @param query the query string. If null, an empty query (identical to a query for all changesets) is * assumed Index: /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 2711) @@ -53,5 +53,5 @@ /** * Creates a diff result reader - * + * * @param primitives the collection of primitives which have been uploaded. If null, * assumes an empty collection. @@ -67,10 +67,10 @@ /** * Parse the response from a diff upload to the OSM API. - * + * * @param diffUploadResponse the response. Must not be null. * @param progressMonitor a progress monitor. Defaults to {@see NullProgressMonitor#INSTANCE} if null * @throws IllegalArgumentException thrown if diffUploadRequest is null * @throws OsmDataParsingException thrown if the diffUploadRequest can't be parsed successfully - * + * */ public void parse(String diffUploadResponse, ProgressMonitor progressMonitor) throws OsmDataParsingException { @@ -99,9 +99,9 @@ /** * Postprocesses the diff result read and parsed from the server. - * + * * Uploaded objects are assigned their new id (if they got assigned a new * id by the server), their new version (if the version was incremented), * and the id of the changeset to which they were uploaded. - * + * * @param cs the current changeset. Ignored if null. * @param monitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if null Index: /trunk/src/org/openstreetmap/josm/io/FileImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 2711) @@ -31,5 +31,5 @@ return false; } - + /** * Needs to be implemented if isBatchImporter() returns false. @@ -79,5 +79,5 @@ /** - * If multiple files (with multiple file formats) are selected, + * If multiple files (with multiple file formats) are selected, * they are opened in the order of their priorities. * Highest priority comes first. Index: /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java (revision 2711) @@ -68,5 +68,5 @@ /** * Writes the prolog of the OsmChange document - * + * * @throws IllegalStateException thrown if the prologs has already been written */ @@ -82,5 +82,5 @@ /** * Appends a collection of {@see OsmPrimitive}s to the OsmChange document. - * + * * @param primitives the collection of primitives. Ignored if null. * @throws IllegalStateException thrown if the prologs has not been written yet @@ -99,5 +99,5 @@ /** * Appends an {@see OsmPrimitive} to the OsmChange document. - * + * * @param p the primitive. Ignored if null. * @throws IllegalStateException thrown if the prologs has not been written yet @@ -115,5 +115,5 @@ /** * Writes the epilog of the OsmChange document - * + * * @throws IllegalStateException thrown if the prologs has not been written yet */ Index: /trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 2711) @@ -274,5 +274,5 @@ /** * Create a parser - * + * * @param source the input stream with the changeset content as XML document. Must not be null. * @throws IllegalArgumentException thrown if source is null. @@ -292,5 +292,5 @@ /** * Parses the content - * + * * @param progressMonitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} * if null @@ -323,5 +323,5 @@ /** * Parses the content from the input source - * + * * @return the parsed data * @throws OsmDataParsingException thrown if something went wrong. Check for chained Index: /trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 2711) @@ -17,8 +17,8 @@ /** * OsmServerObjectReader reads an individual object from the OSM server. - * + * * It can either download the object including or not including its immediate children. * The former case is called a "full download". - * + * */ public class OsmServerObjectReader extends OsmServerReader { @@ -30,5 +30,5 @@ /** * Creates a new server object reader for a given id and a primitive type. - * + * * @param id the object id. > 0 required. * @param type the type. Must not be null. @@ -49,5 +49,5 @@ /** * Creates a new server object reader for an object with the given id - * + * * @param id the object id. Must not be null. Unique id > 0 required. * @param full true, if a full download is requested (i.e. a download including @@ -67,5 +67,5 @@ /** * Downloads and parses the data. - * + * * @param progressMonitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if * null Index: /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 2711) @@ -46,5 +46,4 @@ long uploadStartTime; - public String timeLeft(int progress, int list_size) { Index: /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (revision 2711) @@ -18,5 +18,5 @@ /** * Looks up the credentials for a given type. - * + * * @param the type of service. {@see RequestorType#SERVER} for the OSM API server, {@see RequestorType#PROXY} * for a proxy server @@ -28,5 +28,5 @@ /** * Saves the credentials in credentials for the given service type. - * + * * @param the type of service. {@see RequestorType#SERVER} for the OSM API server, {@see RequestorType#PROXY} * for a proxy server @@ -37,5 +37,5 @@ /** - * + * * @param requestorType the type of service. {@see RequestorType#SERVER} for the OSM API server, {@see RequestorType#PROXY} * for a proxy server Index: /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerException.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerException.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerException.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerFactory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerFactory.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerFactory.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerResponse.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerResponse.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerResponse.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java (revision 2711) Index: /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 2711) @@ -45,5 +45,5 @@ JOptionPane.showMessageDialog(Main.parent, "JOSM is out of memory. " + "Strange things may happen.\nPlease restart JOSM with the -Xmx###M option,\n" + - "where ### is the the number of MB assigned to JOSM (e.g. 256).\n" + + "where ### is the number of MB assigned to JOSM (e.g. 256).\n" + "Currently, " + Runtime.getRuntime().maxMemory()/1024/1024 + " MB are available to JOSM.", tr("Error"), @@ -98,5 +98,5 @@ p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0)); p.add(new JLabel(tr("

" + - "There the the error information provided below should already be
" + + "There the error information provided below should already be
" + "filled out for you. Please include information on how to reproduce
" + "the error and try to supply as much detail as possible.

")), GBC.eop()); Index: /trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (revision 2710) +++ /trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (revision 2711)