Ignore:
Timestamp:
2009-11-24T10:45:04+01:00 (17 years ago)
Author:
stoecker
Message:

i18n updated, fixed files to reduce problems when applying patches, fix #4017

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
35 edited

Legend:

Unmodified
Added
Removed

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

    r2343 r2512  
    2525public abstract class AbstractMergeAction extends JosmAction {
    2626
    27 
    2827    /**
    2928     * the list cell renderer used to render layer list entries
    30      * 
     29     *
    3130     */
    3231    static public class LayerListCellRenderer extends DefaultListCellRenderer {

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

    r2323 r2512  
    8181
    8282}
    83 

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

    r2477 r2512  
    9898     * such layer exists, either because the layer list dialog is not yet created
    9999     * or because no layer is selected.
    100      * 
     100     *
    101101     * @return the first selected layer in the layer list dialog
    102102     */

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

    r2323 r2512  
    4949    }
    5050
    51 
    5251    protected void onPostDownloadOpenChangesets(DownloadOpenChangesetsTask task) {
    5352        if (task.isCancelled() || task.getLastException() != null) return;
    … …  
    7574    }
    7675
    77 
    7876    private class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
    7977
    … …  
    8583
    8684        /**
    87          * 
     85         *
    8886         * @param model provides the user id of the current user and accepts the changesets
    8987         * after download
    … …  
    116114         * Fetch the user info from the server. This is necessary if we don't know
    117115         * the users id yet
    118          * 
     116         *
    119117         * @return the user info
    120118         * @throws OsmTransferException thrown in case of any communication exception

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

    r2381 r2512  
    9090    }
    9191
    92 
    9392    public void combineWays(Collection<Way> ways) {
    9493
    … …  
    219218     * This is a collection of relations referring to at least one out of a set of
    220219     * ways.
    221      * 
     220     *
    222221     *
    223222     */
    … …  
    230229
    231230        /**
    232          * 
     231         *
    233232         * @param ways  a collection of ways
    234233         */
    … …  
    246245        /**
    247246         * build the sets of referring relations from the relations in the dataset <code>ds</code>
    248          * 
     247         *
    249248         * @param ds the data set
    250249         */
    … …  
    273272        /**
    274273         * Replies the set of referring relations
    275          * 
     274         *
    276275         * @return the set of referring relations
    277276         */
    … …  
    286285        /**
    287286         * Replies the set of referring relations for a specific way
    288          * 
     287         *
    289288         * @return the set of referring relations
    290289         */
    … …  
    412411    }
    413412
    414 
    415413    static public class NodeGraph {
    416414        static public List<NodePair> buildNodePairs(Way way, boolean directed) {
    … …  
    480478        private HashMap<Node, List<NodePair>> successors;
    481479        private HashMap<Node, List<NodePair>> predecessors;
    482 
    483480
    484481        protected void rememberSuccessor(NodePair pair) {
    … …  
    612609        /**
    613610         * Tries to find a spanning path starting from node <code>startNode</code>.
    614          * 
     611         *
    615612         * Traverses the path in depth-first order.
    616          * 
     613         *
    617614         * @param startNode the start node
    618615         * @return the spanning path; null, if no path is found
    … …  
    641638         * Tries to find a path through the graph which visits each edge (i.e.
    642639         * the segment of a way) exactly one.
    643          * 
     640         *
    644641         * @return the path; null, if no path was found
    645642         */

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

    r2335 r2512  
    2828public class DownloadAction extends JosmAction {
    2929    private static final Logger logger = Logger.getLogger(DownloadAction.class.getName());
    30  
     30
    3131    public DownloadAction() {
    3232        super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),
    … …  
    4141        if (! dialog.isCanceled()) {
    4242            dialog.rememberSettings();
    43             Bounds area = dialog.getSelectedDownloadArea();           
     43            Bounds area = dialog.getSelectedDownloadArea();
    4444            if (dialog.isDownloadOsmData()) {
    4545                DownloadOsmTask task = new DownloadOsmTask();
    … …  
    5252                Main.worker.submit(new PostDownloadHandler(task, future));
    5353            }
    54         } 
    55     }   
     54        }
     55    }
    5656}

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

    r2434 r2512  
    7474     * Downloads the primitives referring to the primitive given by <code>id</code> and
    7575     * <code>type</code>.
    76      * 
     76     *
    7777     *
    7878     * @param targetLayer  the target layer. Must not be null.
    … …  
    118118        /**
    119119         * constructor
    120          * 
     120         *
    121121         * @param targetLayer  the target layer for the downloaded primitives. Must not be null.
    122122         * @param children the collection of child primitives for which parents are to be downloaded
    123          * 
     123         *
    124124         */
    125125        public DownloadReferrersTask(OsmDataLayer targetLayer, Collection<OsmPrimitive> children) {
    … …  
    142142        /**
    143143         * constructor
    144          * 
     144         *
    145145         * @param targetLayer  the target layer for the downloaded primitives. Must not be null.
    146146         * @param primitives  the collection of children for which parents are to be downloaded. Children
    147147         * are specified by their id and  their type.
    148          * 
     148         *
    149149         */
    150150        public DownloadReferrersTask(OsmDataLayer targetLayer, Map<Long, OsmPrimitiveType> children) {
    … …  
    167167        /**
    168168         * constructor
    169          * 
     169         *
    170170         * @param targetLayer  the target layer. Must not be null.
    171171         * @param id the primitive id. id > 0 required.
    … …  
    174174         * @exception IllegalArgumentException thrown if type == null
    175175         * @exception IllegalArgumentException thrown if targetLayer == null
    176          * 
     176         *
    177177         */
    178178        public DownloadReferrersTask(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException {

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

    r2367 r2512  
    3838     */
    3939    public static ArrayList<FileImporter> importers;
    40    
     40
    4141    public static ArrayList<FileExporter> exporters;
    42    
     42
    4343    // add some file types only if the relevant classes are there;
    4444    // this gives us the option to painlessly drop them from the .jar
    … …  
    4848
    4949        importers = new ArrayList<FileImporter>();
    50        
     50
    5151        String[] importerNames = {
    5252            "org.openstreetmap.josm.io.OsmImporter",
    … …  
    6262                Class klass = Class.forName(classname);
    6363                importers.add((FileImporter)klass.newInstance());
    64             } catch (Exception e) {} 
     64            } catch (Exception e) {}
    6565        }
    6666
    … …  
    7878                Class klass = Class.forName(classname);
    7979                exporters.add((FileExporter)klass.newInstance());
    80             } catch (Exception e) {} 
     80            } catch (Exception e) {}
    8181        }
    8282    }
    … …  
    8585    private final String description;
    8686    private final String defaultExtension;
    87 
    8887
    8988    static protected void sort(List<ExtensionFileFilter> filters) {
    … …  
    105104     * The list is ordered according to their description, an {@see AllFormatsImporter}
    106105     * is append at the end.
    107      * 
     106     *
    108107     * @return an ordered list of {@see ExtensionFileFilter}s for importing.
    109108     */
    … …  
    124123     * The list is ordered according to their description, an {@see AllFormatsImporter}
    125124     * is append at the end.
    126      * 
     125     *
    127126     * @return an ordered list of {@see ExtensionFileFilter}s for exporting.
    128127     */
    … …  
    141140    /**
    142141     * Replies the default {@see ExtensionFileFilter} for a given extension
    143      * 
     142     *
    144143     * @param extension the extension
    145144     * @return the default {@see ExtensionFileFilter} for a given extension
    … …  
    156155    /**
    157156     * Replies the default {@see ExtensionFileFilter} for a given extension
    158      * 
     157     *
    159158     * @param extension the extension
    160159     * @return the default {@see ExtensionFileFilter} for a given extension
    … …  
    172171     * Applies the choosable {@see FileFilter} to a {@see JFileChooser} before using the
    173172     * file chooser for selecting a file for reading.
    174      * 
     173     *
    175174     * @param fileChooser the file chooser
    176175     * @param extension the default extension
    … …  
    186185     * Applies the choosable {@see FileFilter} to a {@see JFileChooser} before using the
    187186     * file chooser for selecting a file for writing.
    188      * 
     187     *
    189188     * @param fileChooser the file chooser
    190189     * @param extension the default extension

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

    r2343 r2512  
    2424 */
    2525public class GpxExportAction extends DiskAccessAction {
    26 
    2726
    2827    public GpxExportAction() {
    … …  
    6160     * <code>layer</code> must not be null. <code>layer</code> must be an instance of
    6261     * {@see OsmDataLayer} or {@see GpxLayer}.
    63      * 
     62     *
    6463     * @param layer the layer
    6564     * @exception IllegalArgumentException thrown if layer is null
    … …  
    9493    @Override
    9594    protected void updateEnabledState() {
    96         boolean check =           
    97         Main.isDisplayingMapView() 
     95        boolean check =
     96        Main.isDisplayingMapView()
    9897        && Main.map.mapView.getActiveLayer() != null;
    9998        if(!check) {

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

    r2305 r2512  
    101101    }
    102102
    103 
    104 
    105103    /**
    106104     * needs to be overridden to be useful

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

    r2414 r2512  
    4040/**
    4141 * Merges a collection of nodes into one node.
    42  * 
     42 *
    4343 */
    4444public class MergeNodesAction extends JosmAction {
    … …  
    7777     * The last selected node will become the target node the remaining
    7878     * nodes are merged to.
    79      * 
     79     *
    8080     * @param candidates the collection of candidate nodes
    8181     * @return the selected target node
    … …  
    9292     * Merges the nodes in <code>node</code> onto one of the nodes. Uses the dataset
    9393     * managed by <code>layer</code> as reference.
    94      * 
     94     *
    9595     * @param layer the reference data layer. Must not be null.
    9696     * @param nodes the collection of nodes. Ignored if null.
    … …  
    9898     * @throws IllegalArgumentException thrown if layer is null
    9999     * @throws IllegalArgumentException thrown if targetNode is null
    100      * 
     100     *
    101101     */
    102102    public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetNode) throws IllegalArgumentException{
    … …  
    115115    /**
    116116     * Fixes the parent ways referring to one of the nodes.
    117      * 
     117     *
    118118     * Replies null, if the ways could not be fixed, i.e. because a way would have to be deleted
    119119     * which is referred to by a relation.
    120      * 
     120     *
    121121     * @param backreferences the backreference data set
    122122     * @param nodesToDelete the collection of nodes to be deleted

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

    r2323 r2512  
    4040    }
    4141
    42 
    4342    public void actionPerformed(ActionEvent e) {
    4443        if (getEditLayer() == null || getEditLayer().data.getSelected().isEmpty())

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

    r2323 r2512  
    3838                Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.GROUP_MENU));
    3939        putValue("help", ht("/Action/OpenFile"));
    40        
     40
    4141    }
    4242

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

    r2323 r2512  
    4444    /**
    4545     * Restore the current history from the preferences
    46      * 
     46     *
    4747     * @param cbHistory
    4848     */

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

    r2323 r2512  
    171171            else {
    172172                JOptionPane.showMessageDialog(
    173                     Main.parent, 
     173                    Main.parent,
    174174                    "<html><h3>"+tr(ex.getMessage())+"<br><hr><h3>"+tr("Usage")+tr(USAGE),
    175175                    tr("Selected Elements cannot be orthogonalized"),
    … …  
    196196     *      the mean value of their y-Coordinates.
    197197     *      - The same for vertical segments.
    198      *  5. Rotate back. 
     198     *  5. Rotate back.
    199199     *
    200200     **/
    201     private static void orthogonalize(ArrayList<WayData> wayDataList, ArrayList<Node> headingNodes) 
    202         throws InvalidUserInputException 
     201    private static void orthogonalize(ArrayList<WayData> wayDataList, ArrayList<Node> headingNodes)
     202        throws InvalidUserInputException
    203203    {
    204204        // find average heading
    … …  
    269269            final HashSet<Node> s = new HashSet<Node>(allNodes);
    270270            int s_size = s.size();
    271             for (int dummy = 0; dummy < s_size; ++ dummy) {     
    272                 if (s.isEmpty()) break;                         
     271            for (int dummy = 0; dummy < s_size; ++ dummy) {
     272                if (s.isEmpty()) break;
    273273                final Node dummy_n = s.iterator().next();     // pick arbitrary element of s
    274274
    … …  
    333333            if (headingNodes.contains(n)) { // The heading nodes should not have changed
    334334                final double EPSILON = 1E-6;
    335                 if (Math.abs(dx) > Math.abs(EPSILON * tmp.east()) || 
     335                if (Math.abs(dx) > Math.abs(EPSILON * tmp.east()) ||
    336336                    Math.abs(dy) > Math.abs(EPSILON * tmp.east())) {
    337337                    throw new AssertionError();
    338338                }
    339             } 
     339            }
    340340            else {
    341341                OrthogonalizeAction.rememberMovements.put(n, new EastNorth(dx, dy));
    … …  
    346346        Main.map.repaint();
    347347    }
    348    
    349348
    350349    /**
    … …  
    510509     * Exception: unsuited user input
    511510     */
    512     private static class InvalidUserInputException extends Exception {       
     511    private static class InvalidUserInputException extends Exception {
    513512        InvalidUserInputException(String message) {
    514513            super(message);

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

    r2349 r2512  
    7070        double offsetNorth = mPosition.north() - (maxNorth + minNorth)/2.0;
    7171
    72 
    73 
    7472        // Make a copy of pasteBuffer and map from old id to copied data id
    7573        List<PrimitiveData> bufferCopy = new ArrayList<PrimitiveData>();

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

    r2323 r2512  
    254254    }
    255255
    256 
    257256    public void actionPerformed(ActionEvent e) {
    258257        if (getCurrentDataSet().getSelected().isEmpty())

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

    r2323 r2512  
    3838        this.file = file;
    3939        this.layer = layer;
    40         this.putValue("help", ht("/Action/RenameLayer"));       
     40        this.putValue("help", ht("/Action/RenameLayer"));
    4141    }
    4242

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

    r2343 r2512  
    130130    }
    131131
    132 
    133132    /**
    134133     * Check the data set if it would be empty on save. It is empty, if it contains

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

    r2323 r2512  
    2626    /**
    2727     * Refreshes the enabled state
    28      * 
     28     *
    2929     */
    3030    @Override

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

    r2497 r2512  
    339339    }
    340340
    341 
    342341    /**
    343342     * dupe a single node into as many nodes as there are ways using it, OR

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

    r2323 r2512  
    3737                        KeyEvent.VK_ESCAPE, Shortcut.GROUP_DIRECT).getKeyStroke(),
    3838                        tr("Unselect All"));
    39        
     39
    4040        putValue("help", ht("/Action/UnselectAll"));
    4141    }
    … …  
    4848    /**
    4949     * Refreshes the enabled state
    50      * 
     50     *
    5151     */
    5252    @Override

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

    r2471 r2512  
    148148
    149149        /**
    150          * 
     150         *
    151151         * @param toUpdate a collection of primitives to update from the server
    152152         */
    … …  
    209209            }
    210210        }
    211 
    212211
    213212        @Override

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

    r2480 r2512  
    5050import org.xml.sax.SAXException;
    5151
    52 
    5352/**
    5453 * Action that opens a connection to the osm server and uploads all changes.
    … …  
    9493    /**
    9594     * Registers an upload hook. Adds the hook at the first position of the upload hooks.
    96      * 
     95     *
    9796     * @param hook the upload hook. Ignored if null.
    9897     */
    … …  
    106105    /**
    107106     * Unregisters an upload hook. Removes the hook from the list of upload hooks.
    108      * 
     107     *
    109108     * @param hook the upload hook. Ignored if null.
    110109     */
    … …  
    342341    }
    343342
    344 
    345343    /**
    346344     * Handles the case where deleting a node failed because it is still in use in
    … …  
    466464    }
    467465
    468 
    469466    /**
    470467     * error handler for any exception thrown during upload
    … …  
    574571
    575572        /**
    576          * 
     573         *
    577574         * @param layer  the OSM data layer for which data is uploaded
    578575         * @param toUpload the collection of primitives to upload
    … …  
    600597         * Retries to recover the upload operation from an exception which was thrown because
    601598         * an uploaded primitive was already deleted on the server.
    602          * 
     599         *
    603600         * @param e the exception throw by the API
    604601         * @param monitor a progress monitor

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

    r2399 r2512  
    142142     * Uploads the primitives in <code>toUpload</code> to the server. Only
    143143     * uploads primitives which are either new, modified or deleted.
    144      * 
     144     *
    145145     * Also checks whether <code>toUpload</code> has to be extended with
    146146     * deleted parents in order to avoid precondition violations on the server.
    147      * 
     147     *
    148148     * @param layer the data layer from which we upload a subset of primitives
    149149     * @param toUpload the primitives to upload. If null or empty returns immediatelly
    … …  
    178178     * new primitive has to be uploaded as well, even if it isn't included in the
    179179     * list of candidate primitives.
    180      * 
     180     *
    181181     */
    182182    static class UploadHullBuilder implements Visitor {
    … …  
    228228         * Builds the "hull" of primitives to be uploaded given a base collection
    229229         * of osm primitives.
    230          * 
     230         *
    231231         * @param base the base collection. Must not be null.
    232232         * @return the "hull"
    … …  
    252252
    253253        /**
    254          * 
     254         *
    255255         * @param layer the data layer for which a collection of selected primitives is uploaded
    256256         * @param toUpload the collection of primitives to upload
    … …  
    291291         * Replies the collection of deleted OSM primitives for which we have to check whether
    292292         * there are dangling references on the server.
    293          * 
     293         *
    294294         * @return
    295295         */

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java

    r2322 r2512  
    3030    }
    3131
    32 
    3332    protected void rememberErrorMessage(String message) {
    3433        errorMessages.add(message);
    … …  
    3938    }
    4039
    41 
    4240    public List<Object> getErrorObjects() {
    4341        return errorMessages;

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

    r2343 r2512  
    2929        return Main.worker.submit(downloadTask);
    3030    }
    31    
     31
    3232    public Future<?> loadUrl(boolean a,java.lang.String b,  ProgressMonitor progressMonitor) {
    3333        return null;
    … …  
    4040        }
    4141    }
    42 
    4342
    4443    class DownloadTask extends PleaseWaitRunnable {
    … …  
    8786        private Layer findMergeLayer() {
    8887            boolean merge = Main.pref.getBoolean("download.gps.mergeWithLocal", false);
    89             if (!Main.isDisplayingMapView())   
     88            if (!Main.isDisplayingMapView())
    9089                return null;
    9190            Layer active = Main.map.mapView.getActiveLayer();

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

    r2381 r2512  
    3838 * a list in the end.
    3939 * @author xeen
    40  * 
     40 *
    4141 */
    4242public class DownloadOsmTaskList {
    … …  
    101101     * Replies the set of ids of all complete, non-new primitives (i.e. those with !
    102102     * primitive.incomplete)
    103      * 
     103     *
    104104     * @return the set of ids of all complete, non-new primitives
    105105     */
    … …  
    127127     * Updates the local state of a set of primitives (given by a set of primitive ids) with the
    128128     * state currently held on the server.
    129      * 
     129     *
    130130     * @param potentiallyDeleted a set of ids to check update from the server
    131131     */
    … …  
    149149     * yes, retrieves the current state on the server and checks whether the primitives are indeed
    150150     * deleted on the server.
    151      * 
     151     *
    152152     * @param potentiallyDeleted a set of primitives (given by their ids)
    153153     */
    … …  
    196196    /**
    197197     * Replies the set of primitive ids which have been downloaded by this task list
    198      * 
     198     *
    199199     * @return the set of primitive ids which have been downloaded by this task list
    200200     */

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java

    r2330 r2512  
    88import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    99
    10 
    1110public interface DownloadTask {
    1211    /**
    … …  
    1615     * Set progressMonitor to {@see NullProgressMonitor#INSTANCE} if progress information is to
    1716     * be discarded.
    18      * 
     17     *
    1918     * You can wait for the asynchronous download task to finish by synchronizing on the returned
    2019     * {@see Future}, but make sure not to freeze up JOSM. Example:
    2120     * <pre>
    2221     *    Future<?> future = task.download(...);
    23      *    // DON'T run this on the Swing EDT or JOSM will freeze 
    24      *    future.get(); // waits for the dowload task to complete 
     22     *    // DON'T run this on the Swing EDT or JOSM will freeze
     23     *    future.get(); // waits for the dowload task to complete
    2524     * </pre>
    26      * 
     25     *
    2726     * The following example uses a pattern which is better suited if a task is launched from
    2827     * the Swing EDT:
    … …  
    4039     *    Main.worker.submit(runAfterTask);
    4140     * </pre>
    42      * 
     41     *
    4342     * @param newLayer true, if the data is to be downloaded into a new layer. If false, the task
    4443     * selects one of the existing layers as download layer, preferably the active layer.
    45      * 
     44     *
    4645     * @param downloadArea the area to download
    4746     * @param progressMonitor the progressMonitor
    … …  
    5655     * Set progressMonitor to {@see NullProgressMonitor#INSTANCE} if progress information is to
    5756     * be discarded.
    58  
     57
    5958     * @param newLayer newLayer true, if the data is to be downloaded into a new layer. If false, the task
    6059     * selects one of the existing layers as download layer, preferably the active layer.
    … …  
    6261     * @param progressMonitor the progressMonitor
    6362     * @return the future representing the asynchronous task
    64      * 
     63     *
    6564     * @see #download(boolean, Bounds, ProgressMonitor)
    6665     */
    … …  
    6968    /**
    7069     * Replies the error objects of the task. Empty list, if no error messages are available.
    71      * 
     70     *
    7271     * Error objects are either {@see String}s with error messages or {@see Exception}s.
    7372     *
    … …  
    7877    /**
    7978     * Cancels the asynchronous download task.
    80      * 
     79     *
    8180     */
    8281    public void cancel();

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java

    r2332 r2512  
    1414import org.openstreetmap.josm.gui.ExceptionDialogUtil;
    1515import org.openstreetmap.josm.tools.ExceptionUtil;
    16 
    1716
    1817public class PostDownloadHandler implements Runnable {
    … …  
    4645        }
    4746    }
    48    
    4947
    5048    /**
    … …  
    5957        this.futures.addAll(futures);
    6058    }
    61    
     59
    6260    public void run() {
    6361        // wait for all downloads task to finish (by waiting for the futures

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r2343 r2512  
    124124    }
    125125
    126 
    127126    @Override public void actionPerformed(ActionEvent e) {
    128127        super.actionPerformed(e);
    … …  
    165164     * highlights. For now, only the cursor is enabled because highlighting
    166165     * requires WaySegment to be highlightable.
    167      * 
     166     *
    168167     * Normally the mouse event also contains the modifiers. However, when the
    169168     * mouse is not moved and only modifier keys are pressed, no mouse event
    … …  
    171170     * mouseevent. Instead we copy the previous event and only update the
    172171     * modifiers.
    173      * 
     172     *
    174173     * @param MouseEvent
    175174     * @parm int modifiers
    … …  
    286285     * Deletes the relation in the context of the given layer. Also notifies
    287286     * {@see RelationDialogManager} and {@see OsmDataLayer#fireDataChange()} events.
    288      * 
     287     *
    289288     * @param layer the layer in whose context the relation is deleted. Must not be null.
    290289     * @param toDelete  the relation to be deleted. Must  not be null.

  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r2402 r2512  
    274274    }
    275275
    276 
    277276    @Override public void mouseMoved(MouseEvent e) {
    278277        // Mac OSX simulates with  ctrl + mouse 1  the second mouse button hence no dragging events get fired.

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java

    r1814 r2512  
    3939    private final SelectionManager selectionManager;
    4040
    41 
    4241    /**
    4342     * Construct a ZoomAction without a label.

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

    r2467 r2512  
    3535
    3636    public static final int DEFAULT_SEARCH_HISTORY_SIZE = 10;
    37 
    3837
    3938    public static enum SearchMode {
    … …  
    331330    /**
    332331     * Refreshes the enabled state
    333      * 
     332     *
    334333     */
    335334    @Override

  • trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java

    r2198 r2512  
    2828 * relations are uploaded before parent relations. It also checks for cyclic
    2929 * dependencies in the list of new relations.
    30  * 
     30 *
    3131 *
    3232 */
    … …  
    3838    /**
    3939     * builds the panel which warns users about a cyclic dependency
    40      * 
     40     *
    4141     * @param dep  the list of relations with a cyclic dependency
    4242     * @return the panel
    … …  
    6868    /**
    6969     * Warns the user if a cyclic dependency is detected
    70      * 
     70     *
    7171     * @param e the cyclic dependency exception
    7272     */
Note: See TracChangeset for help on using the changeset viewer.