Changeset 3530 in josm


Ignore:
Timestamp:
15.09.2010 08:21:16 (21 months ago)
Author:
stoecker
Message:

fix array preferences

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

Legend:

Unmodified
Added
Removed

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

    r3217 r3530  
    4444 * The "surviving" node will be the one with the lowest positive id. 
    4545 * (I.e. it was uploaded to the server and is the oldest one.) 
    46  *  
     46 * 
    4747 * However we use the location of the node that was selected *last*. 
    4848 * The "surviving" node will be moved to that location if it is 
    … …  
    9494        return targetNode; 
    9595    } 
    96      
     96 
    9797    /** 
    9898     * Find which node to merge into (i.e. which one will be left) 
    … …  
    119119        return targetNode; 
    120120    } 
    121      
     121 
    122122 
    123123    /** 
    … …  
    193193        return mergeNodes(layer, nodes, targetNode, targetNode); 
    194194    } 
    195      
     195 
    196196    /** 
    197197     * Merges the nodes in <code>nodes</code> onto one of the nodes. Uses the dataset 

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

    r3501 r3530  
    137137            } 
    138138            msg.append("</ul>"); 
    139              
     139 
    140140            HelpAwareOptionPane.showMessageDialogInEDT( 
    141141                    Main.parent, 
    … …  
    179179                                public void run() { 
    180180                                    JOptionPane.showMessageDialog(Main.parent, tr( 
    181                                             "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>",  
     181                                            "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>", 
    182182                                            f.getAbsolutePath()), tr("Open file"), JOptionPane.ERROR_MESSAGE); 
    183183                                } 
    184184                            }); 
    185                             // TODO when changing to Java 6: Don't cancel the  
     185                            // TODO when changing to Java 6: Don't cancel the 
    186186                            // task here but use different modality. (Currently 2 dialogs 
    187187                            // would block each other.) 

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

    r3083 r3530  
    188188     * Replies true if <code>node</code> is a required node which can't be removed 
    189189     * in order to simplify the way. 
    190      *  
     190     * 
    191191     * @param way the way to be simplified 
    192192     * @param node the node to check 
    … …  
    210210    /** 
    211211     * Simplifies a way 
    212      *  
     212     * 
    213213     * @param w the way to simplify 
    214214     */ 
    … …  
    255255     * Builds the simplified list of nodes for a way segment given by a lower index <code>from</code> 
    256256     * and an upper index <code>to</code> 
    257      *  
     257     * 
    258258     * @param wnew the way to simplify 
    259259     * @param from the lower index 

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

    r2990 r3530  
    120120     * Makes sure primitives in <code>apiData</code> don't participate in conflicts and 
    121121     * runs the installed {@see UploadHook}s. 
    122      *  
     122     * 
    123123     * @param layer the source layer of the data to be uploaded 
    124124     * @param apiData the data to be uploaded 
    … …  
    143143    /** 
    144144     * Uploads data to the OSM API. 
    145      *  
     145     * 
    146146     * @param layer the source layer for the data to upload 
    147147     * @param apiData the primitives to be added, updated, or deleted 

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

    r3262 r3530  
    164164            double xoff = en3.east() - base.east(); 
    165165            double yoff = en3.north() - base.north(); 
    166              
     166 
    167167            newN1en = new EastNorth(en1.getX() + xoff, en1.getY() + yoff); 
    168168            newN2en = new EastNorth(en2.getX() + xoff, en2.getY() + yoff); 

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

    r3336 r3530  
    145145     * Replies true if one of the primitives to be updated or to be deleted 
    146146     * participates in the conflict <code>conflict</code> 
    147      *  
     147     * 
    148148     * @param conflict the conflict 
    149149     * @return true if one of the primitives to be updated or to be deleted 
    … …  
    164164     * Replies true if one of the primitives to be updated or to be deleted 
    165165     * participates in at least one conflict in <code>conflicts</code> 
    166      *  
     166     * 
    167167     * @param conflicts the collection of conflicts 
    168168     * @return true if one of the primitives to be updated or to be deleted 

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

    r3527 r3530  
    102102    } 
    103103 
    104     protected void firePrefrenceChanged(String key, String oldValue, String newValue) { 
     104    protected void firePreferenceChanged(String key, String oldValue, String newValue) { 
    105105        PreferenceChangeEvent evt = new DefaultPreferenceChangeEvent(key, oldValue, newValue); 
    106106        for (PreferenceChangedListener l : listeners) { 
    … …  
    114114    protected final SortedMap<String, String> properties = new TreeMap<String, String>(); 
    115115    protected final SortedMap<String, String> defaults = new TreeMap<String, String>(); 
    116  
    117     /** 
    118      * Override some values on read. This is intended to be used for technology previews 
    119      * where we want to temporarily modify things without changing the user's preferences 
    120      * file. 
    121      */ 
    122     protected static final SortedMap<String, String> override = new TreeMap<String, String>(); 
    123     static { 
    124         //override.put("osm-server.version", "0.5"); 
    125         //override.put("osm-server.additional-versions", ""); 
    126         //override.put("osm-server.url", "http://openstreetmap.gryph.de/api"); 
    127         //override.put("plugins", null); 
    128     } 
    129116 
    130117    /** 
    … …  
    198185 
    199186    synchronized public boolean hasKey(final String key) { 
    200         return override.containsKey(key) ? override.get(key) != null : properties.containsKey(key); 
     187        return properties.containsKey(key); 
    201188    } 
    202189 
    203190    synchronized public String get(final String key) { 
    204191        putDefault(key, null); 
    205         if (override.containsKey(key)) 
    206             return override.get(key); 
    207192        if (!properties.containsKey(key)) 
    208193            return ""; 
    … …  
    212197    synchronized public String get(final String key, final String def) { 
    213198        putDefault(key, def); 
    214         if (override.containsKey(key)) 
    215             return override.get(key); 
    216199        final String prop = properties.get(key); 
    217200        if (prop == null || prop.equals("")) 
    … …  
    226209                all.put(e.getKey(), e.getValue()); 
    227210            } 
    228         for (final Entry<String,String> e : override.entrySet()) 
    229             if (e.getKey().startsWith(prefix)) 
    230                 if (e.getValue() == null) { 
    231                     all.remove(e.getKey()); 
    232                 } else { 
    233                     all.put(e.getKey(), e.getValue()); 
    234                 } 
    235211        return all; 
    236212    } 
    … …  
    255231                all.put(e.getKey().substring(6), e.getValue()); 
    256232            } 
    257         for (final Entry<String,String> e : override.entrySet()) 
    258             if (e.getKey().startsWith("color.")) 
    259                 if (e.getValue() == null) { 
    260                     all.remove(e.getKey().substring(6)); 
    261                 } else { 
    262                     all.put(e.getKey().substring(6), e.getValue()); 
    263                 } 
    264233        return all; 
    265234    } 
    … …  
    279248    synchronized public boolean getBoolean(final String key) { 
    280249        putDefault(key, null); 
    281         if (override.containsKey(key)) 
    282             return override.get(key) == null ? false : Boolean.parseBoolean(override.get(key)); 
    283250        return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : false; 
    284251    } 
    … …  
    286253    synchronized public boolean getBoolean(final String key, final boolean def) { 
    287254        putDefault(key, Boolean.toString(def)); 
    288         if (override.containsKey(key)) 
    289             return override.get(key) == null ? def : Boolean.parseBoolean(override.get(key)); 
    290255        return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : def; 
    291256    } 
    292257 
    293258    public boolean put(final String key, String value) { 
    294  
    295259        boolean changed = false; 
    296260        String oldValue = null; 
    … …  
    319283        if (changed) { 
    320284            // Call outside of synchronized section in case some listener wait for other thread that wait for preference lock 
    321             firePrefrenceChanged(key, oldValue, value); 
     285            firePreferenceChanged(key, oldValue, value); 
    322286        } 
    323287        return changed; 
    … …  
    664628            Collection<Collection<String>> col = new LinkedList<Collection<String>>(); 
    665629            for(int num = 0; ; ++num) { 
    666                 Collection<String> c = getCollection(key+"."+num++, null); 
     630                Collection<String> c = getCollection(key+"."+num, null); 
    667631                if(c == null) 
    668632                    break; 
    … …  
    675639    synchronized public boolean putArray(String key, Collection<Collection<String>> val) { 
    676640        boolean res = true; 
    677         for(String k : getAllPrefix(key + ".").keySet()) 
    678             put(k, null); 
     641        Collection<String> keys = getAllPrefix(key).keySet(); 
     642        key += "."; 
    679643        if(val != null) { 
    680644            String s = null; 
    681645            int num = 0; 
    682646            for(Collection<String> c : val) { 
    683                 if(!putCollection(key+"."+num++, c)) 
     647                keys.remove(key+num); 
     648                if(!putCollection(key+num++, c)) 
    684649                    res = false; 
     650            } 
     651        } 
     652        int l = key.length(); 
     653        for(String k : keys) { 
     654            try { 
     655              Integer.valueOf(k.substring(l)); 
     656              put(k, null); 
     657            } catch(Exception e) { 
    685658            } 
    686659        } 

  • trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

    r3083 r3530  
    5252     * Replies true if the primitive <code>primitive</code> is participating 
    5353     * in this conflict 
    54      *  
     54     * 
    5555     * @param primitive the primitive 
    5656     * @return true if the primitive <code>primitive</code> is participating 
    … …  
    6666     * Replies true if the primitive with id <code>id</code> is participating 
    6767     * in this conflict 
    68      *  
     68     * 
    6969     * @param id the primitive id 
    7070     * @return true if the primitive <code>primitive</code> is participating 
    … …  
    104104 
    105105    /** 
    106      *  
     106     * 
    107107     * @return True if my primitive was deleted but it has set non deleted status because it's referred by another 
    108108     * primitive and references to deleted primitives are not allowed. 

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

    r3438 r3530  
    1919     */ 
    2020    DEGREES_MINUTES_SECONDS (tr("deg\u00B0 min'' sec\"")), 
    21      
     21 
    2222    /** 
    23      * the nautical format  
     23     * the nautical format 
    2424     */ 
    2525    NAUTICAL (tr("deg\u00B0 min'' (Nautical)")), 
    26      
     26 
    2727    /** 
    2828     * coordinates East/North 

  • trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java

    r3083 r3530  
    1010    /** 
    1111     * Creates an OAuthToken from the token currently managed by the {@see OAuthConsumer}. 
    12      *  
     12     * 
    1313     * @param consumer the consumer 
    1414     * @return the token 
    … …  
    2323    /** 
    2424     * Creates a new token 
    25      *  
     25     * 
    2626     * @param key the token key 
    2727     * @param secret the token secret 
    … …  
    3434    /** 
    3535     * Creates a clone of another token 
    36      *  
     36     * 
    3737     * @param other the other token. Must not be null. 
    3838     * @throws IllegalArgumentException thrown if other is null 
    … …  
    4646    /** 
    4747     * Replies the token key 
    48      *  
     48     * 
    4949     * @return the token key 
    5050     */ 
    … …  
    5555    /** 
    5656     * Replies the token secret 
    57      *  
     57     * 
    5858     * @return the token secret 
    5959     */ 

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

    r3504 r3530  
    175175    } 
    176176 
    177     @Override  
     177    @Override 
    178178    public synchronized boolean add(T t) { 
    179179        T orig = putUnique(t); 
    … …  
    187187        return tOrig != null; 
    188188    } 
    189      
     189 
    190190    @Override 
    191191    public synchronized void clear() { 

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

    r3083 r3530  
    88     * Fired by a {@see HistoryDataSet} if the cached history of an OSM primitive with 
    99     * id <code>id</code> is updated 
    10      *  
     10     * 
    1111     * @param source the data set firing the event 
    1212     * @param id the id of the updated primitive 
    … …  
    1616    /** 
    1717     * Fired by a {@see HistoryDataSet} if the history cached is cleared. 
    18      *  
     18     * 
    1919     * @param source the history data set firing the event 
    2020     */ 

  • trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java

    r3473 r3530  
    196196        return new LatLon(Math.toDegrees(lt), Math.toDegrees(lg)); 
    197197    } 
    198      
     198 
    199199    /** 
    200200     * convert ellipsoidal coordinates to cartesian coordinates 
    … …  
    212212        XYZ[1] = Rn * Math.cos(phi) * Math.sin(lambda); 
    213213        XYZ[2] = Rn * (1 - e2) * Math.sin(phi); 
    214          
     214 
    215215        return XYZ; 
    216216    } 

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

    r3171 r3530  
    105105        // clear the build-in command ctrl+shift+O, because it is used as shortcut in JOSM 
    106106        lg.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), "none"); 
    107              
     107 
    108108        JScrollPane scroller = new JScrollPane(lg); 
    109109        scroller.setViewportBorder(new EmptyBorder(10, 100, 10, 100)); 

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

    r3406 r3530  
    1717 
    1818    private final NavigatableComponent mv; 
    19      
     19 
    2020    private static int PADDING_RIGHT = 100; 
    21      
     21 
    2222    public MapScaler(NavigatableComponent mv) { 
    2323        this.mv = mv; 

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

    r3083 r3530  
    115115 
    116116    /** 
    117      *  
     117     * 
    118118     * @param entry 
    119119     * @return Primitive from my dataset referenced by entry 

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

    r3211 r3530  
    178178                } 
    179179            } 
    180              
     180 
    181181            /** 
    182              * If we add additional dialogs on startup (e.g. geoimage), they may  
     182             * If we add additional dialogs on startup (e.g. geoimage), they may 
    183183             * not have an actual height yet. 
    184184             * In this case we simply reset everything to it's preferred size. 

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

    r3202 r3530  
    518518    /** 
    519519     * Action for downloading incomplete members of selected relations 
    520      *  
     520     * 
    521521     */ 
    522522    class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener{ 
    … …  
    672672        /** 
    673673         * Replies the list of selected relations with incomplete members 
    674          *  
     674         * 
    675675         * @return the list of selected relations with incomplete members 
    676676         */ 

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

    r3083 r3530  
    4242/** 
    4343 * This panel allows to specify a changeset query 
    44  *  
     44 * 
    4545 */ 
    4646public class AdvancedChangesetQueryPanel extends JPanel { 
    … …  
    191191    /** 
    192192     * Builds the changeset query based on the data entered in the form. 
    193      *  
     193     * 
    194194     * @return the changeset query. null, if the data entered doesn't represent 
    195195     * a valid changeset query. 
    … …  
    368368     * This is the panel for selecting whether the query should be restricted to a specific 
    369369     * user 
    370      *  
     370     * 
    371371     */ 
    372372    static private class UserRestrictionPanel extends JPanel { 
    … …  
    509509         * Sets the query restrictions on <code>query</code> for changeset owner based 
    510510         * restrictions. 
    511          *  
     511         * 
    512512         * @param query the query. Must not be null. 
    513513         * @throws IllegalArgumentException thrown if query is null 
    514514         * @throws IllegalStateException thrown if one of the available values for query parameters in 
    515515         * this panel isn't valid 
    516          *  
     516         * 
    517517         */ 
    518518        public void fillInQuery(ChangesetQuery query) throws IllegalStateException, IllegalArgumentException  { 
    … …  
    961961    /** 
    962962     * Validator for user ids entered in in a {@see JTextComponent}. 
    963      *  
     963     * 
    964964     */ 
    965965    static private class UidInputFieldValidator extends AbstractTextComponentValidator { 
    … …  
    10381038     * Validates dates entered as text in in a {@see JTextComponent}. Validates the input 
    10391039     * on the fly and gives feedback about whether the date is valid or not. 
    1040      *  
     1040     * 
    10411041     * Dates can be entered in one of four standard formats defined for the current locale. 
    10421042     */ 
    … …  
    11011101     * Validates time values entered as text in in a {@see JTextComponent}. Validates the input 
    11021102     * on the fly and gives feedback about whether the time value is valid or not. 
    1103      *  
     1103     * 
    11041104     * Time values can be entered in one of four standard formats defined for the current locale. 
    11051105     */ 

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

    r3132 r3530  
    2828/** 
    2929 * This panel presents a list of basic queries for changests. 
    30  *  
     30 * 
    3131 */ 
    3232public class BasicChangesetQueryPanel extends JPanel { 
    … …  
    242242    /** 
    243243     * Responds to changes in the selected query 
    244      *  
     244     * 
    245245     */ 
    246246    class SelectQueryHandler implements ItemListener { 

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

    r3501 r3530  
    3333/** 
    3434 * This is a modal dialog for entering query criteria to search for changesets. 
    35  *  
     35 * 
    3636 */ 
    3737public class ChangesetQueryDialog extends JDialog { 

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

    r3083 r3530  
    4949    /** 
    5050     * Creates the task. 
    51      *  
     51     * 
    5252     * @param query the query to submit to the OSM server. Must not be null. 
    5353     * @throws IllegalArgumentException thrown if query is null. 
    … …  
    6161    /** 
    6262     * Creates the task. 
    63      *  
     63     * 
    6464     * @param parent the parent component relative to which the {@see PleaseWaitDialog} is displayed. 
    6565     * Must not be null. 
    … …  
    130130    /** 
    131131     * Tries to fully identify the current JOSM user 
    132      *  
     132     * 
    133133     * @throws OsmTransferException thrown if something went wrong 
    134134     */ 

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

    r3083 r3530  
    142142     * Replies the {@see ChangesetQuery} specified in this panel. null, if no valid changeset query 
    143143     * is specified. 
    144      *  
     144     * 
    145145     * @return the changeset query 
    146146     */ 

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

    r3362 r3530  
    5656     * Creates a download task for downloading the child primitives {@code children} for all parent 
    5757     * relations in {@code parents}. 
    58      *  
     58     * 
    5959     * @param parents the collection of parent relations 
    6060     * @param children the collection of child primitives to download 

  • trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

    r3527 r3530  
    8989        gc.insets = new Insets(5,5,5,5); 
    9090        pnl.add(lblCurrentDownloadArea = new JMultilineLabel(""), gc); 
    91          
     91 
    9292        gc.weightx = 1.0; 
    9393        gc.weighty = 1.0; 

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

    r3399 r3530  
    8484    /** 
    8585     * Creates the panel 
    86      *  
     86     * 
    8787     * @param changesetCommentModel the model for the changeset comment. Must not be null 
    8888     * @throws IllegalArgumentException thrown if {@code changesetCommentModel} is null 

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

    r3133 r3530  
    163163    /** 
    164164     * Creates a new panel 
    165      *  
     165     * 
    166166     * @param changesetCommentModel the changeset comment model. Must not be null. 
    167167     * @throws IllegalArgumentException thrown if {@code changesetCommentModel} is null 
    … …  
    186186    /** 
    187187     * Sets the changeset to be used in the next upload 
    188      *  
     188     * 
    189189     * @param cs the changeset 
    190190     */ 

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

    r3501 r3530  
    364364        /** 
    365365         * returns true if the user wants to revisit, false if they 
    366          * want to continue  
     366         * want to continue 
    367367         */ 
    368368        protected boolean warnUploadComment() { 
    … …  
    370370                tr("Please revise upload comment"), 
    371371                new String[] {tr("Revise"), tr("Cancel"), tr("Continue as is")}); 
    372             dlg.setContent("<html>" +  
    373                     tr("Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />" +  
     372            dlg.setContent("<html>" + 
     373                    tr("Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />" + 
    374374                       "This is technically allowed, but please consider that many users who are<br />" + 
    375375                       "watching changes in their area depend on meaningful changeset comments<br />" + 
    376376                       "to understand what is going on!<br /><br />" + 
    377377                       "If you spend a minute now to explain your change, you will make life<br />" + 
    378                        "easier for many other mappers.") +  
     378                       "easier for many other mappers.") + 
    379379                    "</html>"); 
    380380            dlg.setButtonIcons(new Icon[] { 
    … …  
    382382                ImageProvider.get("cancel"), 
    383383                ImageProvider.overlay( 
    384                     ImageProvider.get("upload"),  
     384                    ImageProvider.get("upload"), 
    385385                    new ImageIcon(ImageProvider.get("warning-small").getImage().getScaledInstance(10 , 10, Image.SCALE_SMOOTH)), 
    386386                    ImageProvider.OverlayPosition.SOUTHEAST)}); 

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

    r3261 r3530  
    112112    void setExifImgDir(double exifDir) { 
    113113        this.exifImgDir = exifDir; 
    114     }  
     114    } 
    115115 
    116116    @Override 

  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

    r3396 r3530  
    175175            this.textMap.putAll(textMap); 
    176176        } 
    177          
     177 
    178178        this.text = null; 
    179179        this.offset = offset; 

  • trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java

    r3083 r3530  
    1010/** 
    1111 * This is the abstract base class for the three authorisation UIs. 
    12  *  
    13  *  
     12 * 
     13 * 
    1414 */ 
    1515public abstract class AbstractAuthorizationUI extends VerticallyScrollablePanel{ 
    … …  
    3434     * Replies the URL of the OSM API for which this UI is currently trying to retrieve an OAuth 
    3535     * Access Token 
    36      *  
     36     * 
    3737     * @return the API URL 
    3838     */ 
    … …  
    4444     * Sets the URL of the OSM API for which this UI is currently trying to retrieve an OAuth 
    4545     * Access Token 
    46      *  
     46     * 
    4747     * @param apiUrl the api URL 
    4848     */ 
    … …  
    5353    /** 
    5454     * Replies the panel for entering advanced OAuth parameters (see {@see OAuthParameters}) 
    55      *  
     55     * 
    5656     * @return the panel for entering advanced OAuth parameters 
    5757     * @see #getOAuthParameters() 
    … …  
    6363    /** 
    6464     * Replies the current set of advanced OAuth parameters in this UI 
    65      *  
     65     * 
    6666     * @return the current set of advanced OAuth parameters in this UI 
    6767     */ 
    … …  
    7272    /** 
    7373     * Replies the retrieved Access Token. null, if no Access Token was retrieved. 
    74      *  
     74     * 
    7575     * @return the retrieved Access Token 
    7676     */ 
    … …  
    8282     * Sets the current Access Token. This will fire a property change event for {@see #ACCESS_TOKEN_PROP} 
    8383     * if the access token has changed 
    84      *  
     84     * 
    8585     * @param accessToken the new access token. null, to clear the current access token 
    8686     */ 
    … …  
    9999    /** 
    100100     * Replies true if this UI currently has an Access Token 
    101      *  
     101     * 
    102102     * @return true if this UI currently has an Access Token 
    103103     */ 
    … …  
    109109     * Replies whether the user has chosen to save the Access Token in the JOSM 
    110110     * preferences or not. 
    111      *  
     111     * 
    112112     * @return true if the user has chosen to save the Access Token 
    113113     */ 
    … …  
    116116    /** 
    117117     * Initializes the authorisation UI with preference values in <code>pref</code>. 
    118      *  
     118     * 
    119119     * @param pref the preferences. Must not be null. 
    120120     * @throws IllegalArgumentException thrown if pref is null 

  • trunk/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java

    r3083 r3530  
    1818/** 
    1919 * Displays the key and the secret of an OAuth Access Token. 
    20  *  
     20 * 
    2121 */ 
    2222public class AccessTokenInfoPanel extends JPanel { 
    … …  
    8181    /** 
    8282     * Displays the key and secret in <code>token</code>. 
    83      *  
     83     * 
    8484     * @param token the access  token. If null, the content in the info panel is cleared 
    8585     */ 

  • trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java

    r3083 r3530  
    171171    /** 
    172172     * Replies the OAuth parameters currently edited in this properties panel. 
    173      *  
     173     * 
    174174     * @return the OAuth parameters 
    175175     */ 
    … …  
    188188    /** 
    189189     * Sets the advanced parameters to be displayed 
    190      *  
     190     * 
    191191     * @param parameters the advanced parameters. Must not be null. 
    192192     * @throws IllegalArgumentException thrown if parameters is null. 
    … …  
    214214    /** 
    215215     * Initializes the panel from the values in the preferences <code>preferences</code>. 
    216      *  
     216     * 
    217217     * @param pref the preferences. Must not be null. 
    218218     * @throws IllegalArgumentException thrown if pref is null 
    … …  
    238238    /** 
    239239     * Remembers the current values in the preferences <code>pref</code>. 
    240      *  
     240     * 
    241241     * @param pref the preferences. Must not be null. 
    242242     * @throws IllegalArgumentException thrown if pref is null. 

  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

    r3083 r3530  
    5252 * This is an UI which supports a JOSM user to get an OAuth Access Token in a fully 
    5353 * automatic process. 
    54  *  
     54 * 
    5555 */ 
    5656public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI { 
    … …  
    6868    /** 
    6969     * Builds the panel with the three privileges the user can grant JOSM 
    70      *  
     70     * 
    7171     * @return 
    7272     */ 
    … …  
    7878    /** 
    7979     * Builds the panel for entering the username and password 
    80      *  
     80     * 
    8181     * @return 
    8282     */ 
    … …  
    203203    /** 
    204204     * Builds the panel with the action button  for starting the authorisation 
    205      *  
     205     * 
    206206     * @return 
    207207     */ 
    … …  
    218218    /** 
    219219     * Builds the panel which displays the generated Access Token. 
    220      *  
     220     * 
    221221     * @return 
    222222     */ 
    … …  
    274274     * Prepares the UI for the first step in the automatic process: entering the authentication 
    275275     * and authorisation parameters. 
    276      *  
     276     * 
    277277     */ 
    278278    protected void prepareUIForEnteringRequest() { 
    … …  
    290290    /** 
    291291     * Prepares the UI for the second step in the automatic process: displaying the access token 
    292      *  
     292     * 
    293293     */ 
    294294    protected void prepareUIForResultDisplay() { 

  • trunk/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java

    r3083 r3530  
    8585    /** 
    8686     * Replies the currently entered privileges 
    87      *  
     87     * 
    8888     * @return the privileges 
    8989     */ 

  • trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java

    r3083 r3530  
    2121/** 
    2222 * Asynchronous task for retrieving an Access Token. 
    23  *  
     23 * 
    2424 */ 
    2525public class RetrieveAccessTokenTask extends PleaseWaitRunnable { 
    … …  
    3434    /** 
    3535     * Creates the task 
    36      *  
     36     * 
    3737     * @param parent the parent component relative to which the {@see PleaseWaitRunnable}-Dialog 
    3838     * is displayed 
    … …  
    9999    /** 
    100100     * Replies true if the task was canceled. 
    101      *  
     101     * 
    102102     * @return 
    103103     */ 
    … …  
    108108    /** 
    109109     * Replies the retrieved Access Token. null, if something went wrong. 
    110      *  
     110     * 
    111111     * @return the retrieved Access Token 
    112112     */ 

  • trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java

    r3083 r3530  
    3232    /** 
    3333     * Creates the task 
    34      *  
     34     * 
    3535     * @param parent the parent component relative to which the {@see PleaseWaitRunnable}-Dialog 
    3636     * is displayed 
    … …  
    9393    /** 
    9494     * Replies true if the task was canceled 
    95      *  
     95     * 
    9696     * @return true if the task was canceled 
    9797     */ 
    … …  
    102102    /** 
    103103     * Replies the request token. null, if something went wrong. 
    104      *  
     104     * 
    105105     * @return the request token 
    106106     */ 

  • trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

    r3083 r3530  
    3434/** 
    3535 * This is the UI for running a semic-automic authorisation procedure. 
    36  *  
     36 * 
    3737 * In contrast to the fully-automatic procedure the user is dispatched to an 
    3838 * external browser for login and authorisation. 

  • trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java

    r3083 r3530  
    3535/** 
    3636 * Checks whether an OSM API server can be accessed with a specific Access Token. 
    37  *  
     37 * 
    3838 * It retrieves the user details for the user which is authorized to access the server with 
    3939 * this token. 
    40  *  
     40 * 
    4141 */ 
    4242public class TestAccessTokenTask extends PleaseWaitRunnable { 
    … …  
    5050    /** 
    5151     * Create the task 
    52      *  
     52     * 
    5353     * @param parent the parent component relative to which the  {@see PleaseWaitRunnable}-Dialog is displayed 
    5454     * @param apiUrl the API URL. Must not be null. 

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

    r3113 r3530  
    222222    /** 
    223223     * Replies the list of plugins waiting for update or download 
    224      *  
     224     * 
    225225     * @return the list of plugins waiting for update or download 
    226226     */ 
    … …  
    246246     * Scans cached plugin lists from plugin download sites and locally available 
    247247     * plugin jar files. 
    248      *  
     248     * 
    249249     */ 
    250250    public void readLocalPluginInformation() { 

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

    r3090 r3530  
    8787     * Updates the list of plugin information objects with new information from 
    8888     * plugin update sites. 
    89      *  
     89     * 
    9090     * @param fromPluginSite plugin information read from plugin update sites 
    9191     */ 
    … …  
    111111    /** 
    112112     * Replies the list of selected plugin information objects 
    113      *  
     113     * 
    114114     * @return the list of selected plugin information objects 
    115115     */ 
    … …  
    129129    /** 
    130130     * Replies the list of selected plugin information objects 
    131      *  
     131     * 
    132132     * @return the list of selected plugin information objects 
    133133     */ 
    … …  
    158158    /** 
    159159     * Replies the list of plugin informations to display 
    160      *  
     160     * 
    161161     * @return the list of plugin informations to display 
    162162     */ 
    … …  
    168168    /** 
    169169     * Replies the list of plugins waiting for update or download 
    170      *  
     170     * 
    171171     * @return the list of plugins waiting for update or download 
    172172     */ 
    … …  
    185185    /** 
    186186     * Sets whether the plugin is selected or not. 
    187      *  
     187     * 
    188188     * @param name the name of the plugin 
    189189     * @param selected true, if selected; false, otherwise 
    … …  
    205205     * Removes all the plugin in {@code plugins} from the list of plugins 
    206206     * with a pending download 
    207      *  
     207     * 
    208208     * @param plugins the list of plugins to clear for a pending download 
    209209     */ 
    … …  
    218218     * Replies the plugin info with the name <code>name</code>. null, if no 
    219219     * such plugin info exists. 
    220      *  
     220     * 
    221221     * @param name the name. If null, replies null. 
    222222     * @return the plugin info. 
    … …  
    251251     * Replies true if the plugin with name <code>name</code> is currently 
    252252     * selected in the plugin model 
    253      *  
     253     * 
    254254     * @param name the plugin name 
    255255     * @return true if the plugin is selected; false, otherwise 
    … …  
    265265     * Replies the set of plugins which have been added by the user to 
    266266     * the set of activated plugins. 
    267      *  
     267     * 
    268268     * @return the set of newly deactivated plugins 
    269269     */ 
    … …  
    283283     * Replies the set of plugins which have been removed by the user from 
    284284     * the set of activated plugins. 
    285      *  
     285     * 
    286286     * @return the set of newly deactivated plugins 
    287287     */ 
    … …  
    302302     * Replies the set of plugin names which have been added by the user to 
    303303     * the set of activated plugins. 
    304      *  
     304     * 
    305305     * @return the set of newly activated plugin names 
    306306     */ 
    … …  
    318318     * in this preference model. He has either added plugins or removed plugins 
    319319     * being active before. 
    320      *  
     320     * 
    321321     * @return true if the collection of active plugins has changed 
    322322     */ 
    … …  
    329329     * Refreshes the local version field on the plugins in <code>plugins</code> with 
    330330     * the version in the manifest of the downloaded "jar.new"-file for this plugin. 
    331      *  
     331     * 
    332332     * @param plugins the collections of plugins to refresh 
    333333     */ 

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

    r3083 r3530  
    2626 * It tries to retrieve a list of changesets from the given URL. If it succeeds, the method 
    2727 * {@see #isSuccess()} replies true, otherwise false. 
    28  *  
     28 * 
    2929 * Note: it fetches a list of changesets instead of the much smaller capabilities because - strangely enough - 
    3030 * an OSM server "http://x.y.y/api/0.6" not only responds to  "http://x.y.y/api/0.6/capabilities" but also 
    3131 * to "http://x.y.y/api/0/capabilities" or "http://x.y.y/a/capabilities" with valid capabilities. If we get 
    3232 * valid capabilities with an URL we therefore can't be sure that the base URL is valid API URL. 
    33  *  
     33 * 
    3434 */ 
    3535public class ApiUrlTestTask extends PleaseWaitRunnable{ 
    … …  
    4343    /** 
    4444     * Creates the task 
    45      *  
     45     * 
    4646     * @param parent the parent component relative to which the {@see PleaseWaitRunnable}-Dialog is displayed 
    4747     * @param url the url. Must not be null. 
    … …  
    151151     * Removes leading and trailing whitespace from the API URL and removes trailing 
    152152     * '/'. 
    153      *  
     153     * 
    154154     * @return the normalized API URL 
    155155     */ 

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java

    r3083 r3530  
    2525 * This is the preference panel for the authentication method and the authentication 
    2626 * parameters. 
    27  *  
     27 * 
    2828 */ 
    2929public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel implements PropertyChangeListener{ 

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java

    r3083 r3530  
    2828 * The preferences panel for parameters necessary for the Basic Authentication 
    2929 * Scheme. 
    30  *  
     30 * 
    3131 */ 
    3232public class BasicAuthenticationPreferencesPanel extends JPanel { 

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java

    r3083 r3530  
    4141    /** 
    4242     * Sets whether the current access token should be saved to the preferences file. 
    43      *  
     43     * 
    4444     * If true, the access token is saved in clear text to the preferences file. The same 
    4545     * access token can therefore be used in multiple JOSM sessions. 
    46      *  
     46     * 
    4747     * If false, the access token isn't saved to the preferences file. If JOSM is closed, 
    4848     * the access token is lost and new token has to be generated by the OSM server the 
    4949     * next time JOSM is used. 
    50      *  
     50     * 
    5151     * @param saveToPreferences 
    5252     */ 
    … …  
    5757    /** 
    5858     * Replies the access token key. null, if no access token key is currently set. 
    59      *  
     59     * 
    6060     * @return the access token key 
    6161     */ 
    … …  
    6666    /** 
    6767     * Sets the access token key. Pass in null to remove the current access token key. 
    68      *  
     68     * 
    6969     * @param accessTokenKey the access token key 
    7070     */ 
    … …  
    7575    /** 
    7676     * Replies the access token secret. null, if no access token secret is currently set. 
    77      *  
     77     * 
    7878     * @return the access token secret 
    7979     */ 
    … …  
    8484    /** 
    8585     * Sets the access token secret. Pass in null to remove the current access token secret. 
    86      *  
     86     * 
    8787     * @param accessTokenSecret 
    8888     */ 
    … …  
    9999    /** 
    100100     * Sets the access token hold by this holder. 
    101      *  
     101     * 
    102102     * @param accessTokenKey the access token key 
    103103     * @param accessTokenSecret the access token secret 
    … …  
    110110    /** 
    111111     * Sets the access token hold by this holder. 
    112      *  
     112     * 
    113113     * @param token the access token. Can be null to clear the content in this holder. 
    114114     */ 
    … …  
    126126     * Replies true if this holder contains an complete access token, consisting of an 
    127127     * Access Token Key and an Access Token Secret. 
    128      *  
     128     * 
    129129     * @return true if this holder contains an complete access token 
    130130     */ 
    … …  
    136136     * Initializes the content of this holder from the Access Token managed by the 
    137137     * credential manager. 
    138      *  
     138     * 
    139139     * @param pref the preferences. Must not be null. 
    140140     * @param cm the credential manager. Must not be null. 
    … …  
    162162     * Saves the content of this holder to the preferences and a credential store managed 
    163163     * by a credential manager. 
    164      *  
     164     * 
    165165     * @param preferences the preferences. Must not be null. 
    166166     * @param cm the credentials manager. Must not be null. 

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

    r3083 r3530  
    4040 * showing the current Access Token Key and Access Token Secret, if the 
    4141 * user already has an Access Token. 
    42  *  
     42 * 
    4343 * For initial authorisation see {@see OAuthAuthorisationWizard}. 
    44  *  
     44 * 
    4545 */ 
    4646public class OAuthAuthenticationPreferencesPanel extends JPanel implements PropertyChangeListener { 
    … …  
    5858    /** 
    5959     * Builds the panel for entering the advanced OAuth parameters 
    60      *  
     60     * 
    6161     * @return 
    6262     */ 
    … …  
    172172     * The preferences panel displayed if there is currently no Access Token available. 
    173173     * This means that the user didn't run through the OAuth authorisation procedure yet. 
    174      *  
     174     * 
    175175     */ 
    176176    private class NotYetAuthorisedPanel extends JPanel { 
    … …  
    209209    /** 
    210210     * The preferences panel displayed if there is currently an AccessToken available. 
    211      *  
     211     * 
    212212     */ 
    213213    private class AlreadyAuthorisedPanel extends JPanel { 

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java

    r3083 r3530  
    8686    /** 
    8787     * Builds the panel for the HTTP proxy configuration 
    88      *  
     88     * 
    8989     * @return 
    9090     */ 
    … …  
    162162    /** 
    163163     * Builds the panel for the SOCKS proxy configuration 
    164      *  
     164     * 
    165165     * @return 
    166166     */ 

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

    r3214 r3530  
    439439    /** 
    440440     * Inject a tag cell editor in the tag table 
    441      *  
     441     * 
    442442     * @param editor 
    443443     */ 
    … …  
    543543     * This is a custom implementation of the CellEditorRemover used in JTable 
    544544     * to handle the client property <tt>terminateEditOnFocusLost</tt>. 
    545      *  
     545     * 
    546546     * This implementation also checks whether focus is transferred to one of a list 
    547547     * of dedicated components, see {@see TagTable#doNotStopCellEditingWhenFocused}. 

  • trunk/src/org/openstreetmap/josm/gui/util/RedirectInputMap.java

    r3502 r3530  
    6666        redirect(source, target); 
    6767    } 
    68      
     68 
    6969    public static void redirect(JComponent source, JComponent target) { 
    7070        InputMap lastParent = source.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); 

  • trunk/src/org/openstreetmap/josm/plugins/Plugin.java

    r3070 r3530  
    4848    /** 
    4949     * Creates the plugin 
    50      *  
     50     * 
    5151     * @param info the plugin information describing the plugin. 
    5252     */ 
    … …  
    5757    /** 
    5858     * Replies the plugin information object for this plugin 
    59      *  
     59     * 
    6060     * @return the plugin information object 
    6161     */ 
    … …  
    6666    /** 
    6767     * Sets the plugin information object for this plugin 
    68      *  
     68     * 
    6969     * @parma info the plugin information object 
    7070     */ 
    … …  
    7676     * @return The directory for the plugin to store all kind of stuff. 
    7777     */ 
    78     public final String getPluginDir() { 
     78    public String getPluginDir() { 
    7979        return new File(Main.pref.getPluginsDirectory(), info.name).getPath(); 
    8080    } 
    … …  
    103103     */ 
    104104    public void copy(String from, String to) throws FileNotFoundException, IOException { 
    105         String pluginDirName = Main.pref.getPluginsDirectory() + "/" + info.name + "/"; 
     105        String pluginDirName = getPluginDir(); 
    106106        File pluginDir = new File(pluginDirName); 
    107107        if (!pluginDir.exists()) { 
    108108            pluginDir.mkdirs(); 
    109109        } 
    110         FileOutputStream out = new FileOutputStream(pluginDirName+to); 
     110        FileOutputStream out = new FileOutputStream(new File(pluginDirName, to)); 
    111111        InputStream in = getClass().getResourceAsStream(from); 
    112112        byte[] buffer = new byte[8192]; 

  • trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

    r3332 r3530  
    2929/** 
    3030 * Asynchronous task for downloading a collection of plugins. 
    31  *  
     31 * 
    3232 * When the task is finished {@see #getDownloadedPlugins()} replies the list of downloaded plugins 
    3333 * and {@see #getFailedPlugins()} replies the list of failed plugins. 
    34  *  
     34 * 
    3535 */ 
    3636public class PluginDownloadTask extends PleaseWaitRunnable{ 
    … …  
    4747    /** 
    4848     * Creates the download task 
    49      *  
     49     * 
    5050     * @param parent the parent component relative to which the {@see PleaseWaitDialog} is displayed 
    5151     * @param toUpdate a collection of plugin descriptions for plugins to update/download. Must not be null. 
    … …  
    6161    /** 
    6262     * Creates the task 
    63      *  
     63     * 
    6464     * @param monitor a progress monitor. Defaults to {@see NullProgressMonitor#INSTANCE} if null 
    6565     * @param toUpdate a collection of plugin descriptions for plugins to update/download. Must not be null. 
    … …  
    7575    /** 
    7676     * Sets the collection of plugins to update. 
    77      *  
     77     * 
    7878     * @param toUpdate the collection of plugins to update. Must not be null. 
    7979     * @throws IllegalArgumentException thrown if toUpdate is null 
    … …  
    190190    /** 
    191191     * Replies true if the task was cancelled by the user 
    192      *  
     192     * 
    193193     * @return 
    194194     */ 
    … …  
    199199    /** 
    200200     * Replies the list of successfully downloaded plugins 
    201      *  
     201     * 
    202202     * @return the list of successfully downloaded plugins 
    203203     */ 
    … …  
    208208    /** 
    209209     * Replies the list of plugins whose download has failed 
    210      *  
     210     * 
    211211     * @return the list of plugins whose download has failed 
    212212     */ 

  • trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

    r3331 r3530  
    5858     * Creates a plugin information object by reading the plugin information from 
    5959     * the manifest in the plugin jar. 
    60      *  
     60     * 
    6161     * The plugin name is derived from the file name. 
    62      *  
     62     * 
    6363     * @param file the plugin jar file 
    6464     * @throws PluginException if reading the manifest fails 
    … …  
    101101     * Creates a plugin information object by reading plugin information in Manifest format 
    102102     * from the input stream {@code manifestStream}. 
    103      *  
     103     * 
    104104     * @param manifestStream the stream to read the manifest from 
    105105     * @param name the plugin name 
    … …  
    125125     * plugin information in a plugin information object retrieved from a plugin 
    126126     * update site. 
    127      *  
     127     * 
    128128     * @param other the plugin information object retrieved from the update 
    129129     * site 
    … …  
    227227     * Replies the description as HTML document, including a link to a web page with 
    228228     * more information, provided such a link is available. 
    229      *  
     229     * 
    230230     * @return the description as HTML document 
    231231     */ 
    … …  
    243243    /** 
    244244     * Load and instantiate the plugin 
    245      *  
     245     * 
    246246     * @param the plugin class 
    247247     * @return the instantiated and initialized plugin 
    … …  
    265265    /** 
    266266     * Load the class of the plugin 
    267      *  
     267     * 
    268268     * @param classLoader the class loader to use 
    269269     * @return the loaded class 
    … …  
    356356     * Replies true if the plugin with the given information is most likely outdated with 
    357357     * respect to the referenceVersion. 
    358      *  
     358     * 
    359359     * @param referenceVersion the reference version. Can be null if we don't know a 
    360360     * reference version 
    361      *  
     361     * 
    362362     * @return true, if the plugin needs to be updated; false, otherweise 
    363363     */ 
    … …  
    375375     * it is not available locally (its local version is null) or its local version is 
    376376     * older than the available version on the server. 
    377      *  
     377     * 
    378378     * @return true if the plugin should be updated 
    379379     */ 
    … …  
    393393     * Replies true if either the name, the description, or the version match (case insensitive) 
    394394     * one of the words in filter. Replies true if filter is null. 
    395      *  
     395     * 
    396396     * @param filter the filter expression 
    397397     * @return true if this plugin info matches with the filter 

  • trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java

    r3083 r3530  
    1515/** 
    1616 * A parser for the plugin list provided by a JOSM Plugin Download Site. 
    17  *  
     17 * 
    1818 * See <a href="http://josm.openstreetmap.de/plugin">http://josm.openstreetmap.de/plugin</a> 
    1919 * for a sample of the document. The format is a custom format, kind of mix of CSV and RFC822 style 
    … …  
    2525    /** 
    2626     * Creates the plugin information object 
    27      *  
     27     * 
    2828     * @param name the plugin name 
    2929     * @param url the plugin download url 
    … …  
    4848    /** 
    4949     * Parses a plugin information document and replies a list of plugin information objects. 
    50      *  
     50     * 
    5151     * See <a href="http://josm.openstreetmap.de/plugin">http://josm.openstreetmap.de/plugin</a> 
    5252     * for a sample of the document. The format is a custom format, kind of mix of CSV and RFC822 style 
    5353     * name/value-pairs. 
    54      *  
     54     * 
    5555     * @param in the input stream from which to parse 
    5656     * @return the list of plugin information objects 

  • trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

    r3331 r3530  
    2323 * This is an asynchronous task for reading plugin information from the files 
    2424 * in the local plugin repositories. 
    25  *  
     25 * 
    2626 * It scans the files in the local plugins repository (see {@see Preferences#getPluginsDirectory()} 
    2727 * and extracts plugin information from three kind of files: 
    … …  
    231231    /** 
    232232     * Replies information about available plugins detected by this task. 
    233      *  
     233     * 
    234234     * @return information about available plugins detected by this task. 
    235235     */ 
    … …  
    240240    /** 
    241241     * Replies true if the task was cancelled by the user 
    242      *  
     242     * 
    243243     * @return true if the task was cancelled by the user 
    244244     */ 

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

    r3461 r3530  
    106106        "GTKColorChooserPanel.saturationText", 
    107107        "GTKColorChooserPanel.valueText", 
    108          
     108 
    109109        /* JOptionPane */ 
    110110        "OptionPane.okButtonText", 
    … …  
    144144    /** 
    145145     * Provide translation in a context. 
    146      * There can be different translations for the same text (but  
     146     * There can be different translations for the same text (but 
    147147     * different context). 
    148148     * 
Note: See TracChangeset for help on using the changeset viewer.