Changeset 15960 in osm for applications/editors/josm/plugins

Timestamp:

2009-06-17T09:01:52+02:00 (16 years ago)

Author:

stoecker

Message:

fixed typos

Location:

applications/editors/josm/plugins

Files:

• agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java (modified) (30 diffs)
• cadastre-fr/src/cadastre_fr/WMSLayer.java (modified) (1 diff)
• openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java (modified) (1 diff)
• utilsplugin/src/UtilsPlugin/JoinAreasAction.java (modified) (1 diff)
• wmsplugin/src/wmsplugin/Help_WMSmenuAction.java (modified) (2 diffs)
• wmsplugin/src/wmsplugin/WMSAdjustAction.java (modified) (6 diffs)

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java

@@ -559 +559 @@
                 new String[] { tr("Correlate"), tr("Auto-Guess"), tr("Cancel") },
                 new String[] { "ok.png", "dialogs/gpx2imgManual.png", "cancel.png" }).getValue();
-            
+
             if(answer != 1 && answer != 2)
                 return;
-                
+
             // Check the selected values
             Object item = cbGpx.getSelectedItem();
@@ -572 +572 @@
             }
             selectedGpx = ((GpxDataWrapper) item);
-            
+
             if (answer == 2) {
                 autoGuess(selectedGpx.data);
@@ -643 +643 @@
 
     }
-    
+
     // These variables all belong to "auto guess" but need to be accessible
     // from the slider change listener
@@ -659 +659 @@
     private long firstGPXDate = -1;
     private long firstExifDate = -1;
-    
+
     /**
      * Tries to automatically match opened photos to a given GPX track. Changes are applied
@@ -669 +669 @@
         autoImgs = getSortedImgList(true, false);
         PrimaryDateParser dateParser = new PrimaryDateParser();
-        
+
         // no images found, exit
         if(autoImgs.size() <= 0) {
@@ -677 +677 @@
             return;
         }
-        
+
         // Free the user's vision
         Main.pleaseWaitDlg.setVisible(false);
         AgpifojDialog dialog = AgpifojDialog.getInstance();
         dialog.action.button.setSelected(true);
-        dialog.action.actionPerformed(null); 
+        dialog.action.actionPerformed(null);
         // Will show first photo if none is selected yet
         if(!dialog.hasImage())
             yLayer.showNextPhoto();
         // FIXME: If the dialog is minimized it will not be maximized. ToggleDialog is
-        // in need of a complete re-write to allow this in a reasonable way. 
+        // in need of a complete re-write to allow this in a reasonable way.
 
         // Init variables
         firstExifDate = autoImgs.get(0).time.getTime()/1000;
-        
-        
+
+
         // Finds first GPX point
         outer: for (GpxTrack trk : gpx.tracks) {
@@ -699 +699 @@
                     String curDateWpStr = (String) curWp.attr.get("time");
                     if (curDateWpStr == null) continue;
-                    
+
                     try {
                         firstGPXDate = dateParser.parse(curDateWpStr).getTime()/1000;
@@ -707 +707 @@
             }
         }
-        
+
         // No GPX timestamps found, exit
         if(firstGPXDate < 0) {
@@ -715 +715 @@
             return;
         }
-        
+
         // seconds
         long diff = (yLayer.hasTimeoffset)
             ? yLayer.timeoffset
-            : firstExifDate - firstGPXDate;         
+            : firstExifDate - firstGPXDate;
         yLayer.timeoffset = diff;
         yLayer.hasTimeoffset = true;
-        
+
         double diffInH = (double)diff/(60*60);    // hours
 
@@ -728 +728 @@
         dayOffset = (int)Math.round(diffInH / 24); // days
         double timezone = diff - dayOffset*24*60*60;  // seconds
-        
+
         // In hours, rounded to two decimal places
         timezone = (double)Math.round(timezone*100/(60*60)) / 100;
@@ -736 +736 @@
         double fixTimezone = (double)Math.round(timezone * 2)/2; // hours, rounded to one decimal place
         int offset = (int)Math.round(diff - fixTimezone*60*60) - dayOffset*24*60*60; // seconds
-        
+
         /*System.out.println("phto " + firstExifDate);
         System.out.println("gpx  " + firstGPXDate);
@@ -745 +745 @@
         System.out.println("fix  " + fixTimezone);
         System.out.println("offt " + offset);*/
-        
+
         // This is called whenever one of the sliders is moved.
         // It updates the labels and also calls the "match photos" code
@@ -756 +756 @@
                     : (int)Math.floor(tz/2) + ":30";
                 if(sldTimezone.getValue() < 0) zone = "-" + zone;
-                
+
                 lblTimezone.setText(tr("Timezone: {0}", zone));
                 lblMinutes.setText(tr("Minutes: {0}", sldMinutes.getValue()));
                 lblSeconds.setText(tr("Seconds: {0}", sldSeconds.getValue()));
-                
+
                 float gpstimezone = parseTimezone(zone).floatValue();
-                
+
                 // Reset previous position
                 for(ImageEntry x : autoImgs) {
@@ -768 +768 @@
                     x.pos = null;
                 }
-                
+
                 long timediff = (long) (gpstimezone * 3600)
                         + dayOffset*24*60*60
                         + sldMinutes.getValue()*60
                         + sldSeconds.getValue();
-                
+
                 int matched = matchGpxTrack(autoImgs, autoGpx, timediff);
 
@@ -783 +783 @@
                       )
                 );
-                
+
                 int offset = (int)(firstGPXDate+timediff-firstExifDate);
                 int o = Math.abs(offset);
@@ -797 +797 @@
             }
         }
-        
+
         // Info Labels
         lblMatches = new JLabel();
@@ -807 +807 @@
         lblTimezone = new JLabel();
         sldTimezone = new JSlider(-24, 24, 0);
-        sldTimezone.setPaintLabels(true);        
+        sldTimezone.setPaintLabels(true);
         Hashtable labelTable = new Hashtable();
         labelTable.put(-24, new JLabel("-12:00"));
@@ -815 +815 @@
         labelTable.put( 24, new JLabel( "12:00"));
         sldTimezone.setLabelTable(labelTable);
-        
+
         // Minutes Slider
         lblMinutes = new JLabel();
-        sldMinutes = new JSlider(-15, 15, 0);        
-        sldMinutes.setPaintLabels(true);   
-        sldMinutes.setMajorTickSpacing(5);  
-        
+        sldMinutes = new JSlider(-15, 15, 0);
+        sldMinutes.setPaintLabels(true);
+        sldMinutes.setMajorTickSpacing(5);
+
         // Seconds slider
         lblSeconds = new JLabel();
-        sldSeconds = new JSlider(-60, 60, 0);        
-        sldSeconds.setPaintLabels(true);   
-        sldSeconds.setMajorTickSpacing(30);  
-        
+        sldSeconds = new JSlider(-60, 60, 0);
+        sldSeconds.setPaintLabels(true);
+        sldSeconds.setMajorTickSpacing(30);
+
         // Put everything together
         JPanel p = new JPanel(new GridBagLayout());
@@ -839 +839 @@
         p.add(lblSeconds, GBC.eol().fill());
         p.add(sldSeconds, GBC.eol().fill());
-        
+
         // If there's an error in the calculation the found values
         // will be off range for the sliders. Catch this error
@@ -849 +849 @@
         } catch(Exception e) {
             JOptionPane.showMessageDialog(Main.parent,
-                tr("An error occured while trying to match the photos to the GPX track."
+                tr("An error occurred while trying to match the photos to the GPX track."
                     +" You can adjust the sliders to manually match the photos."),
                 tr("Matching photos to track failed"),
                 JOptionPane.WARNING_MESSAGE);
         }
-        
+
         // Call the sliderListener once manually so labels get adjusted
         new sliderListener().stateChanged(null);
@@ -862 +862 @@
         sldMinutes.addChangeListener(new sliderListener());
         sldSeconds.addChangeListener(new sliderListener());
-        
+
         // There is no way to cancel this dialog, all changes get applied
         // immediately. Therefore "Close" is marked with an "OK" icon.
-        // Settings are only saved temporarily to the layer. 
+        // Settings are only saved temporarily to the layer.
         int answer = new ExtendedDialog(Main.parent,
             tr("Adjust timezone and offset"),
@@ -872 +872 @@
             new String[] { "ok.png", "dialogs/refresh.png"}
         ).getValue();
-        
+
         // User wants default values; discard old result and re-open dialog
         if(answer == 2) {
@@ -879 +879 @@
         }
     }
-    
+
     /**
      * Returns a list of images that fulfill the given criteria.
@@ -913 +913 @@
             }
         }
-        
+
         Collections.sort(dateImgLst, new Comparator<ImageEntry>() {
             public int compare(ImageEntry arg0, ImageEntry arg1) {
@@ -919 +919 @@
             }
         });
-        
+
         return dateImgLst;
     }
@@ -966 +966 @@
         // Time between the track point and the previous one, 5 sec if first point, i.e. photos take
         // 5 sec before the first track point can be assumed to be take at the starting position
-        long interval = prevDateWp > 0 ? ((int)Math.abs(curDateWp - prevDateWp)) : 5; 
+        long interval = prevDateWp > 0 ? ((int)Math.abs(curDateWp - prevDateWp)) : 5;
         int ret = 0;
-        
-        // i is the index of the timewise last photo that has the same or earlier EXIF time 
+
+        // i is the index of the timewise last photo that has the same or earlier EXIF time
         int i = getLastIndexOfListBefore(dateImgLst, curDateWp);
 
         // no photos match
-        if (i < 0)            
-            return 0;        
-            
+        if (i < 0)
+            return 0;
+
         Double speed = null;
         Double prevElevation = null;
         Double curElevation = null;
-        
+
         if (prevWp != null) {
             double distance = getDistance(prevWp, curWp);
             // This is in km/h, 3.6 * m/s
             if (curDateWp > prevDateWp)
-                speed = 3.6 * distance / (curDateWp - prevDateWp);   
+                speed = 3.6 * distance / (curDateWp - prevDateWp);
             try {
                 prevElevation = new Double((String) prevWp.attr.get("ele"));
             } catch(Exception e) {}
         }
-        
+
         try {
             curElevation = new Double((String) curWp.attr.get("ele"));
         } catch (Exception e) {}
-        
-        // First trackpoint, then interval is set to five seconds, i.e. photos up to five seconds 
-        // before the first point will be geotagged with the starting point        
+
+        // First trackpoint, then interval is set to five seconds, i.e. photos up to five seconds
+        // before the first point will be geotagged with the starting point
         if(prevDateWp == 0 || curDateWp <= prevDateWp) {
             while(i >= 0 && (dateImgLst.get(i).time.getTime()/1000) <= curDateWp
                         && (dateImgLst.get(i).time.getTime()/1000) >= (curDateWp - interval)) {
-                if(dateImgLst.get(i).coor == null) {               
+                if(dateImgLst.get(i).coor == null) {
                     dateImgLst.get(i).pos = curWp.eastNorth;
                     dateImgLst.get(i).coor = Main.proj.eastNorth2latlon(dateImgLst.get(i).pos);
@@ -1025 +1025 @@
                 dateImgLst.get(i).coor = Main.proj.eastNorth2latlon(dateImgLst.get(i).pos);
                 dateImgLst.get(i).speed = speed;
-            
+
                 if (curElevation != null && prevElevation != null)
                     dateImgLst.get(i).elevation = interpolate(prevElevation, curElevation, timeDiff);
-            
+
                 ret++;
             }
@@ -1046 +1046 @@
         if(lstSize == 0 || searchedDate < dateImgLst.get(0).time.getTime()/1000)
             return -1;
-            
+
         // The search period is later than the last photo
         if (searchedDate > dateImgLst.get(lstSize - 1).time.getTime() / 1000)
-            return lstSize-1;   
+            return lstSize-1;
 
         // The searched index is somewhere in the middle, do a binary search from the beginning
@@ -1055 +1055 @@
         int startIndex= 0;
         int endIndex= lstSize-1;
-        while (endIndex - startIndex > 1) {            
+        while (endIndex - startIndex > 1) {
             curIndex= (int) Math.round((double)(endIndex + startIndex)/2);
             if (searchedDate > dateImgLst.get(curIndex).time.getTime()/1000)
@@ -1064 +1064 @@
         if (searchedDate < dateImgLst.get(endIndex).time.getTime()/1000)
             return startIndex;
- 
-        // This final loop is to check if photos with the exact same EXIF time follows 
+
+        // This final loop is to check if photos with the exact same EXIF time follows
         while ((endIndex < (lstSize-1)) && (dateImgLst.get(endIndex).time.getTime()
                                                 == dateImgLst.get(endIndex + 1).time.getTime()))

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

@@ -496 +496 @@
         if (this.lambertZone != currentLambertZone) {
             JOptionPane.showMessageDialog(Main.parent, tr("Lambert zone {0} in cache "+
-                    " incompatible with current Lambert zone {1}",
+                    "incompatible with current Lambert zone {1}",
                     this.lambertZone+1, currentLambertZone), tr("Cache Lambert Zone Error"), JOptionPane.ERROR_MESSAGE);
             return false;

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java

@@ -94 +94 @@
     public OsbDialog(final OsbPlugin plugin) {
         super(tr("Open OpenStreetBugs"), "icon_error22",
-                tr("Open the OpenStreetBugs window and activate the automatic download"), Shortcut.registerShortcut(
+                tr("Opens the OpenStreetBugs window and activates the automatic download"), Shortcut.registerShortcut(
                         "view:openstreetbugs", tr("Toggle: {0}", tr("Open OpenStreetBugs")), KeyEvent.VK_O,
                         Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), 150);

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java

@@ -193 +193 @@
             DataSet.fireSelectionChanged(Main.ds.getSelected());
         } else
-            JOptionPane.showMessageDialog(Main.parent, tr("No intersections found. Nothing was changed."));
+            JOptionPane.showMessageDialog(Main.parent, tr("No intersection found. Nothing was changed."));
     }
 

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java

@@ -12 +12 @@
 
     /**
-     * 
+     *
      */
-    
+
 
     public Help_WMSmenuAction() {
         //super("Help / About");
         super(tr("help"), "help", tr("Help / About"), null, false);
-        
+
     }
-    
+
     public void actionPerformed(ActionEvent e) {
-        //todo - put this into a txt file? 
-          String helptext = 
+        //todo - put this into a txt file?
+          String helptext =
             tr("You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "  +
             "these will then show up in the WMS menu.\n\n"+
-            
+
             "You can also do this manually in the Advanced Preferences, using the following schema:\n"+
             "wmsplugin.url.1.name=Landsat\n"+
             "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"+
             "wmsplugin.url.2.name=NPE Maps... etc\n\n"+
-                    
+
             "Full WMS URL input format example (landsat)\n"+
             "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"+
-            "layers=global_mosaic&styles=&srs=EPSG:4326&\n"+
-            "format=image/jpeg \n\n"+
-            
+            "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n\n"+
+
             "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you only need to input the relevant 'id'.\n" +
-            "To add a Metacarta Map Rectifier menu item, manually create the URL like in this example," +
-            "replacing 73 with your image id: \n" +
+            "To add a Metacarta Map Rectifier menu item, manually create the URL like in this example, " +
+            "replacing 73 with your image id:\n" +
             "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +
-            "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +
-            " \n" +
+            "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n\n" +
+
             "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't use.");
-        
+
         JTextPane tp = new JTextPane();
           JScrollPane js = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                   JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-         
-          
+
+
           js.getViewport().add(tp);
           JFrame jf = new JFrame(tr("WMS Plugin Help"));
@@ -56 +55 @@
           jf.pack();
           jf.setSize(400,500);
-          jf.setVisible(true); 
+          jf.setVisible(true);
           tp.setText(helptext);
     }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java

@@ -1 @@
-package wmsplugin; 
+package wmsplugin;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -25 +25 @@
 
     public WMSAdjustAction(MapFrame mapFrame) {
-        super(tr("Adjust WMS"), "adjustwms", 
-                        tr("Adjust the position of the selected WMS layer"), mapFrame, 
+        super(tr("Adjust WMS"), "adjustwms",
+                        tr("Adjust the position of the selected WMS layer"), mapFrame,
                         ImageProvider.getCursor("normal", "move"));
     }
@@ -45 +45 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-        
+
         Layer layer=Main.map.mapView.getActiveLayer();
         if (layer.visible && layer instanceof WMSLayer) {
@@ -63 +63 @@
                     Main.map.mapView.getEastNorth(e.getX(),e.getY());
             selectedLayer.displace(
-                eastNorth.east()-prevEastNorth.east(), 
+                eastNorth.east()-prevEastNorth.east(),
                 eastNorth.north()-prevEastNorth.north()
             );
@@ -74 +74 @@
         Main.map.mapView.repaint();
         Main.map.mapView.setCursor(Cursor.getDefaultCursor());
-        selectedImage = null;   
+        selectedImage = null;
         prevEastNorth = null;
         selectedLayer = null;
@@ -88 +88 @@
     @Override public void mouseClicked(MouseEvent e) {
     }
-    
+
     // This only makes the buttons look disabled, but since no keyboard shortcut is
     // provided there aren't any other means to activate this tool