Changeset 26509 in osm


Ignore:
Timestamp:
2011-08-11T00:45:56+02:00 (13 years ago)
Author:
stoecker
Message:

i18n fixes

Location:
applications/editors/josm/plugins
Files:
63 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java

    r23585 r26509  
    7878                    }
    7979                    if (!parsedProperly) {
    80                         JOptionPane.showMessageDialog(null, tr("Error occured while parsing gpx file {0}. Only part of the file will be available", urlString));
     80                        JOptionPane.showMessageDialog(null, tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.", urlString));
    8181                    }
    8282

  • applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java

    r24236 r26509  
    9898    private static final String uploadTraceText = tr("Upload Trace");
    9999
    100     private boolean cancelled = false;
     100    private boolean canceled = false;
    101101   
    102102    public UploadDataGui() {
    … …  
    225225            flushToServer(bais, conn.getOutputStream(), progressMonitor);
    226226
    227             if (cancelled) {
     227            if (canceled) {
    228228                conn.disconnect();
    229                 OutputDisplay.setText(tr("Upload cancelled"));
     229                OutputDisplay.setText(tr("Upload canceled"));
    230230                buttons.get(0).setEnabled(true);
    231                 cancelled = false;
     231                canceled = false;
    232232            }
    233233            else {
    … …  
    318318                progressMonitor.subTask(getProgressText(cur, progressMonitor));
    319319
    320                 if(cancelled)
     320                if(canceled)
    321321                    break;
    322322            }
    323323        }
    324         if(!cancelled)
     324        if(!canceled)
    325325            out.flush();
    326326        progressMonitor.subTask("Waiting for server reply...");
    … …  
    406406            @Override protected void finish() {}
    407407            @Override protected void cancel() {
    408                 cancelled = true;
     408                canceled = true;
    409409            }
    410410        };

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationModel.java

    r23976 r26509  
    7171
    7272        /**
    73          * Gets the the GPX data instance used by this model.
     73         * Gets the GPX data instance used by this model.
    7474         *
    7575         * @return

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java

    r23976 r26509  
    276276         *            The fill color of the triangle.
    277277         * @param dir
    278          *            The direction of the the triangle
     278         *            The direction of the triangle
    279279         * @param x
    280280         *            The x coordinate in the graphics context.

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java

    r26420 r26509  
    646646         * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesAdded(org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent)
    647647         */
     648        @Override
    648649        public void primitivesAdded(PrimitivesAddedEvent event) {
    649650                invalidate();
    … …  
    653654         * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesRemoved(org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent)
    654655         */
     656        @Override
    655657        public void primitivesRemoved(PrimitivesRemovedEvent event) {
    656658                invalidate();
    … …  
    819821                }
    820822        }
    821 
    822         @Override
    823         public void primtivesAdded(PrimitivesAddedEvent event) {
    824                 // TODO Auto-generated method stub
    825                
    826         }
    827 
    828         @Override
    829         public void primtivesRemoved(PrimitivesRemovedEvent event) {
    830                 // TODO Auto-generated method stub
    831                
    832         }
    833823}

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java

    r25373 r26509  
    2626
    2727        public FixAddressesMapMode(MapFrame mapFrame) {
    28                 super(tr("Fix adresses"), "incompleteaddress_24",
     28                super(tr("Fix addresses"), "incompleteaddress_24",
    2929                                tr("Show dialog with incomplete addresses"),
    3030                                mapFrame,

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java

    r25373 r26509  
    4646        private OSMAddress curAddressNode;
    4747        private boolean isRunning = false;
    48         private boolean cancelled;
     48        private boolean canceled;
    4949
    5050
    … …  
    170170        @Override
    171171        protected void cancel() {
    172                 cancelled = true;
     172                canceled = true;
    173173        }
    174174
    … …  
    190190
    191191                isRunning = true;
    192                 cancelled = false;
     192                canceled = false;
    193193
    194194                // Start progress monitor to guess address values
    … …  
    221221
    222222                                // check for cancel
    223                                 if (cancelled) {
     223                                if (canceled) {
    224224                                        break;
    225225                                }
    … …  
    229229                                // visit osm data
    230230                                for (OsmPrimitive osmPrimitive : Main.main.getCurrentDataSet().allPrimitives()) {
    231                                         if (cancelled) {
     231                                        if (canceled) {
    232232                                                break;
    233233                                        }

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java

    r25373 r26509  
    5252
    5353        /**
    54          * Gets the coordinate of the node. If the the underlying object is a
     54         * Gets the coordinate of the node. If the underlying object is a
    5555         * node, it just returns the node coordinate. For ways and areas, this
    5656         * method returns the coordinate of the center (balance point).

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StringUtils.java

    r25373 r26509  
    120120        /**
    121121         * @param needle The string to find the best match for.
    122          * @param haystack The list of strings to pick the the best match from.
     122         * @param haystack The list of strings to pick the best match from.
    123123         * @return The string of the list with the longest common substring to needle or
    124124         * <tt>null</tt>, if either <tt>needle</tt> or <tt>haystack</tt> is empty or null.

  • applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java

    r26420 r26509  
    157157         * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesAdded(org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent)
    158158         */
     159        @Override
    159160        public void primitivesAdded(PrimitivesAddedEvent event) {
    160161                container.invalidate();
    … …  
    165166         * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesRemoved(org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent)
    166167         */
     168        @Override
    167169        public void primitivesRemoved(PrimitivesRemovedEvent event) {
    168170                container.invalidate();
    … …  
    227229                container.invalidate();
    228230        }
    229 
    230         @Override
    231         public void primtivesAdded(PrimitivesAddedEvent event) {
    232                 // do something here?           
    233         }
    234 
    235         @Override
    236         public void primtivesRemoved(PrimitivesRemovedEvent event) {
    237                 // do something here?           
    238         }
    239231}

  • applications/editors/josm/plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWATargetWayHelper.java

    r25899 r26509  
    143143
    144144            if (altitudeIntersection != null) {
    145                 // If the the segment intersects with the altitude from p
     145                // If the segment intersects with the altitude from p
    146146                currentDistance = pEN.distance(altitudeIntersection);
    147147

  • applications/editors/josm/plugins/cadastre-fr/build.xml

    r26382 r26509  
    3232    <property name="ant.build.javac.target" value="1.5"/>
    3333    <property name="commit.message" value="Changed constructor for Plugin"/>
    34     <property name="plugin.main.version" value="4126"/>
     34    <property name="plugin.main.version" value="4310"/>
    3535    <target name="init">
    3636        <mkdir dir="${plugin.build.dir}"/>

  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java

    r26228 r26509  
    2626
    2727public class CadastreInterface {
    28     public boolean downloadCancelled = false;
     28    public boolean downloadCanceled = false;
    2929    public HttpURLConnection urlConn = null;
    3030
    … …  
    7676            interfaceRef = null;
    7777        // open the session with the French Cadastre web front end
    78         downloadCancelled = false;
     78        downloadCanceled = false;
    7979        try {
    8080            if (cookie == null || isCookieExpired) {
    … …  
    306306                    // list of values parsed in listOfFeuilles (list all non-georeferenced images)
    307307                    lines = getFeuillesList();
    308                     if (!downloadCancelled) {
     308                    if (!downloadCanceled) {
    309309                        parseFeuillesList(lines);
    310310                        if (listOfFeuilles.size() > 0) {
    … …  
    567567            //urlConn.disconnect();
    568568        }
    569         downloadCancelled = true;
     569        downloadCanceled = true;
    570570        lastWMSLayerName = null;
    571571    }

  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java

    r26228 r26509  
    256256        if (!alreadyRedefined) {
    257257            int reply = JOptionPane.showConfirmDialog(null,
    258                     tr("Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"+
    259                     "which is currently allocated for full-screen switch by default\n"+
    260                     "Would you like to restore F11 for grab action ?"),
     258                    tr("Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"+
     259                    "which is currently allocated for full-screen switch by default.\n"+
     260                    "Would you like to restore F11 for grab action?"),
    261261                    tr("Restore grab shortcut F11"),
    262262                    JOptionPane.YES_NO_OPTION);
    … …  
    268268            }
    269269        } else
    270             System.out.println("shortcut F11 already redefined; do not change");
     270            System.out.println("Shortcut F11 already redefined; do not change.");
    271271
    272272        refreshMenu();

  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java

    r26382 r26509  
    114114        // option to alter the original colors of the wms images
    115115        alterColors.setSelected(Main.pref.getBoolean("cadastrewms.alterColors", false));
    116         alterColors.setToolTipText(tr("Replace the original white background by the backgound color defined in JOSM preferences."));
     116        alterColors.setToolTipText(tr("Replace the original white background by the background color defined in JOSM preferences."));
    117117        cadastrewms.add(alterColors, GBC.eop().insets(0, 0, 0, 0));
    118118

  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java

    r25045 r26509  
    4545                        // till here
    4646                        dontGeoreference = true;
    47                     } else if (wmsLayer.grabber.getWmsInterface().downloadCancelled){
     47                    } else if (wmsLayer.grabber.getWmsInterface().downloadCanceled){
    4848                        // do nothing
    4949                    } else {
    … …  
    6262                            // grab new images from wms server into active layer
    6363                            wmsLayer.grab(bounds);
    64                             if (wmsLayer.grabber.getWmsInterface().downloadCancelled) {
     64                            if (wmsLayer.grabber.getWmsInterface().downloadCanceled) {
    6565                                wmsLayer.clearImages();
    6666                                Main.map.mapView.repaint();

  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java

    r25045 r26509  
    6868        wmsLayer.grabber.getWmsInterface().cancel();
    6969        if (wmsLayer != null)
    70             wmsLayer.grabThread.setCancelled(true);
     70            wmsLayer.grabThread.setCanceled(true);
    7171    }
    7272

  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java

    r25045 r26509  
    1717public class GrabThread extends Thread {
    1818
    19     private boolean cancelled;
     19    private boolean canceled;
    2020
    2121    private CadastreGrabber grabber;
    … …  
    8484                imagesToGrab.remove(0);
    8585                lockImagesToGrag.unlock();
    86                 if (cancelled) {
     86                if (canceled) {
    8787                    break;
    8888                } else {
    … …  
    9393                    } catch (IOException e) {
    9494                        System.out
    95                                 .println("Download action cancelled by user or server did not respond");
    96                         setCancelled(true);
     95                                .println("Download action canceled by user or server did not respond");
     96                        setCanceled(true);
    9797                        break;
    9898                    } catch (OsmTransferException e) {
    9999                        System.out.println("OSM transfer failed");
    100                         setCancelled(true);
     100                        setCanceled(true);
    101101                        break;
    102102                    }
    103                     if (grabber.getWmsInterface().downloadCancelled) {
    104                         System.out.println("Download action cancelled by user");
    105                         setCancelled(true);
     103                    if (grabber.getWmsInterface().downloadcanceled) {
     104                        System.out.println("Download action canceled by user");
     105                        setCanceled(true);
    106106                        break;
    107107                    }
    … …  
    125125                    } catch (NullPointerException e) {
    126126                        System.out.println("Layer destroyed. Cancel grab thread");
    127                         setCancelled(true);
     127                        setCanceled(true);
    128128                    }
    129129                }
    … …  
    133133            currentGrabImage = null;
    134134            lockCurrentGrabImage.unlock();
    135             if (cancelled) {
     135            if (canceled) {
    136136                clearImagesToGrab();
    137                 cancelled = false;
     137                canceled = false;
    138138            }
    139139            if (wmsLayer.isRaster()) {
    … …  
    207207    }
    208208   
    209     public boolean isCancelled() {
    210         return cancelled;
    211     }
    212 
    213     public void setCancelled(boolean cancelled) {
    214         this.cancelled = cancelled;
     209    public boolean isCanceled() {
     210        return canceled;
     211    }
     212
     213    public void setCanceled(boolean canceled) {
     214        this.canceled = canceled;
    215215    }
    216216

  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java

    r26330 r26509  
    108108            Main.map.repaint();
    109109        } else if (wmsLayer.getImages().size() == 0) {
    110             // action cancelled or image loaded from cache (and already georeferenced)
     110            // action canceled or image loaded from cache (and already georeferenced)
    111111            actionInterrupted();
    112112        } else {

  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java

    r26228 r26509  
    129129
    130130    public void grab(Bounds b) throws IOException {
    131         grabThread.setCancelled(false);
     131        grabThread.setCanceled(false);
    132132        grabThread.setGrabber(grabber);
    133133        // if it is the first layer, use the communeBBox as grab bbox (and not divided)

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java

    r23190 r26509  
    4545        assert (co != null) || (cp != null);
    4646
    47         //... but the the name is overwritten.
     47        //... but the name is overwritten.
    4848        this.name = generateName(this.cp, this.co);
    4949    }

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java

    r22915 r26509  
    338338        } catch (NullPointerException except) {
    339339            dbTreeValue = null;
    340             System.err.println("Strange exception has occured."+
     340            System.err.println("Strange exception has occurred."+
    341341                " If you find a way to reproduce it, please report a bug!");
    342342            except.printStackTrace();

  • applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java

    r23190 r26509  
    565565
    566566        } catch (NullPointerException except) {
    567             System.err.println("Strange exception occured." +
     567            System.err.println("Strange exception occurred." +
    568568                " If you find a way to reproduce this situation, please "+
    569569                "e-mail the author of the CzechAddress plugin.");
    … …  
    615615
    616616        } catch (NullPointerException except) {
    617             System.err.println("Strange exception occured." +
     617            System.err.println("Strange exception occurred." +
    618618                " If you find a way to reproduce this situation, please "+
    619619                "e-mail the author of the CzechAddress plugin.");

  • applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java

    r23191 r26509  
    119119    private SerialPort port = null;
    120120
    121     private boolean cancelled = false;
     121    private boolean canceled = false;
    122122
    123123    public GlobalsatDg100(CommPortIdentifier portId){
    … …  
    126126
    127127    public void cancel(){
    128         cancelled = true;
     128        canceled = true;
    129129        disconnect();
    130130    }
    … …  
    138138        try {
    139139            GpxData result = null;
    140             cancelled = false;
     140            canceled = false;
    141141            if(port == null){
    142142                connect();
    … …  
    152152                Collection<WayPoint> seg = new ArrayList<WayPoint>(100);
    153153                for(GpsRec r:gpsRecList){
    154                     if(cancelled){
     154                    if(canceled){
    155155                        return result;
    156156                    }
    … …  
    306306    }
    307307
    308     public boolean isCancelled(){
    309         return cancelled;
     308    public boolean isCanceled(){
     309        return canceled;
    310310    }
    311311

  • applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java

    r23191 r26509  
    5656
    5757        @Override protected void finish() {
    58             if(deleteAfter && GlobalsatPlugin.dg100().isCancelled() == false){
     58            if(deleteAfter && GlobalsatPlugin.dg100().isCanceled() == false){
    5959                Main.pref.put("globalsat.deleteAfterDownload", true);
    6060                try{

  • applications/editors/josm/plugins/gpxfilter/build.xml

    r26471 r26509  
    100100                <attribute name="Plugin-Class" value="gpxfilter.GpxFilterPlugin"/>
    101101                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    102                 <attribute name="Plugin-Description" value="Allows to filter out unnececary GPS tracks"/>
     102                <attribute name="Plugin-Description" value="Allows to filter out unnecessary GPS tracks"/>
    103103                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/GPXFilter"/>
    104104                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>

  • applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java

    r26471 r26509  
    12461246        if (bestEN == null)
    12471247            return null;
    1248         WayPoint best = new WayPoint(Main.proj.eastNorth2latlon(bestEN));
     1248        WayPoint best = new WayPoint(Main.getProjection().eastNorth2latlon(bestEN));
    12491249        best.time = bestTime;
    12501250        return best;

  • applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java

    r25469 r26509  
    134134
    135135        private List<File> files;
    136         private boolean cancelled;
     136        private boolean canceled;
    137137
    138138        public ImportTask(List<File> files) {
    … …  
    142142        @Override
    143143        protected void cancel() {
    144             this.cancelled = true;
     144            this.canceled = true;
    145145        }
    146146
    … …  
    250250            try {
    251251                for (File f : files) {
    252                     if (cancelled) return;
     252                    if (canceled) return;
    253253                    SVGLoader loader = new SVGLoader(new URI("about:blank"),true);
    254254                    XMLReader rdr = XMLReaderFactory.createXMLReader();

  • applications/editors/josm/plugins/junctionchecking/build.xml

    r26174 r26509  
    2727<project name="junctionchecking" default="dist" basedir=".">
    2828    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    29     <property name="plugin.main.version" value="3751"/>
     29    <property name="plugin.main.version" value="4126"/>
    3030    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    3131    <property name="plugin.build.dir" value="build"/>

  • applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java

    r25501 r26509  
    150150
    151151        private Point getCoord(OSMNode node, MapView mv) {
    152                 return mv.getPoint(Main.proj.latlon2eastNorth(new LatLon(node.getLatitude(), node.getLongitude())));
     152                return mv.getPoint(Main.getProjection().latlon2eastNorth(new LatLon(node.getLatitude(), node.getLongitude())));
    153153        }
    154154

  • applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java

    r26373 r26509  
    8989        private Collection<OsmPrimitive> validatedPrimitives;
    9090        private Collection<OsmPrimitive> formerValidatedPrimitives;
    91         private boolean cancelled;
     91        private boolean canceled;
    9292        private List<LicenseProblem> problems;
    9393
    … …  
    109109        protected void cancel()
    110110        {
    111             this.cancelled = true;
     111            this.canceled = true;
    112112        }
    113113
    … …  
    115115        protected void finish()
    116116        {
    117             if (cancelled) return;
     117            if (canceled) return;
    118118
    119119            // update GUI on Swing EDT

  • applications/editors/josm/plugins/livegps/src/org/json/JSONArray.java

    r23191 r26509  
    729729     * @param value The Map value.
    730730     * @return      this.
    731      * @throws JSONException If the index is negative or if the the value is
     731     * @throws JSONException If the index is negative or if the value is
    732732     *  an invalid number.
    733733     */
    … …  
    747747     *  JSONObject.NULL object.
    748748     * @return this.
    749      * @throws JSONException If the index is negative or if the the value is
     749     * @throws JSONException If the index is negative or if the value is
    750750     *  an invalid number.
    751751     */

  • applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java

    r26355 r26509  
    3737     * to avoid prompting the user for login multiple times in one session,
    3838     * when they decide not to save the credentials.
    39      * In contrast, this cache avoids read request the the backend in general.
     39     * In contrast, this cache avoids read request the backend in general.
    4040     */
    4141    private Map<RequestorType, PasswordAuthentication> credentialsCache = new HashMap<RequestorType, PasswordAuthentication>();

  • applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java

    r23191 r26509  
    7575
    7676        if(comment == null) {
    77             cancelled = true;
     77            canceled = true;
    7878        }
    7979    }
    … …  
    9494        AddCommentAction action = new AddCommentAction(dialog);
    9595        action.comment = comment;
    96         action.cancelled = cancelled;
     96        action.canceled = canceled;
    9797        action.node = node;
    9898        return action;

  • applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java

    r25686 r26509  
    7676
    7777        if(comment == null) {
    78             cancelled = true;
     78            canceled = true;
    7979        }
    8080
    … …  
    9999    public CloseIssueAction clone() {
    100100        CloseIssueAction action = new CloseIssueAction(dialog);
    101         action.cancelled = cancelled;
     101        action.canceled = canceled;
    102102        action.comment = comment;
    103103        action.node = node;

  • applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java

    r23191 r26509  
    7979
    8080        if(result == null) {
    81             cancelled = true;
     81            canceled = true;
    8282        }
    8383    }
    … …  
    105105    public OsbAction clone() {
    106106        NewIssueAction action = new NewIssueAction(plugin, p);
    107         action.cancelled = cancelled;
     107        action.canceled = canceled;
    108108        action.p = p;
    109109        action.result = result;

  • applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java

    r25664 r26509  
    5252    protected final OsbDialog dialog;
    5353
    54     protected boolean cancelled = false;
     54    protected boolean canceled = false;
    5555    protected final ActionQueue actionQueue;
    5656
    … …  
    6262
    6363    public void actionPerformed(ActionEvent e) {
    64         cancelled = false;
     64        canceled = false;
    6565        try {
    6666            doActionPerformed(e);
    67             if(!cancelled) {
     67            if(!canceled) {
    6868                if (!Main.pref.getBoolean(ConfigKeys.OSB_API_OFFLINE)) {
    6969                    execute();

  • applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java

    r22684 r26509  
    7171                    actionQueue.processQueue();
    7272
    73                     // toggle queue panel visibility, if now error occured
     73                    // toggle queue panel visibility, if now error occurred
    7474                    dialog.hideQueuePanel();
    7575

  • applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java

    r24928 r26509  
    167167        final private int mTimeMode;
    168168
    169         private boolean cancelled = false;
     169        private boolean canceled = false;
    170170        private Boolean override_backup = null;
    171171
    … …  
    186186
    187187            for (int i=0; i<images.size(); ++i) {
    188                 if (cancelled) return;
     188                if (canceled) return;
    189189
    190190                ImageEntry e = images.get(i);
    … …  
    210210
    211211                    chooseFiles(e.getFile());
    212                     if (cancelled) return;
     212                    if (canceled) return;
    213213                    ExifGPSTagger.setExifGPSTag(fileFrom, fileTo, e.getPos().lat(), e.getPos().lon(), e.getGpsTime().getTime());
    214214
    … …  
    254254            if (fileBackup.exists()) {
    255255                confirm_override();
    256                 if (cancelled)
     256                if (canceled)
    257257                    return;
    258258
    … …  
    316316                            override_backup = true;
    317317                        } else {
    318                             cancelled = true;
     318                            canceled = true;
    319319                        }
    320320                    }
    … …  
    322322            } catch (Exception e) {
    323323                System.err.println(e);
    324                 cancelled = true;
     324                canceled = true;
    325325            }
    326326        }
    … …  
    356356        @Override
    357357        protected void cancel() {
    358             cancelled = true;
     358            canceled = true;
    359359        }
    360360    }

  • applications/editors/josm/plugins/piclayer/build.xml

    r26174 r26509  
    2323<project name="PicLayer" default="dist" basedir=".">
    2424    <property name="commit.message" value="applied #J5852 (patch by Petschge) - new shear option"/>
    25     <property name="plugin.main.version" value="3835"/>
     25    <property name="plugin.main.version" value="4126"/>
    2626    <!--
    2727      ************************************************

  • applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java

    r26498 r26509  
    359359        if ( m_image == null )
    360360            return;
    361         String projcode = Main.proj.toCode();
     361        String projcode = Main.getProjection().toCode();
    362362
    363363        // TODO: bounding box only supported when coordinates are in meters

  • applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java

    r26498 r26509  
    232232        boolean loadcal = false;
    233233
    234         String msg = tr("A calibration file associated to the picture file was found:")+"\n"+fileName;
     234        String msg = tr("A calibration file associated to the picture file was found: {0}\n", fileName);
    235235        if ( policy.equals("yes") ) {
    236236            loadcal = true;
    … …  
    240240        }
    241241        else if ( policy.equals("ask") ) {
    242             msg += "\n" + tr("(set  \"{0}\" to yes/no/ask in the preferences\n"+
    243                             "to control the autoloading of calibration files)", prefkey);
     242            msg += "\n" + tr("Set \"{0}\" to yes/no/ask in the preferences\n"+
     243                            "to control the autoloading of calibration files.", prefkey);
    244244            msg += "\n" + tr("Do you want to apply it ?");
    245245            int answer = JOptionPane.showConfirmDialog(Main.parent, msg, tr("Load calibration file ?"), JOptionPane.YES_NO_OPTION);
    … …  
    250250        else {
    251251            msg += "\n" + tr("It will be applied automatically.");
    252             msg += "\n" + tr("Also, frow now on, cal files will always be loaded automatically.");
    253             msg += "\n" + tr("Set  \"{0}\" to yes/no/ask in the preferences\n"+
     252            msg += "\n" + tr("Also, from now on, calibration files will always be loaded automatically.");
     253            msg += "\n" + tr("Set \"{0}\" to yes/no/ask in the preferences\n"+
    254254                            "to control the autoloading of calibration files.", prefkey);
    255255            // TODO: there should be here a yes/no dialog with a checkbox "do not ask again"

  • applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/ProjectionException.java

    r26409 r26509  
    2121/**
    2222 * Signals that an erroneous situation has
    23  * occured during the computation of
     23 * occurred during the computation of
    2424 * a projected coordinate system value.
    2525 *

  • applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java

    r26168 r26509  
    213213      if (!parsedProperly)
    214214      {
    215         JOptionPane.showMessageDialog(null, tr("Error occured while parsing gpx file {0}. Only part of the file will be available", file.getName()));
     215        JOptionPane.showMessageDialog(null, tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.", file.getName()));
    216216      }
    217217    }

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java

    r25711 r26509  
    3131        super(tr("Download referrers"));
    3232        putValue(SMALL_ICON, ImageProvider.get("downloadreferrers"));
    33         putValue(SHORT_DESCRIPTION, tr("Download referrers for the the chosen relation and its members"));
     33        putValue(SHORT_DESCRIPTION, tr("Download referrers for the chosen relation and its members."));
    3434        this.rel = rel;
    3535        rel.addChosenRelationListener(this);

  • applications/editors/josm/plugins/reverter/build.xml

    r26174 r26509  
    3232    <property name="commit.message" value="recompile after change in OsmPrimitive in JOSM 4099"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4099"/>
     34    <property name="plugin.main.version" value="4310"/>
    3535    <!--
    3636      ************************************************

  • applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

    r23278 r26509  
    171171                rdr.ReadObject(entry.getPrimitiveId(), cds.getEarliestVersion(entry.getPrimitiveId())-1,
    172172                        progressMonitor.createSubTaskMonitor(1, true));
    173                 if (progressMonitor.isCancelled()) return;
     173                if (progressMonitor.isCanceled()) return;
    174174            }
    175175            for (HistoryOsmPrimitive entry : deleted) {
    176176                rdr.ReadObject(entry.getPrimitiveId(), cds.getEarliestVersion(entry.getPrimitiveId())-1,
    177177                        progressMonitor.createSubTaskMonitor(1, true));
    178                 if (progressMonitor.isCancelled()) return;
     178                if (progressMonitor.isCanceled()) return;
    179179            }
    180180            nds = rdr.parseOsm(progressMonitor.createSubTaskMonitor(1, true));

  • applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java

    r24882 r26509  
    6868                    monitor.close();
    6969                }
    70                 return !monitor.isCancelled();
     70                return !monitor.isCanceled();
    7171            }
    7272
    … …  
    7676                rev = new ChangesetReverter(changesetId, revertType,
    7777                        progressMonitor.createSubTaskMonitor(0, true));
    78                 if (progressMonitor.isCancelled()) return;
     78                if (progressMonitor.isCanceled()) return;
    7979
    8080                // Check missing objects
    … …  
    9191                }
    9292
    93                 if (progressMonitor.isCancelled()) return;
     93                if (progressMonitor.isCanceled()) return;
    9494                rev.downloadObjectsHistory(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
    95                 if (progressMonitor.isCancelled()) return;
     95                if (progressMonitor.isCanceled()) return;
    9696                if (!checkAndDownloadMissing()) return;
    9797                List<Command> cmds = rev.getCommands();

  • applications/editors/josm/plugins/reverter/src/reverter/corehacks/MultiOsmReader.java

    r25092 r26509  
    168168                } else {
    169169                    throwException(tr(
    170                             "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
     170                            "Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
    171171                            minlon, minlat, maxlon, maxlat, origin
    172172                    ));

  • applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/ButtonDescription.java

    r16957 r26509  
    150150        this.type = ButtonType.valueOf(type.toUpperCase());
    151151        } catch (IllegalArgumentException e) {
    152             System.err.println("Unkown button type '" + type + "' given. Allowed values are " + Arrays.toString(ButtonType.values()));
     152            System.err.println("Unknown button type '" + type + "' given. Allowed values are " + Arrays.toString(ButtonType.values()));
    153153        }
    154154    }

  • applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java

    r13497 r26509  
    547547 * Closes the tokenizer (and the reader is uses internally).
    548548 *
    549  * @exception IOException if an error occured.
     549 * @exception IOException if an error occurred.
    550550 */
    551551  public void close()
    … …  
    563563 *
    564564 * @return the next character.
    565  * @exception IOException if an error occured.
     565 * @exception IOException if an error occurred.
    566566 */
    567567  protected int readNextChar()
    … …  
    610610 *
    611611 * @return the next token.
    612  * @exception IOException if an error occured.
     612 * @exception IOException if an error occurred.
    613613 */
    614614  public int nextToken()
    … …  
    694694 *
    695695 * @return true, if the tokenizer can return another line.
    696  * @exception IOException if an error occured.
     696 * @exception IOException if an error occurred.
    697697 */
    698698  public boolean hasNextLine()
    … …  
    724724 * @return a list of elements (Strings) from the next line of the
    725725 * tokenizer.
    726  * @exception IOException if an error occured.
     726 * @exception IOException if an error occurred.
    727727 */
    728728  public List<String> nextLine()

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java

    r23189 r26509  
    1818     * to edit the key of a tag. In this case the auto completion list is
    1919     * initialized with the set of standard key values and the set of current key
    20      * values from the the current JOSM data set. Keys already present in the
     20     * values from the current JOSM data set. Keys already present in the
    2121     * current tag model are removed from the auto completion list.
    2222     *

  • applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java

    r23189 r26509  
    6161
    6262    /**
    63      * loads the the tag specifications from the resource file given by
     63     * loads the tag specifications from the resource file given by
    6464     * {@link #RES_NAME_TAG_SPECIFICATIONS}.
    6565     *

  • applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java

    r25269 r26509  
    2525public class DownloadSignedOsmDataTask  extends PleaseWaitRunnable {
    2626
    27         private boolean cancelled;
     27        private boolean canceled;
    2828        private Exception lastException;
    2929        private final Collection<OsmPrimitive> missing;
    … …  
    4444        @Override
    4545        protected void cancel() {
    46                 cancelled = true;
     46                canceled = true;
    4747                synchronized(this) {
    4848                        if (objectReader != null) {
    … …  
    5555        protected void finish() {
    5656                Main.map.repaint();
    57                 if (cancelled)
     57                if (canceled)
    5858                        return;
    5959                if (lastException != null) {
    … …  
    7575                try {
    7676                        synchronized (this) {
    77                                 if (cancelled) return;
     77                                if (canceled) return;
    7878                                objectReader = new MultiFetchServerObjectReader();
    7979                        }
    … …  
    8787                                return;
    8888                        synchronized (this) {
    89                                 if (cancelled) return;
     89                                if (canceled) return;
    9090                                objectReader = null;
    9191                        }
    … …  
    103103
    104104                } catch (Exception e) {
    105                         if (cancelled) {
    106                                 System.out.println(tr("Warning: ignoring exception because task is cancelled. Exception: {0}", e.toString()));
     105                        if (canceled) {
     106                                System.out.println(tr("Warning: ignoring exception because task is canceled. Exception: {0}", e.toString()));
    107107                                return;
    108108                        }

  • applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java

    r24389 r26509  
    1212public class KeyGenerationTask extends PleaseWaitRunnable {
    1313
    14         private boolean cancelled;
     14        private boolean canceled;
    1515        private Exception lastException;
    1616
    … …  
    2121        @Override
    2222        protected void cancel() {
    23                 cancelled = true;
     23                canceled = true;
    2424                synchronized(this) {
    2525                        /*              if (objectReader != null) {
    … …  
    3131        @Override
    3232        protected void finish() {
    33                 if (cancelled)
     33                if (canceled)
    3434                        return;
    3535                if (lastException != null) {
    … …  
    4444                try {
    4545                        /*                      synchronized (this) {
    46                                 if (cancelled) return;
     46                                if (canceled) return;
    4747                                objectReader = new MultiFetchServerObjectReader();
    4848                        }
    … …  
    5656                                return;
    5757                        synchronized (this) {
    58                                 if (cancelled) return;
     58                                if (canceled) return;
    5959                                objectReader = null;
    6060                        }
    … …  
    7171                         */
    7272                } catch (Exception e) {
    73                         if (cancelled) {
    74                                 System.out.println(tr("Warning: ignoring exception because task is cancelled. Exception: {0}", e
     73                        if (canceled) {
     74                                System.out.println(tr("Warning: ignoring exception because task is canceled. Exception: {0}", e
    7575                                                .toString()));
    7676                                return;

  • applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java

    r26192 r26509  
    33import static java.lang.Math.sqrt;
    44import static org.openstreetmap.josm.plugins.turnlanes.gui.GuiUtil.locs;
     5import static org.openstreetmap.josm.tools.I18n.tr;
    56
    67import java.awt.BasicStroke;
    … …  
    146147        }
    147148       
    148         throw new IllegalArgumentException("No such lane.");
     149        throw new IllegalArgumentException(tr("No such lane."));
    149150    }
    150151   

  • applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java

    r26192 r26509  
    11package org.openstreetmap.josm.plugins.turnlanes.gui;
     2
     3import static org.openstreetmap.josm.tools.I18n.tr;
    24
    35import java.awt.AlphaComposite;
    … …  
    333335                && UnexpectedDataException.Kind.MISSING_TAG.format("lanes").equals(e.getMessage())) {
    334336           
    335             error.setText("<html>The number of lanes is not specified for one or more roads;"
    336                     + " please add missing lanes tags.</html>");
     337            error.setText(tr("<html>The number of lanes is not specified for one or more roads;"
     338                    + " please add missing lanes tags.</html>"));
    337339        } else {
    338340            displayError((RuntimeException) e);
    … …  
    341343   
    342344    private void displayError(RuntimeException e) {
    343         error.setText("<html>An error occured while constructing the model."
    344                 + " Please run the validator to make sure the data is consistent.<br><br>Error: " + e.getMessage()
    345                 + "</html>");
     345        error.setText(tr("<html>An error occurred while constructing the model."
     346                + " Please run the validator to make sure the data is consistent."
     347                + "<br><br>Error: {0}</html>", e.getMessage()));
    346348    }
    347349   

  • applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java

    r24937 r26509  
    485485            sb.append(trn("This turn restriction refers to an object which was deleted outside "
    486486                       + "of this turn restriction editor:",
    487                        "This turn restriction refers to {0} which were deleted outside "
     487                       "This turn restriction refers to {0} objects which were deleted outside "
    488488                       + "of this turn restriction editor:", deletedMembers.size(), deletedMembers.size()));
    489489            sb.append("<ul>");

  • applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java

    r24937 r26509  
    215215    class EditAction extends AbstractAction implements ListSelectionListener{
    216216        public EditAction() {
    217             putValue(SHORT_DESCRIPTION,tr( "Open an editor for the selected turn restricion"));
     217            putValue(SHORT_DESCRIPTION,tr("Open an editor for the selected turn restriction"));
    218218            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
    219219            putValue(NAME, tr("Edit"));

  • applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/Issue.java

    r23192 r26509  
    1414 * The issue has a {@see Severity}. It is described to the user with a HTML formatted
    1515 * text (see {@see #getText()}) and it suggests a list of possible actions to fix
    16  * the the issue (see {@see #getActions()}).
     16 * the issue (see {@see #getActions()}).
    1717 *
    1818 */

  • applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java

    r26257 r26509  
    8686                    int last = w.getNodesCount() - 1;
    8787                    // Only closed ways with at least four nodes
    88                     // (i.e. five members since the the first/last is listed twice)
     88                    // (i.e. five members since the first/last is listed twice)
    8989                    // can be split into two objects
    9090                    if (last <= 4 || !w.isClosed()) {

  • applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java

    r25876 r26509  
    2424    public AdjacentWaysAction() {
    2525        super(tr("Adjacent ways"), "adjways",
    26                 tr("Adjacent ways will be selected. Nodes wiil be deselected."),
     26                tr("Adjacent ways will be selected. Nodes will be deselected."),
    2727                Shortcut.registerShortcut("tools:adjways", tr("Tool: {0}","Adjacent ways"),
    2828                KeyEvent.VK_E, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);

  • applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java

    r23191 r26509  
    273273    }
    274274
    275     /** Given the the node on one end of the way, return the node on the other end */
     275    /** Given the node on one end of the way, return the node on the other end */
    276276    private Node findOtherEnd(Way way, Node firstEnd) {
    277277        Node otherEnd = way.firstNode();
Note: See TracChangeset for help on using the changeset viewer.