Index: applications/editors/josm/plugins/livegps/.checkstyle =================================================================== --- applications/editors/josm/plugins/livegps/.checkstyle (revision 33078) +++ applications/editors/josm/plugins/livegps/.checkstyle (revision 33078) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/livegps/.project =================================================================== --- applications/editors/josm/plugins/livegps/.project (revision 33077) +++ applications/editors/josm/plugins/livegps/.project (revision 33078) @@ -16,7 +16,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java =================================================================== --- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java (revision 33077) +++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java (revision 33078) @@ -129,9 +129,9 @@ connect(); } catch (IOException iox) { - fireGpsStatusChangeEvent( LiveGpsStatus.GpsStatus.CONNECTION_FAILED, tr("Connection Failed")); + fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTION_FAILED, tr("Connection Failed")); try { Thread.sleep(1000); } catch (InterruptedException ignore) { - + Main.trace(ignore); } } @@ -191,5 +191,5 @@ Main.info("LiveGps: trying to connect to gpsd at " + gpsdHost + ":" + gpsdPort); - fireGpsStatusChangeEvent( LiveGpsStatus.GpsStatus.CONNECTING, tr("Connecting")); + fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTING, tr("Connecting")); InetAddress[] addrs = InetAddress.getAllByName(gpsdHost); @@ -210,5 +210,5 @@ * First emit the "w" symbol. The older version will activate, the newer one will ignore it. */ - gpsdSocket.getOutputStream().write(new byte[] { 'w', 13, 10 }); + gpsdSocket.getOutputStream().write(new byte[] {'w', 13, 10}); gpsdReader = new BufferedReader(new InputStreamReader(gpsdSocket.getInputStream(), StandardCharsets.UTF_8)); @@ -287,11 +287,11 @@ if (speedJson != null) - speed = (float )speedJson.doubleValue(); + speed = (float) speedJson.doubleValue(); if (trackJson != null) - course = (float )trackJson.doubleValue(); + course = (float) trackJson.doubleValue(); if (epxJson != null) - epx = (float )epxJson.doubleValue(); + epx = (float) epxJson.doubleValue(); if (epyJson != null) - epy = (float )epyJson.doubleValue(); + epy = (float) epyJson.doubleValue(); return new LiveGpsData(lat, lon, course, speed, epx, epy); @@ -299,5 +299,5 @@ private LiveGpsData ParseOld(String line) { - String words[]; + String[] words; double lat = 0; double lon = 0; Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsData.java =================================================================== --- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsData.java (revision 33077) +++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsData.java (revision 33078) @@ -24,13 +24,5 @@ private Way way; - /** - * @param latitude - * @param longitude - * @param course - * @param speed - * @param haveFix - */ public LiveGpsData(double latitude, double longitude, float course, float speed) { - super(); this.fix = true; this.latLon = new LatLon(latitude, longitude); @@ -38,15 +30,6 @@ this.speed = speed; } - /** - * @param latitude - * @param longitude - * @param course - * @param speed - * @param haveFix - * @param epx - * @param epy - */ + public LiveGpsData(double latitude, double longitude, float course, float speed, float epx, float epy) { - super(); this.fix = true; this.latLon = new LatLon(latitude, longitude); @@ -63,4 +46,5 @@ return this.course; } + /** * @param course the course to set @@ -69,4 +53,5 @@ this.course = course; } + /** * @return the haveFix @@ -75,4 +60,5 @@ return this.fix; } + /** * @param haveFix the haveFix to set @@ -81,4 +67,5 @@ this.fix = haveFix; } + /** * @return the latitude @@ -87,4 +74,5 @@ return this.latLon.lat(); } + /** * @return the longitude @@ -93,4 +81,5 @@ return this.latLon.lon(); } + /** * @return the speed in metres per second! @@ -99,4 +88,5 @@ return this.speed; } + /** * @param speed the speed to set @@ -113,7 +103,4 @@ } - /** - * @param latLon - */ public void setLatLon(LatLon latLon) { this.latLon = latLon; Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java =================================================================== --- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java (revision 33077) +++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java (revision 33078) @@ -34,11 +34,4 @@ private LiveGpsData data; - /** - * @param name - * @param iconName - * @param tooltip - * @param shortcut - * @param preferredHeight - */ public LiveGpsDialog(final MapFrame mapFrame) { super(tr("Live GPS"), "livegps", tr("Show GPS data."), @@ -46,5 +39,5 @@ KeyEvent.VK_G, Shortcut.ALT_CTRL_SHIFT), 100); panel = new JPanel(); - panel.setLayout(new GridLayout(6,2)); + panel.setLayout(new GridLayout(6, 2)); panel.add(new JLabel(tr("Status"))); panel.add(statusLabel = new JLabel()); @@ -94,5 +87,5 @@ panel.setBackground(Color.RED); } - }}); + } }); } else if ("gpsstatus".equals(evt.getPropertyName())) { status = (LiveGpsStatus) evt.getNewValue(); @@ -107,5 +100,5 @@ panel.setBackground(Color.WHITE); } - }}); + } }); } } Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java =================================================================== --- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java (revision 33077) +++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java (revision 33078) @@ -32,6 +32,8 @@ public static final String C_LIVEGPS_COLOR_POSITION_ESTIMATE = "color.livegps.position_estimate"; - private static final CachingProperty COLOR_POSITION = new ColorProperty(C_LIVEGPS_COLOR_POSITION_ESTIMATE, Color.RED).cached(); - private static final CachingProperty COLOR_POSITION_ESTIMATE = new ColorProperty(C_LIVEGPS_COLOR_POSITION_ESTIMATE, Color.CYAN).cached(); + private static final CachingProperty COLOR_POSITION = + new ColorProperty(C_LIVEGPS_COLOR_POSITION_ESTIMATE, Color.RED).cached(); + private static final CachingProperty COLOR_POSITION_ESTIMATE = + new ColorProperty(C_LIVEGPS_COLOR_POSITION_ESTIMATE, Color.CYAN).cached(); private static final int DEFAULT_REFRESH_INTERVAL = 250; @@ -98,5 +100,5 @@ long current = date.getTime(); - rv.grow(-(int)(rv.getHeight() * centerFactor), -(int)(rv.getWidth() * centerFactor)); + rv.grow(-(int) (rv.getHeight() * centerFactor), -(int) (rv.getWidth() * centerFactor)); if (!rv.contains(P) || (centerInterval > 0 && current - lastCenter >= centerInterval)) { @@ -132,6 +134,6 @@ double ppm = 100 / mv.getDist100Pixel(); /* pixels per metre */ - w = (int )Math.round(lastData.getEpx() * ppm); - h = (int )Math.round(lastData.getEpy() * ppm); + w = (int) Math.round(lastData.getEpx() * ppm); + h = (int) Math.round(lastData.getEpy() * ppm); if (w > TriaWidth || h > TriaWidth) { @@ -147,10 +149,10 @@ int[] y = new int[4]; float course = lastData.getCourse(); - float csin = (float )Math.sin(Math.toRadians(course)); - float ccos = (float )Math.cos(Math.toRadians(course)); - float csin120 = (float )Math.sin(Math.toRadians(course + 120)); - float ccos120 = (float )Math.cos(Math.toRadians(course + 120)); - float csin240 = (float )Math.sin(Math.toRadians(course + 240)); - float ccos240 = (float )Math.cos(Math.toRadians(course + 240)); + float csin = (float) Math.sin(Math.toRadians(course)); + float ccos = (float) Math.cos(Math.toRadians(course)); + float csin120 = (float) Math.sin(Math.toRadians(course + 120)); + float ccos120 = (float) Math.cos(Math.toRadians(course + 120)); + float csin240 = (float) Math.sin(Math.toRadians(course + 240)); + float ccos240 = (float) Math.cos(Math.toRadians(course + 240)); g.setColor(COLOR_POSITION.get()); @@ -223,5 +225,5 @@ Main.pref.putInteger(C_REFRESH_INTERVAL, refreshInterval); Main.pref.putInteger(C_CENTER_INTERVAL, centerInterval); - Main.pref.putInteger(C_CENTER_FACTOR, (int )centerFactor); + Main.pref.putInteger(C_CENTER_FACTOR, (int) centerFactor); /* Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java =================================================================== --- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java (revision 33077) +++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java (revision 33078) @@ -180,6 +180,7 @@ acquirer.addPropertyChangeListener(lgpslayer); acquirer.addPropertyChangeListener(lgpsdialog); - for (PropertyChangeListener listener : listenerQueue) + for (PropertyChangeListener listener : listenerQueue) { acquirer.addPropertyChangeListener(listener); + } acquirerThread.start(); Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsStatus.java =================================================================== --- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsStatus.java (revision 33077) +++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsStatus.java (revision 33078) @@ -7,12 +7,11 @@ */ public class LiveGpsStatus { - public enum GpsStatus {CONNECTING, CONNECTED, DISCONNECTED, CONNECTION_FAILED}; + public enum GpsStatus { + CONNECTING, CONNECTED, DISCONNECTED, CONNECTION_FAILED + } + private String statusMessage; private GpsStatus status; - /** - * @param status - * @param statusMessage - */ public LiveGpsStatus(GpsStatus status, String statusMessage) { super(); @@ -20,5 +19,6 @@ this.statusMessage = statusMessage; } -/** + + /** * @return the status */ @@ -26,4 +26,5 @@ return this.status; } + /** * @param status the status to set @@ -32,4 +33,5 @@ this.status = status; } + /** * @return the statusMessage @@ -38,4 +40,5 @@ return this.statusMessage; } + /** * @param statusMessage the statusMessage to set