Changeset 2711 in josm for trunk/src/org


Ignore:
Timestamp:
2009-12-30T20:18:59+01:00 (14 years ago)
Author:
stoecker
Message:

fix bad line endings

Location:
trunk/src/org/openstreetmap/josm
Files:
81 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

    r2626 r2711  
    6060    }
    6161
    62 
    6362    public void actionPerformed(ActionEvent e) {
    6463        if (!isEnabled())

  • trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

    r2685 r2711  
    3434     * Does nothing if there either isn't a current map view or if there isn't a current data
    3535     * layer.
    36      * 
     36     *
    3737     */
    3838    public static void zoomToSelection() {

  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r2573 r2711  
    179179            }
    180180        }
    181 
    182181
    183182        // create the new way and apply the new node list

  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r2565 r2711  
    176176            return null;
    177177
    178 
    179178        Set<RelationToChildReference> relationToNodeReferences = RelationToChildReference.getRelationToChildReferences(nodes);
    180179

  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r2628 r2711  
    434434        }
    435435
    436 
    437436        return new SplitWayResult(new SequenceCommand(tr("Split way {0} into {1} parts",
    438437                way.getDisplayName(DefaultNameFormatter.getInstance()),

  • trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

    r2598 r2711  
    4242
    4343    public void updateLayer(OsmDataLayer layer) {
    44        
     44
    4545    }
    4646

  • trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

    r2701 r2711  
    670670    }
    671671
    672 
    673 
    674672    private Match parseKV(String key, String value) throws ParseError {
    675673        if (value == null) {

  • trunk/src/org/openstreetmap/josm/data/APIDataSet.java

    r2598 r2711  
    213213    /**
    214214     * Replies the number of objects to upload
    215      * 
     215     *
    216216     * @return the number of objects to upload
    217217     */

  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r2666 r2711  
    134134    private final CopyOnWriteArrayList<PreferenceChangedListener> listeners = new CopyOnWriteArrayList<PreferenceChangedListener>();
    135135
    136 
    137136    public void addPreferenceChangeListener(PreferenceChangedListener listener) {
    138137        if (listener != null) {
    … …  
    364363        return put(key, Long.toString(value));
    365364    }
    366 
    367365
    368366    /**

  • trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

    r2699 r2711  
    203203     * Replies a clone of this lat LatLon, rounded to OSM precisions, i.e. to
    204204     * MAX_SERVER_PRECISION
    205      * 
     205     *
    206206     * @return a clone of this lat LatLon
    207207     */
    … …  
    212212        );
    213213    }
    214 
    215214
    216215    @Override

  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r2682 r2711  
    3030import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
    3131import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
    32 
    3332
    3433/**

  • trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java

    r2686 r2711  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.osm;
    3 
    43
    54public interface NameFormatter {

  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r2696 r2711  
    154154    /**
    155155     * Replies the collection of referring primitives for the primitives in <code>primitives</code>.
    156      * 
     156     *
    157157     * @param primitives the collection of primitives.
    158158     * @return the collection of referring primitives for the primitives in <code>primitives</code>;
    … …  
    167167        return ret;
    168168    }
    169 
    170169
    171170    /* mappaint data */
    … …  
    249248    /**
    250249     * Creates a new primitive for the given id.
    251      * 
     250     *
    252251     * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing.
    253252     * If allowNegativeId is not set, then id will have to be 0 (in that case new unique id will be generated) or
    … …  
    571570     * Replies a list of direction-dependent keys that make an object
    572571     * direction dependent.
    573      * 
     572     *
    574573     * @return  a list of direction-dependent keys that make an object
    575574     * direction dependent.
    … …  
    628627    }
    629628
    630 
    631629    /**
    632630     * Replies the id of the changeset this primitive was last uploaded to.
    633631     * 0 if this primitive wasn't uploaded to a changeset yet or if the
    634632     * changeset isn't known.
    635      * 
     633     *
    636634     * @return the id of the changeset this primitive was last uploaded to.
    637635     */
    … …  
    640638    }
    641639
    642 
    643640    /**
    644641     * Sets the changeset id of this primitive. Can't be set on a new
    645642     * primitive.
    646      * 
     643     *
    647644     * @param changesetId the id. >= 0 required.
    648645     * @throws IllegalStateException thrown if this primitive is new.
    … …  
    11371134    }
    11381135
    1139 
    11401136    /**
    11411137     * true if this object has direction dependent tags (e.g. oneway)

  • trunk/src/org/openstreetmap/josm/data/osm/PrimitiveId.java

    r2598 r2711  
    99    /**
    1010     * Replies true if this id represents a new primitive.
    11      * 
     11     *
    1212     * @return true if this id represents a new primitive.
    1313     */

  • trunk/src/org/openstreetmap/josm/data/osm/User.java

    r2638 r2711  
    120120    /*
    121121     * Returns the list of user names
    122      * 
     122     *
    123123     * @returns list of names
    124124     */
    … …  
    129129    /*
    130130     * Adds a user name to the list if it is not there, yet.
    131      * 
     131     *
    132132     * @param name
    133133     */
    … …  
    138138    /*
    139139     * Returns true if the name is in the names list
    140      * 
     140     *
    141141     * @param name
    142142     */

  • trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java

    r2655 r2711  
    66import org.openstreetmap.josm.data.osm.DataSet;
    77import org.openstreetmap.josm.data.osm.OsmPrimitive;
    8 
    98
    109public abstract class AbstractDatasetChangedEvent {

  • trunk/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java

    r2655 r2711  
    66import org.openstreetmap.josm.data.osm.DataSet;
    77import org.openstreetmap.josm.data.osm.OsmPrimitive;
    8 
    98
    109public class ChangesetIdChangedEvent extends AbstractDatasetChangedEvent {

  • trunk/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java

    r2652 r2711  
    77import org.openstreetmap.josm.data.osm.DataSet;
    88import org.openstreetmap.josm.data.osm.OsmPrimitive;
    9 
    109
    1110public class DataChangedEvent extends AbstractDatasetChangedEvent {

  • trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java

    r2655 r2711  
    2121
    2222package org.openstreetmap.josm.data.osm.event;
    23 
    2423
    2524/**

  • trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

    r2658 r2711  
    1212import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1313
    14 
    1514/**
    1615 * This class allows to add DatasetListener to currently active dataset. If active
    … …  
    1817 * (it's no longer necessary to register for layer events and reregister every time
    1918 * new layer is selected)
    20  * 
     19 *
    2120 * Events in EDT are supported, see {@link #addDatasetListener(DataSetListener, boolean)}
    2221 *

  • trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java

    r2645 r2711  
    3232
    3333    /**
    34      * 
     34     *
    3535     * @return True if primitive was in dataset before (so it's not really added), but it was incomplete
    3636     */

  • trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java

    r2645 r2711  
    3232
    3333    /**
    34      * 
     34     *
    3535     * @return True if primitive wasn't really removed from the dataset, it only become incomplete again
    3636     */

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

    r2686 r2711  
    192192    }
    193193
    194 
    195 
    196194    @Override
    197195    public int hashCode() {

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

    r2686 r2711  
    8080    /**
    8181     * Replies true if this way is closed.
    82      * 
     82     *
    8383     * @return true if this way is closed.
    8484     */

  • trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java

    r2561 r2711  
    77
    88/**
    9  * Represents a relation member in the the context of a historical view on
     9 * Represents a relation member in the context of a historical view on
    1010 * OSM data.
    1111 *

  • trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

    r2689 r2711  
    208208    /**
    209209     * Builds a default tooltip text for the primitive <code>primitive</code>.
    210      * 
     210     *
    211211     * @param primitive the primitmive
    212212     * @return the tooltip text
    … …  
    244244    }
    245245
    246 
    247246    /**
    248247     * Decorates the name of primitive with its id, if the preference
    249248     * <tt>osm-primitives.showid</tt> is set.
    250      * 
     249     *
    251250     * The id is append to the {@see StringBuilder} passed in in <code>name</code>.
    252251     *
    … …  
    259258        }
    260259    }
    261 
    262260
    263261    /**
    … …  
    324322        return sb.toString();
    325323    }
    326 
    327324
    328325    /**
    … …  
    373370    /**
    374371     * Builds a default tooltip text for an HistoryOsmPrimitive <code>primitive</code>.
    375      * 
     372     *
    376373     * @param primitive the primitmive
    377374     * @return the tooltip text

  • trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

    r2662 r2711  
    193193
    194194    private boolean setupDone = false;
    195    
     195
    196196    /**
    197197     * This is called by showDialog().

  • trunk/src/org/openstreetmap/josm/gui/MapView.java

    r2668 r2711  
    8989    /**
    9090     * Removes a layer change listener
    91      * 
     91     *
    9292     * @param listener the listener. Ignored if null or already registered.
    9393     */
    … …  
    100100    }
    101101
    102 
    103 
    104102    /**
    105103     * Adds a layer change listener
    106      * 
     104     *
    107105     * @param listener the listener. Ignored if null or already registered.
    108106     */
    … …  
    303301    }
    304302
    305 
    306303    /**
    307304     * Determines the next active data layer according to the following

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java

    r2512 r2711  
    1414
    1515/**
    16  * {@see TableCellEditor} for the the role column in a table for {@see RelationMember}s.
     16 * {@see TableCellEditor} for the role column in a table for {@see RelationMember}s.
    1717 *
    1818 */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r2710 r2711  
    124124    }
    125125
    126 
    127 
    128126    @Override
    129127    public void tearDown() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

    r2613 r2711  
    5151     * Invoke before the panel is discarded. This will in turn call {@see ToggleDialog#tearDown()}
    5252     * on every dialog.
    53      * 
     53     *
    5454     */
    5555    public void tearDown() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r2710 r2711  
    128128        buttonPanel.add(new SideButton(mergeLayerAction));
    129129
    130 
    131130        //-- delete layer action
    132131        DeleteLayerAction deleteLayerAction = new DeleteLayerAction();
    … …  
    772771
    773772        /**
    774          * Replies true if the the currently selected layers can move up
     773         * Replies true if the currently selected layers can move up
    775774         * by one position
    776775         *
    777          * @return true if the the currently selected layers can move up
     776         * @return true if the currently selected layers can move up
    778777         * by one position
    779778         */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

    r2710 r2711  
    264264
    265265    /**
    266      * Closes the the detached dialog if this toggle dialog is currently displayed
     266     * Closes the detached dialog if this toggle dialog is currently displayed
    267267     * in a detached dialog.
    268268     *

  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r2710 r2711  
    210210                JOptionPane.showMessageDialog(
    211211                        Main.parent,
    212                         tr("<html>Failed to create an URL because the encoding ''{0}'' was<br>"
     212                        tr("<html>Failed to create an URL because the encoding ''{0}''<br>"
    213213                                + "was missing on this system.</html>", "UTF-8"),
    214214                                tr("Missing encoding"),

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

    r2689 r2711  
    5959 * downloading, querying, closing changesets, in addition to removing changesets from
    6060 * the local cache.
    61  * 
     61 *
    6262 */
    6363public class ChangesetCacheManager extends JFrame {
    … …  
    6868    /**
    6969     * Replies the unique instance of the changeset cache manager
    70      * 
     70     *
    7171     * @return the unique instance of the changeset cache manager
    7272     */
    … …  
    8181     * Hides and destroys the unique instance of the changeset cache
    8282     * manager.
    83      * 
     83     *
    8484     */
    8585    public static void destroyInstance() {
    … …  
    9191    }
    9292
    93 
    9493    private ChangesetCacheManagerModel model;
    9594    private JSplitPane spContent;
    … …  
    102101    private JTable tblChangesets;
    103102
    104 
    105103    /**
    106104     * Creates the various models required
    … …  
    119117    /**
    120118     * builds the toolbar panel in the heading of the dialog
    121      * 
     119     *
    122120     * @return the toolbar panel
    123121     */
    … …  
    135133    /**
    136134     * builds the button panel in the footer of the dialog
    137      * 
     135     *
    138136     * @return the button row pane
    139137     */
    … …  
    156154    /**
    157155     * Builds the panel with the changeset details
    158      * 
     156     *
    159157     * @return the panel with the changeset details
    160158     */
    … …  
    181179        tp.setToolTipTextAt(0, tr("Display the basic properties of the changeset"));
    182180        tp.setTitleAt(1, tr("Tags"));
    183         tp.setToolTipTextAt(1, tr("Display the the tags of the changeset"));
     181        tp.setToolTipTextAt(1, tr("Display the tags of the changeset"));
    184182        tp.setTitleAt(2, tr("Content"));
    185183        tp.setToolTipTextAt(2, tr("Display the objects created, updated, and deleted by the changeset"));
    … …  
    191189    /**
    192190     * builds the content panel of the dialog
    193      * 
     191     *
    194192     * @return the content panel
    195193     */
    … …  
    210208     * Builds the table with actions which can be applied to the currently visible changesets
    211209     * in the changeset table.
    212      * 
     210     *
    213211     * @return
    214212     */
    … …  
    241239    /**
    242240     * Builds the panel with the table of changesets
    243      * 
     241     *
    244242     * @return the panel with the table of changesets
    245243     */
    … …  
    266264    }
    267265
    268 
    269266    protected void build() {
    270267        setTitle(tr(("Changeset Management Dialog")));
    … …  
    289286        addWindowListener(new WindowEventHandler());
    290287    }
    291 
    292288
    293289    public ChangesetCacheManager() {
    … …  
    594590     * Selects the changesets  in <code>changests</code>, provided the
    595591     * respective changesets are already present in the local changeset cache.
    596      * 
     592     *
    597593     * @param ids the collection of changesets. If null, the selection is cleared.
    598594     */
    … …  
    608604     * Selects the changesets with the ids in <code>ids</code>, provided the
    609605     * respective changesets are already present in the local changeset cache.
    610      * 
     606     *
    611607     * @param ids the collection of ids. If null, the selection is cleared.
    612608     */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java

    r2689 r2711  
    4949     * Sets the changeset currently displayed in the detail view. Fires a property change event
    5050     * for the property {@see #CHANGESET_IN_DETAIL_VIEW_PROP} if necessary.
    51      * 
     51     *
    5252     * @param cs the changeset currently displayed in the detail view.
    5353     */
    … …  
    6262    /**
    6363     * Replies true if there is at least one selected changeset
    64      * 
     64     *
    6565     * @return true if there is at least one selected changeset
    6666     */
    … …  
    7171    /**
    7272     * Replies the list of selected changesets
    73      * 
     73     *
    7474     * @return the list of selected changesets
    7575     */
    … …  
    8787    /**
    8888     * Replies a set of ids of the selected changesets
    89      * 
     89     *
    9090     * @return a set of ids of the selected changesets
    9191     */
    … …  
    100100    /**
    101101     * Selects the changesets in <code>selected</code>.
    102      * 
     102     *
    103103     * @param selected the collection of changesets to select. Ignored if empty.
    104104     */
    … …  
    117117    /**
    118118     * Selects the changeset displayed at row <code>row</code>
    119      * 
     119     *
    120120     * @param row the row. Ignored if < 0 or >= {@see #getRowCount()}
    121121     */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheSortSpecification.java

    r2689 r2711  
    1717    }
    1818
    19 
    2019}

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java

    r2689 r2711  
    99/**
    1010 * The column model for the changeset table
    11  * 
     11 *
    1212 */
    1313public class ChangesetCacheTableColumnModel extends DefaultTableColumnModel {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java

    r2689 r2711  
    4343    /**
    4444     * Initialize the task with a collection of changeset ids to download
    45      * 
     45     *
    4646     * @param ids the collection of ids. May be null.
    4747     */
    … …  
    6161    /**
    6262     * Creates a download task for a single changeset
    63      * 
     63     *
    6464     * @param changesetId the changeset id. >0 required.
    6565     * @throws IllegalArgumentException thrown if changesetId <= 0
    … …  
    7575     * Creates a download task for a collection of changesets. null values and id <=0 in
    7676     * the collection are sillently discarded.
    77      * 
     77     *
    7878     * @param changesetIds the changeset ids. Empty collection assumed, if null.
    7979     */
    … …  
    8585    /**
    8686     * Creates a download task for a single changeset
    87      * 
     87     *
    8888     * @param parent the parent component for the {@see PleaseWaitDialog}. Must not be null.
    8989     * @param changesetId the changeset id. >0 required.
    … …  
    101101     * Creates a download task for a collection of changesets. null values and id <=0 in
    102102     * the collection are sillently discarded.
    103      * 
     103     *
    104104     * @param parent the parent component for the {@see PleaseWaitDialog}. Must not be null.
    105105     * @param changesetIds the changeset ids. Empty collection assumed, if null.
    … …  
    114114     * Replies true if the local {@see ChangesetCache} already includes the changeset with
    115115     * id <code>changesetId</code>.
    116      * 
     116     *
    117117     * @param changsetId the changeset id
    118118     * @return true if the local {@see ChangesetCache} already includes the changeset with
    … …  
    126126     * Downloads the changeset with id <code>changesetId</code> (only "header"
    127127     * information, no content)
    128      * 
     128     *
    129129     * @param changesetId the changeset id
    130130     * @throws OsmTransferException thrown if something went wrong

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

    r2689 r2711  
    5858 * It listens to property change events for {@see ChangesetCacheManagerModel#CHANGESET_IN_DETAIL_VIEW_PROP}
    5959 * and updates its view accordingly.
    60  * 
     60 *
    6161 */
    6262public class ChangesetContentPanel extends JPanel implements PropertyChangeListener{
    … …  
    167167        setCurrentChangeset(cs);
    168168    }
    169 
    170169
    171170    /**

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java

    r2689 r2711  
    5555    }
    5656
    57 
    5857    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
    5958            int row, int column) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java

    r2689 r2711  
    1111/**
    1212 * The column model for the changeset content
    13  * 
     13 *
    1414 */
    1515public class ChangesetContentTableColumnModel extends DefaultTableColumnModel {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java

    r2689 r2711  
    3232    /**
    3333     * Replies true if there is at least one selected primitive in the table model
    34      * 
     34     *
    3535     * @return true if there is at least one selected primitive in the table model
    3636     */
    … …  
    6464     * Populates the model with the content of a model. If ds is null, the
    6565     * table is cleared.
    66      * 
     66     *
    6767     * @param ds the changeset content.
    6868     */
    … …  
    133133     * The type used internally to keep information about {@see HistoryOsmPrimitive}
    134134     * with their {@see ChangesetModificationType}.
    135      * 
     135     *
    136136     */
    137137    static private class ChangesetContentEntry implements ChangesetDataSetEntry{

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

    r2689 r2711  
    4545 * This panel displays the properties of the currently selected changeset in the
    4646 * {@see ChangesetCacheManager}.
    47  * 
     47 *
    4848 */
    4949public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener{
    … …  
    315315    }
    316316
    317 
    318317    /**
    319318     * Updates the current changeset from the OSM server
    … …  
    348347
    349348    /**
    350      * Selects the primitives in the content of this changeset in the the current
     349     * Selects the primitives in the content of this changeset in the current
    351350     * data layer.
    352      * 
     351     *
    353352     */
    354353    class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{
    … …  
    417416
    418417    /**
    419      * Zooms to the primitives in the content of this changeset in the the current
     418     * Zooms to the primitives in the content of this changeset in the current
    420419     * data layer.
    421      * 
     420     *
    422421     */
    423422    class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java

    r2689 r2711  
    2929 * This is an asynchronous task for downloading a collection of changests from the OSM
    3030 * server.
    31  * 
     31 *
    3232 * The  task only downloads the changeset properties without the changeset content. It
    3333 * updates the global {@see ChangesetCache}.
    34  * 
     34 *
    3535 */
    3636public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements ChangesetDownloadTask{
    … …  
    3838    /**
    3939     * Builds a download task from for a collection of changesets.
    40      * 
     40     *
    4141     * Ignores null values and changesets with {@see Changeset#isNew()} == true.
    42      * 
     42     *
    4343     * @param changesets the collection of changesets. Assumes an empty collection if null.
    4444     * @return the download task
    … …  
    5050    /**
    5151     * Builds a download task from for a collection of changesets.
    52      * 
     52     *
    5353     * Ignores null values and changesets with {@see Changeset#isNew()} == true.
    54      * 
     54     *
    5555     * @param parent the parent component relative to which the {@see PleaseWaitDialog} is displayed.
    5656     * Must not be null.
    … …  
    7878
    7979    }
    80 
    8180
    8281    private Set<Integer> idsToDownload;
    … …  
    104103     * Creates the download task for a collection of changeset ids. Uses a {@see PleaseWaitDialog}
    105104     * whose parent is {@see Main#parent}.
    106      * 
     105     *
    107106     * Null ids or or ids <= 0 in the id collection are ignored.
    108      * 
     107     *
    109108     * @param ids the collection of ids. Empty collection assumed if null.
    110109     */
    … …  
    118117     * Creates the download task for a collection of changeset ids. Uses a {@see PleaseWaitDialog}
    119118     * whose parent is the parent window of <code>dialogParent</code>.
    120      * 
     119     *
    121120     * Null ids or or ids <= 0 in the id collection are ignored.
    122      * 
     121     *
    123122     * @param dialogParent the parent reference component for the {@see PleaseWaitDialog}. Must not be null.
    124123     * @param ids the collection of ids. Empty collection assumed if null.

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java

    r2689 r2711  
    2323    }
    2424
    25 
    2625    /* ---------------------------------------------------------------------------- */
    2726    /* Interface LayerChangeListener                                                */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java

    r2655 r2711  
    183183    /**
    184184     * Replies true if  there is at least one selected open changeset
    185      * 
     185     *
    186186     * @return true if  there is at least one selected open changeset
    187187     */
    … …  
    192192    /**
    193193     * Replies the selected open changesets
    194      * 
     194     *
    195195     * @return the selected open changesets
    196196     */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java

    r2689 r2711  
    1616/**
    1717 * This panel displays the tags of the currently selected changeset in the {@see ChangesetCacheManager}
    18  * 
     18 *
    1919 */
    2020public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener{

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java

    r2689 r2711  
    2121/**
    2222 * This is the list model for the list of changeset in the current edit layer.
    23  * 
     23 *
    2424 */
    2525public class ChangesetsInActiveDataLayerListModel extends ChangesetListModel implements DataSetListener, EditLayerChangeListener {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java

    r2689 r2711  
    2626 * This panel allows to enter the ID of single changeset and to download
    2727 * the respective changeset.
    28  * 
     28 *
    2929 */
    3030public class SingleChangesetDownloadPanel extends JPanel {
    … …  
    6363     * Replies the changeset id entered in this panel. 0 if no changeset id
    6464     * or an invalid changeset id is currently entered.
    65      * 
     65     *
    6666     * @return the changeset id entered in this panel
    6767     */
    … …  
    117117    /**
    118118     * Validator for a changeset ID entered in a {@see JTextComponent}.
    119      * 
     119     *
    120120     */
    121121    static private class ChangesetIdValidator extends AbstractTextComponentValidator {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/ListOfUsedTags.java

    r2660 r2711  
    3535
    3636    /**
    37      * 
     37     *
    3838     * @param key
    3939     * @return List of used values or empty list if key is not used

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java

    r2563 r2711  
    3636    /**
    3737     * Creates the download task
    38      * 
     38     *
    3939     * @param relations a collection of relations. Must not be null.
    4040     * @param layer the layer which data is to be merged into

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r2700 r2711  
    184184    /**
    185185     * Creates the toolbar
    186      * 
     186     *
    187187     * @return the toolbar
    188188     */
    … …  
    487487        tb.setFloatable(false);
    488488
    489 
    490489        // -- add at end action
    491490        AddSelectedAtEndAction addSelectedAtEndAction = new AddSelectedAtEndAction();

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

    r2700 r2711  
    315315    /**
    316316     * Replies the set of incomplete primitives
    317      * 
     317     *
    318318     * @return the set of incomplete primitives
    319319     */
    … …  
    330330    /**
    331331     * Replies the set of selected incomplete primitives
    332      * 
     332     *
    333333     * @return the set of selected incomplete primitives
    334334     */
    … …  
    345345    /**
    346346     * Replies true if at least one the relation members is incomplete
    347      * 
     347     *
    348348     * @return true if at least one the relation members is incomplete
    349349     */
    … …  
    358358    /**
    359359     * Replies true if at least one of the selected members is incomplete
    360      * 
     360     *
    361361     * @return true if at least one of the selected members is incomplete
    362362     */
    … …  
    632632     * Replies true if <code>primitive</code> is currently selected in the layer this
    633633     * model is attached to
    634      * 
     634     *
    635635     * @param primitive the primitive
    636636     * @return true if <code>primitive</code> is currently selected in the layer this

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

    r2563 r2711  
    203203    }
    204204
    205 
    206205    /* ----------------------------------------------------------------------- */
    207206    /* property change support                                                 */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java

    r2563 r2711  
    5858    }
    5959
    60 
    6160    protected void renderPrimitive(OsmPrimitive primitive) {
    6261        setIcon(ImageProvider.get(primitive.getPrimitiveId().getType()));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java

    r2621 r2711  
    105105    /**
    106106     * Replies the primitive at row <code>row</code> in this model
    107      * 
     107     *
    108108     * @param row the row
    109109     * @return  the primitive at row <code>row</code> in this model

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

    r2689 r2711  
    2626
    2727/**
    28  * Loads the the object history of an collection of objects from the
     28 * Loads the object history of an collection of objects from the
    2929 * server.
    3030 *
    … …  
    5858    /**
    5959     * Creates a new task
    60      * 
     60     *
    6161     * @param parent the component to be used as reference to find the parent for {@see PleaseWaitDialog}.
    6262     * Must not be null.

  • trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

    r2618 r2711  
    8282
    8383    private boolean canceled = false;
    84 
    8584
    8685    /**
    … …  
    183182        pnlBasicUploadSettings.addPropertyChangeListener(pnlTagSettings);
    184183
    185 
    186184        // make sure the the configuration panels listen to each other
    187185        // changes
    … …  
    240238     * @param toUpload the dataset with the objects to upload. If null, assumes the empty
    241239     * set of objects to upload
    242      * 
     240     *
    243241     */
    244242    public void setUploadedPrimitives(APIDataSet toUpload) {
    … …  
    299297    /**
    300298     * Replies the {@see UploadStrategySpecification} the user entered in the dialog.
    301      * 
     299     *
    302300     * @return the {@see UploadStrategySpecification} the user entered in the dialog.
    303301     */

  • trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

    r2599 r2711  
    4747    /**
    4848     * Creates the upload task
    49      * 
     49     *
    5050     * @param strategy the upload strategy specification
    5151     * @param layer the layer. Must not be null.

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

    r2702 r2711  
    7777import org.xml.sax.SAXException;
    7878
    79 
    8079/** This class displays the window to select the GPX file and the offset (timezone + delta).
    8180 * Then it correlates the images of the layer with that GPX file.
    … …  
    546545        panelTf.add(panelCb, gbc);
    547546
    548 
    549547        gbc = GBC.eol().fill(GBC.HORIZONTAL).insets(0,0,0,12);
    550548        gbc.gridx = 0;
    551549        gbc.gridy = y++;
    552550        panelTf.add(new JSeparator(SwingConstants.HORIZONTAL), gbc);
    553 
    554551
    555552        gbc = GBC.std();
    … …  
    664661        outerPanel.setLayout(new BorderLayout());
    665662        outerPanel.add(statusBar, BorderLayout.PAGE_END);
    666 
    667663
    668664        syncDialog = new ExtendedDialog(
    … …  
    766762                    }
    767763
    768 
    769764                    for (ImageEntry ie : yLayer.data) {
    770765                        ie.applyTmp();
    … …  
    772767
    773768                    yLayer.updateBufferAndRepaint();
    774 
    775769
    776770                    break;
    … …  
    883877                    tfTimezone.getDocument().addDocumentListener(statusBarListener);
    884878                    tfOffset.getDocument().addDocumentListener(statusBarListener);
    885 
    886 
    887879
    888880                    lblMatches.setText(statusBarText.getText() + tr("<br>(Time difference of {0} days)", Math.abs(dayOffset)));
    … …  
    12291221    }
    12301222
    1231 
    12321223    private String formatTimezone(double timezone) {
    12331224        StringBuffer ret = new StringBuffer();
    … …  
    12521243
    12531244        String error = tr("Error while parsing timezone.\nExpected format: {0}", "+H:MM");
    1254 
    12551245
    12561246        if (timezone.length() == 0)

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r2662 r2711  
    7373    List<ImageEntry> data;
    7474    GpxLayer gpxLayer;
    75    
     75
    7676    private Icon icon = ImageProvider.get("dialogs/geoimage/photo-marker");
    7777    private Icon selectedIcon = ImageProvider.get("dialogs/geoimage/photo-marker-selected");
    … …  
    709709        }
    710710    }
    711    
    712     public void loadThumbs() {   
     711
     712    public void loadThumbs() {
    713713        if (useThumbs && !thumbsLoaded) {
    714714            thumbsLoaded = true;
    … …  
    719719        }
    720720    }
    721    
     721
    722722    public void updateBufferAndRepaint() {
    723723        updateOffscreenBuffer = true;

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

    r2602 r2711  
    5252
    5353    private String osdText = null;
    54    
     54
    5555    private static int DRAG_BUTTON = Main.pref.getBoolean("geoimage.agpifo-style-drag-and-zoom", false) ? 1 : 3;
    5656    private static int ZOOM_BUTTON = DRAG_BUTTON == 1 ? 3 : 1;
    … …  
    130130
    131131            // Calculate the mouse cursor position in image coordinates, so that we can center the zoom
    132             // on that mouse position. 
    133             // To avoid issues when the user tries to zoom in on the image borders, this point is not calculated 
     132            // on that mouse position.
     133            // To avoid issues when the user tries to zoom in on the image borders, this point is not calculated
    134134            // again if there was less than 1.5seconds since the last event.
    135135            if (e.getWhen() - lastTimeForMousePoint > 1500 || mousePointInImg == null) {
    … …  
    536536        return calculateDrawImageRectangle(visibleRect, new Rectangle(0, 0, getSize().width, getSize().height));
    537537    }
    538    
     538
    539539    /**
    540540     * calculateDrawImageRectangle

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

    r2663 r2711  
    115115    }
    116116}
    117 

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r2662 r2711  
    219219    }
    220220
    221 
    222221    private GeoImageLayer currentLayer = null;
    223222    private ImageEntry currentEntry = null;

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java

    r2566 r2711  
    1818        return instance;
    1919    }
    20    
     20
    2121    @Override public boolean accept(File f) {
    2222        if (f.isDirectory()) {
    … …  
    3232    }
    3333}
    34 

  • trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java

    r2559 r2711  
    9999    /**
    100100     * Asynchronously loads available translations
    101      * 
     101     *
    102102     */
    103103    protected void reloadAvailableTranslations() {
    … …  
    107107    /**
    108108     * Asynchronous task to lookup the available translations.
    109      * 
     109     *
    110110     */
    111111    private class AvailableTranslationsLoader extends PleaseWaitRunnable {

  • trunk/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java

    r2648 r2711  
    3030
    3131public class ProxyPreferences implements PreferenceSetting {
    32 
    33 
    3432
    3533    public static class Factory implements PreferenceSettingFactory {

  • trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java

    r2599 r2711  
    4747     * to edit the key of a tag. In this case the auto completion list is
    4848     * initialized with the set of standard key values and the set of current key
    49      * values from the the current JOSM data set. Keys already present in the
     49     * values from the current JOSM data set. Keys already present in the
    5050     * current tag model are removed from the auto completion list.
    5151     *

  • trunk/src/org/openstreetmap/josm/io/CacheFiles.java

    r2606 r2711  
    5757        this(ident, true);
    5858    }
    59    
     59
    6060    public CacheFiles(String ident, boolean isPlugin) {
    6161        String pref = isPlugin ? Main.pref.getPluginsDirFile().getPath() : Main.pref.getPreferencesDir();
    62        
     62
    6363        boolean dir_writeable;
    6464        this.ident = ident;

  • trunk/src/org/openstreetmap/josm/io/Capabilities.java

    r2599 r2711  
    7777     * don't include this parameter or if the parameter value is illegal (not a number,
    7878     * a negative number)
    79      * 
     79     *
    8080     * @return the max number of objects in a changeset
    8181     */

  • trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java

    r2599 r2711  
    5151    /**
    5252     * Replies true if <code>errorHeader</code> matches with {@see #ERROR_HEADER_PATTERN}
    53      * 
     53     *
    5454     * @param errorHeader the error header
    5555     * @return true if <code>errorHeader</code> matches with {@see #ERROR_HEADER_PATTERN}
    … …  
    9191    /**
    9292     * Creates the exception with the given <code>errorHeader</code>
    93      * 
     93     *
    9494     * @param errorHeader the error header
    9595     */
    … …  
    103103     * Creates the exception with the given error header and the given
    104104     * source.
    105      * 
     105     *
    106106     * @param errorHeader the error header
    107107     * @param source the source for the exception
    … …  
    115115    /**
    116116     * Creates the exception
    117      * 
     117     *
    118118     * @param changesetId the id if the closed changeset
    119119     * @param closedOn the date the changeset was closed on
    … …  
    129129    /**
    130130     * Replies the id of the changeset which was closed
    131      * 
     131     *
    132132     * @return the id of the changeset which was closed
    133133     */
    … …  
    138138    /**
    139139     * Replies the date the changeset was closed
    140      * 
     140     *
    141141     * @return the date the changeset was closed. May be null if the date isn't known.
    142142     */
    … …  
    147147    /**
    148148     * Replies the source where the exception was thrown
    149      * 
     149     *
    150150     * @return the source
    151151     */

  • trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

    r2688 r2711  
    2020     * Replies a changeset query object from the query part of a OSM API URL for querying
    2121     * changesets.
    22      * 
     22     *
    2323     * @param query the query part
    2424     * @return the query object
    2525     * @throws ChangesetQueryUrlException thrown if query doesn't consist of valid query parameters
    26      * 
     26     *
    2727     */
    2828    static public ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{
    … …  
    4848    /**
    4949     * Restricts the query to changesets owned by the user with id <code>uid</code>.
    50      * 
     50     *
    5151     * @param uid the uid of the user. >0 expected.
    5252     * @return the query object with the applied restriction
    … …  
    6464    /**
    6565     * Restricts the query to changesets owned by the user with user name <code>username</code>.
    66      * 
     66     *
    6767     * Caveat: for historical reasons the username might not be unique! It is recommended to use
    6868     * {@see #forUser(int)} to restrict the query to a specific user.
    69      * 
     69     *
    7070     * @param username the username. Must not be null.
    7171     * @return the query object with the applied restriction
    … …  
    8383     * Replies true if this query is restricted to user whom we only know the user name
    8484     * for.
    85      * 
     85     *
    8686     * @return true if this query is restricted to user whom we only know the user name
    8787     * for
    … …  
    9494     * Replies the user name which this query is restricted to. null, if this query isn't
    9595     * restricted to a user name, i.e. if {@see #isRestrictedToPartiallyIdentifiedUser()} is false.
    96      * 
     96     *
    9797     * @return the user name which this query is restricted to
    9898     */
    … …  
    103103    /**
    104104     * Replies true if this query is restricted to user whom know the user id for.
    105      * 
     105     *
    106106     * @return true if this query is restricted to user whom know the user id for
    107107     */
    … …  
    112112    /**
    113113     * Replies a query which is restricted to a bounding box.
    114      * 
     114     *
    115115     * @param minLon  min longitude of the bounding box. Valid longitude value expected.
    116116     * @param minLat  min latitude of the bounding box. Valid latitude value expected.
    117117     * @param maxLon  max longitude of the bounding box. Valid longitude value expected.
    118118     * @param maxLat  max latitude of the bounding box.  Valid latitude value expected.
    119      * 
     119     *
    120120     * @return the restricted changeset query
    121121     * @throws IllegalArgumentException thrown if either of the parameters isn't a valid longitude or
    … …  
    137137    /**
    138138     * Replies a query which is restricted to a bounding box.
    139      * 
     139     *
    140140     * @param min the min lat/lon coordinates of the bounding box. Must not be null.
    141141     * @param max the max lat/lon coordiantes of the bounding box. Must not be null.
    142      * 
     142     *
    143143     * @return the restricted changeset query
    144144     * @throws IllegalArgumentException thrown if min is null
    … …  
    154154    /**
    155155     *  Replies a query which is restricted to a bounding box given by <code>bbox</code>.
    156      * 
     156     *
    157157     * @param bbox the bounding box. Must not be null.
    158158     * @return the changeset query
    … …  
    168168     * Restricts the result to changesets which have been closed after the date given by <code>d</code>.
    169169     * <code>d</code> d is a date relative to the current time zone.
    170      * 
     170     *
    171171     * @param d the date . Must not be null.
    172172     * @return the restricted changeset query
    … …  
    183183     * habe been created before <code>createdBefore</code>. Both dates are expressed relative to the current
    184184     * time zone.
    185      * 
     185     *
    186186     * @param closedAfter only reply changesets closed after this date. Must not be null.
    187187     * @param createdBefore only reply changesets created before this date. Must not be null.
    … …  
    201201     * Restricts the result to changesets which are or aren't open, depending on the value of
    202202     * <code>isOpen</code>
    203      * 
     203     *
    204204     * @param isOpen whether changesets should or should not be open
    205205     * @return the restricted changeset query
    … …  
    213213     * Restricts the result to changesets which are or aren't closed, depending on the value of
    214214     * <code>isClosed</code>
    215      * 
     215     *
    216216     * @param isClosed whether changesets should or should not be open
    217217     * @return the restricted changeset query
    … …  
    224224    /**
    225225     * Replies the query string to be used in a query URL for the OSM API.
    226      * 
     226     *
    227227     * @return the query string
    228228     */
    … …  
    268268        return sb.toString();
    269269    }
    270 
    271270
    272271    public static class ChangesetQueryUrlException extends Exception {
    … …  
    408407         * Parses the changeset query given as URL query parameters and replies a
    409408         * {@see ChangesetQuery}
    410          * 
     409         *
    411410         * <code>query</code> is the query part of a API url for querying changesets,
    412411         * see <a href="http://wiki.openstreetmap.org/wiki/API_v0.6#Query:_GET_.2Fapi.2F0.6.2Fchangesets">OSM API</a>.
    413          * 
     412         *
    414413         * Example for an query string:<br>
    415414         * <pre>
    416415         *    uid=1234&open=true
    417416         * </pre>
    418          * 
     417         *
    419418         * @param query the query string. If null, an empty query (identical to a query for all changesets) is
    420419         * assumed

  • trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java

    r2604 r2711  
    5353    /**
    5454     * Creates a diff result reader
    55      * 
     55     *
    5656     * @param primitives the collection of primitives which have been uploaded. If null,
    5757     * assumes an empty collection.
    … …  
    6767    /**
    6868     * Parse the response from a diff upload to the OSM API.
    69      * 
     69     *
    7070     * @param diffUploadResponse the response. Must not be null.
    7171     * @param progressMonitor a progress monitor. Defaults to {@see NullProgressMonitor#INSTANCE} if null
    7272     * @throws IllegalArgumentException thrown if diffUploadRequest is null
    7373     * @throws OsmDataParsingException thrown if the diffUploadRequest can't be parsed successfully
    74      * 
     74     *
    7575     */
    7676    public  void parse(String diffUploadResponse, ProgressMonitor progressMonitor) throws OsmDataParsingException {
    … …  
    9999    /**
    100100     * Postprocesses the diff result read and parsed from the server.
    101      * 
     101     *
    102102     * Uploaded objects are assigned their new id (if they got assigned a new
    103103     * id by the server), their new version (if the version was incremented),
    104104     * and the id of the changeset to which they were uploaded.
    105      * 
     105     *
    106106     * @param cs the current changeset. Ignored if null.
    107107     * @param monitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if null

  • trunk/src/org/openstreetmap/josm/io/FileImporter.java

    r2703 r2711  
    3131        return false;
    3232    }
    33    
     33
    3434    /**
    3535     * Needs to be implemented if isBatchImporter() returns false.
    … …  
    7979
    8080    /**
    81      * If multiple files (with multiple file formats) are selected, 
     81     * If multiple files (with multiple file formats) are selected,
    8282     * they are opened in the order of their priorities.
    8383     * Highest priority comes first.

  • trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java

    r2604 r2711  
    6868    /**
    6969     * Writes the prolog of the OsmChange document
    70      * 
     70     *
    7171     * @throws IllegalStateException thrown if the prologs has already been written
    7272     */
    … …  
    8282    /**
    8383     * Appends a collection of {@see OsmPrimitive}s to the OsmChange document.
    84      * 
     84     *
    8585     * @param primitives the collection of primitives. Ignored if null.
    8686     * @throws IllegalStateException thrown if the prologs has not been written yet
    … …  
    9999    /**
    100100     * Appends an {@see OsmPrimitive} to the OsmChange document.
    101      * 
     101     *
    102102     * @param p the primitive. Ignored if null.
    103103     * @throws IllegalStateException thrown if the prologs has not been written yet
    … …  
    115115    /**
    116116     * Writes the epilog of the OsmChange document
    117      * 
     117     *
    118118     * @throws IllegalStateException thrown if the prologs has not been written yet
    119119     */

  • trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java

    r2688 r2711  
    274274    /**
    275275     * Create a parser
    276      * 
     276     *
    277277     * @param source the input stream with the changeset content as XML document. Must not be null.
    278278     * @throws IllegalArgumentException thrown if source is null.
    … …  
    292292    /**
    293293     * Parses the content
    294      * 
     294     *
    295295     * @param progressMonitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE}
    296296     * if null
    … …  
    323323    /**
    324324     * Parses the content from the input source
    325      * 
     325     *
    326326     * @return the parsed data
    327327     * @throws OsmDataParsingException thrown if something went wrong. Check for chained

  • trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

    r2563 r2711  
    1717/**
    1818 * OsmServerObjectReader reads an individual object from the OSM server.
    19  * 
     19 *
    2020 * It can either download the object including or not including its immediate children.
    2121 * The former case is called a "full download".
    22  * 
     22 *
    2323 */
    2424public class OsmServerObjectReader extends OsmServerReader {
    … …  
    3030    /**
    3131     * Creates a new server object reader for a given id and a primitive type.
    32      * 
     32     *
    3333     * @param id the object id. > 0 required.
    3434     * @param type the type. Must not be null.
    … …  
    4949    /**
    5050     * Creates a new server object reader for an object with the given <code>id</code>
    51      * 
     51     *
    5252     * @param id the object id. Must not be null. Unique id > 0 required.
    5353     * @param full true, if a full download is requested (i.e. a download including
    … …  
    6767    /**
    6868     * Downloads and parses the data.
    69      * 
     69     *
    7070     * @param progressMonitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if
    7171     * null

  • trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

    r2599 r2711  
    4646
    4747    long uploadStartTime;
    48 
    4948
    5049    public String timeLeft(int progress, int list_size) {

  • trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java

    r2641 r2711  
    1818    /**
    1919     * Looks up the credentials for a given type.
    20      * 
     20     *
    2121     * @param the type of service. {@see RequestorType#SERVER} for the OSM API server, {@see RequestorType#PROXY}
    2222     * for a proxy server
    … …  
    2828    /**
    2929     * Saves the credentials in <code>credentials</code> for the given service type.
    30      * 
     30     *
    3131     * @param the type of service. {@see RequestorType#SERVER} for the OSM API server, {@see RequestorType#PROXY}
    3232     * for a proxy server
    … …  
    3737
    3838    /**
    39      * 
     39     *
    4040     * @param requestorType  the type of service. {@see RequestorType#SERVER} for the OSM API server, {@see RequestorType#PROXY}
    4141     * for a proxy server

  • trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

    r2544 r2711  
    4545                JOptionPane.showMessageDialog(Main.parent, "JOSM is out of memory. " +
    4646                        "Strange things may happen.\nPlease restart JOSM with the -Xmx###M option,\n" +
    47                         "where ### is the the number of MB assigned to JOSM (e.g. 256).\n" +
     47                        "where ### is the number of MB assigned to JOSM (e.g. 256).\n" +
    4848                        "Currently, " + Runtime.getRuntime().maxMemory()/1024/1024 + " MB are available to JOSM.",
    4949                        tr("Error"),
    … …  
    9898                    p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0));
    9999                    p.add(new JLabel(tr("<html><p>" +
    100                                         "There the the error information provided below should already be<br>" +
     100                                        "There the error information provided below should already be<br>" +
    101101                                        "filled out for you. Please include information on how to reproduce<br>" +
    102102                                        "the error and try to supply as much detail as possible.</p></html>")), GBC.eop());
Note: See TracChangeset for help on using the changeset viewer.