Changeset 29769 in osm for applications/editors/josm/plugins/livegps
- Timestamp:
- 2013-07-24T18:01:58+02:00 (11 years ago)
- Location:
- applications/editors/josm/plugins/livegps
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/livegps/src/livegps/AppendableGpxTrackSegment.java
r23191 r29769 19 19 private double length; 20 20 21 @Override 21 22 public Bounds getBounds() { 22 23 return bounds; 23 24 } 24 25 26 @Override 25 27 public Collection<WayPoint> getWayPoints() { 26 28 return new CopyList<WayPoint>(wayPoints, size); … … 51 53 } 52 54 55 @Override 53 56 public double length() { 54 57 return length; -
applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java
r27021 r29769 3 3 import static org.openstreetmap.josm.tools.I18n.tr; 4 4 5 import java.lang.Float;6 5 7 6 import java.beans.PropertyChangeEvent; … … 16 15 17 16 import org.openstreetmap.josm.Main; 18 import org.openstreetmap.josm.data.coor.LatLon;19 17 20 18 import org.json.JSONObject; … … 118 116 } 119 117 118 @Override 120 119 public void run() { 121 120 LiveGpsData oldGpsData = null; … … 133 132 Thread.sleep(1000); 134 133 } catch (InterruptedException ignore) {} 135 } ;134 } 136 135 } 137 136 … … 167 166 try { 168 167 Thread.sleep(1000); 169 } catch (InterruptedException ignore) {} ;168 } catch (InterruptedException ignore) {} 170 169 // send warning to layer 171 170 } … … 235 234 Watch.put("enable", true); 236 235 Watch.put("json", true); 237 } catch (JSONException je) {} ;236 } catch (JSONException je) {} 238 237 239 238 String Request = "?WATCH=" + Watch.toString() + ";\n"; -
applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java
r27852 r29769 6 6 import static org.openstreetmap.josm.tools.I18n.tr; 7 7 8 import java.awt.BorderLayout;9 8 import java.awt.Color; 10 9 import java.awt.GridLayout; … … 15 14 import javax.swing.JLabel; 16 15 import javax.swing.JPanel; 17 import javax.swing.JScrollPane;18 16 19 17 import org.openstreetmap.josm.gui.MapFrame; -
applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java
r27852 r29769 52 52 } 53 53 54 @Override 54 55 public void actionPerformed(ActionEvent e) { 55 56 enableTracking(lgpscapture.isSelected()); … … 66 67 } 67 68 69 @Override 68 70 public void actionPerformed(ActionEvent e) { 69 71 if (lgpslayer != null) { … … 84 86 } 85 87 88 @Override 86 89 public void actionPerformed(ActionEvent e) { 87 90 if (lgpslayer != null) { … … 91 94 } 92 95 96 @Override 93 97 public void activeLayerChange(Layer oldLayer, Layer newLayer) { 94 98 } 95 99 100 @Override 96 101 public void layerAdded(Layer newLayer) { 97 102 } 98 103 104 @Override 99 105 public void layerRemoved(Layer oldLayer) { 100 106 if (oldLayer != lgpslayer) … … 110 116 super(info); 111 117 MainMenu menu = Main.main.menu; 112 lgpsmenu = menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G, 113 menu.defaultMenuPos, ht("/Plugin/LiveGPS")); 114 118 boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082; 119 lgpsmenu = oldMenu ? 120 menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G, menu.defaultMenuPos, ht("/Plugin/LiveGPS")) 121 : menu.gpsMenu; 122 if (lgpsmenu.getItemCount()>0) { 123 lgpsmenu.addSeparator(); 124 } 125 115 126 JosmAction captureAction = new CaptureAction(); 116 127 lgpscapture = new JCheckBoxMenuItem(captureAction); -
applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java
r29222 r29769 20 20 21 21 22 @Override 22 23 public Map<String, Object> getAttributes() { 23 24 return attr; 24 25 } 25 26 27 @Override 26 28 public Bounds getBounds() { 27 29 return trackSegment.getBounds(); 28 30 } 29 31 32 @Override 30 33 public Collection<GpxTrackSegment> getSegments() { 31 34 return Collections.singleton(trackSegment); 32 35 } 33 36 37 @Override 34 38 public double length() { 35 39 return trackSegment.length();
Note:
See TracChangeset
for help on using the changeset viewer.