Changeset 10001 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-03-17T01:50:12+01:00 (10 years ago)

Author:

Don-vip

Message:

sonar - Local variable and method parameter names should comply with a naming convention

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• NmeaReader.java (modified) (1 diff)
• OsmChangesetParser.java (modified) (2 diffs)
• OsmServerWriter.java (modified) (4 diffs)
• remotecontrol/RequestProcessor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -173 +173 @@
         try (BufferedReader rd = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8))) {
             StringBuilder sb = new StringBuilder(1024);
-            int loopstart_char = rd.read();
+            int loopstartChar = rd.read();
             ps = new NMEAParserState();
-            if (loopstart_char == -1)
+            if (loopstartChar == -1)
                 //TODO tell user about the problem?
                 return;
-            sb.append((char) loopstart_char);
+            sb.append((char) loopstartChar);
             ps.pDate = "010100"; // TODO date problem
             while (true) {

trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

@@ -119 +119 @@
 
             // -- min_lon and min_lat
-            String min_lon = atts.getValue("min_lon");
-            String min_lat = atts.getValue("min_lat");
-            String max_lon = atts.getValue("max_lon");
-            String max_lat = atts.getValue("max_lat");
-            if (min_lon != null && min_lat != null && max_lon != null && max_lat != null) {
+            String minLonStr = atts.getValue("min_lon");
+            String minLatStr = atts.getValue("min_lat");
+            String maxLonStr = atts.getValue("max_lon");
+            String maxLatStr = atts.getValue("max_lat");
+            if (minLonStr != null && minLatStr != null && maxLonStr != null && maxLatStr != null) {
                 double minLon = 0;
                 try {
-                    minLon = Double.parseDouble(min_lon);
-                } catch (NumberFormatException e) {
-                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lon", min_lon));
+                    minLon = Double.parseDouble(minLonStr);
+                } catch (NumberFormatException e) {
+                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lon", minLonStr));
                 }
                 double minLat = 0;
                 try {
-                    minLat = Double.parseDouble(min_lat);
-                } catch (NumberFormatException e) {
-                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lat", min_lat));
+                    minLat = Double.parseDouble(minLatStr);
+                } catch (NumberFormatException e) {
+                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lat", minLatStr));
                 }
                 current.setMin(new LatLon(minLat, minLon));
@@ -142 +142 @@
                 double maxLon = 0;
                 try {
-                    maxLon = Double.parseDouble(max_lon);
-                } catch (NumberFormatException e) {
-                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lon", max_lon));
+                    maxLon = Double.parseDouble(maxLonStr);
+                } catch (NumberFormatException e) {
+                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lon", maxLonStr));
                 }
                 double maxLat = 0;
                 try {
-                    maxLat = Double.parseDouble(max_lat);
-                } catch (NumberFormatException e) {
-                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", max_lat));
+                    maxLat = Double.parseDouble(maxLatStr);
+                } catch (NumberFormatException e) {
+                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", maxLatStr));
                 }
                 current.setMax(new LatLon(maxLon, maxLat));

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -61 +61 @@
     private long uploadStartTime;
 
-    public String timeLeft(int progress, int list_size) {
+    public String timeLeft(int progress, int listSize) {
         long now = System.currentTimeMillis();
         long elapsed = now - uploadStartTime;
@@ -67 +67 @@
             elapsed = 1;
         }
-        double uploads_per_ms = (double) progress / elapsed;
-        double uploads_left = list_size - progress;
-        long ms_left = (long) (uploads_left / uploads_per_ms);
-        long minutes_left = ms_left / MSECS_PER_MINUTE;
-        long seconds_left = (ms_left / MSECS_PER_SECOND) % SECONDS_PER_MINUTE;
-        StringBuilder time_left_str = new StringBuilder().append(minutes_left).append(':');
-        if (seconds_left < 10) {
-            time_left_str.append('0');
-        }
-        return time_left_str.append(seconds_left).toString();
+        double uploadsPerMs = (double) progress / elapsed;
+        double uploadsLeft = listSize - progress;
+        long msLeft = (long) (uploadsLeft / uploadsPerMs);
+        long minutesLeft = msLeft / MSECS_PER_MINUTE;
+        long secondsLeft = (msLeft / MSECS_PER_SECOND) % SECONDS_PER_MINUTE;
+        StringBuilder timeLeftStr = new StringBuilder().append(minutesLeft).append(':');
+        if (secondsLeft < 10) {
+            timeLeftStr.append('0');
+        }
+        return timeLeftStr.append(secondsLeft).toString();
     }
 
@@ -94 +94 @@
             for (OsmPrimitive osm : primitives) {
                 int progress = progressMonitor.getTicks();
-                String time_left_str = timeLeft(progress, primitives.size());
+                String timeLeftStr = timeLeft(progress, primitives.size());
                 String msg = "";
                 switch(OsmPrimitiveType.from(osm)) {
@@ -106 +106 @@
                                 progress,
                                 primitives.size(),
-                                time_left_str,
+                                timeLeftStr,
                                 osm.getName() == null ? osm.getId() : osm.getName(),
                                         osm.getId()));

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -177 +177 @@
 
             Map<String, String> headers = new HashMap<>();
-            int k = 0, MAX_HEADERS = 20;
-            while (k < MAX_HEADERS) {
+            int k = 0;
+            int maxHeaders = 20;
+            while (k < maxHeaders) {
                 get = in.readLine();
                 if (get == null) break;