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

Timestamp:

2016-05-15T16:37:33+02:00 (10 years ago)

Author:

Don-vip

Message:

findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReader.java (modified) (2 diffs)
• OsmServerWriter.java (modified) (10 diffs)
• imagery/ImageryReader.java (modified) (3 diffs)

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

@@ -311 +311 @@
      */
     protected void fetchPrimitives(Set<Long> ids, OsmPrimitiveType type, ProgressMonitor progressMonitor) throws OsmTransferException {
-        String msg = "";
+        String msg;
         final String baseUrl = getBaseUrl();
         switch (type) {
@@ -317 +317 @@
             case WAY:      msg = tr("Fetching a package of ways from ''{0}''",      baseUrl); break;
             case RELATION: msg = tr("Fetching a package of relations from ''{0}''", baseUrl); break;
+            default: throw new AssertionError();
         }
         progressMonitor.setTicksCount(ids.size());

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

@@ -39 +39 @@
 
     private static volatile List<OsmServerWritePostprocessor> postprocessors;
+
+    /**
+     * Registers a post-processor.
+     * @param pp post-processor to register
+     */
     public static void registerPostprocessor(OsmServerWritePostprocessor pp) {
         if (postprocessors == null) {
@@ -46 +51 @@
     }
 
+    /**
+     * Unregisters a post-processor.
+     * @param pp post-processor to unregister
+     */
     public static void unregisterPostprocessor(OsmServerWritePostprocessor pp) {
         if (postprocessors != null) {
@@ -61 +70 @@
     private long uploadStartTime;
 
-    public String timeLeft(int progress, int listSize) {
+    protected String timeLeft(int progress, int listSize) {
         long now = System.currentTimeMillis();
         long elapsed = now - uploadStartTime;
@@ -93 +102 @@
             uploadStartTime = System.currentTimeMillis();
             for (OsmPrimitive osm : primitives) {
-                int progress = progressMonitor.getTicks();
-                String timeLeftStr = timeLeft(progress, primitives.size());
-                String msg = "";
+                String msg;
                 switch(OsmPrimitiveType.from(osm)) {
                 case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
                 case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
                 case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
+                default: throw new AssertionError();
                 }
+                int progress = progressMonitor.getTicks();
                 progressMonitor.subTask(
                         tr(msg,
@@ -106 +115 @@
                                 progress,
                                 primitives.size(),
-                                timeLeftStr,
-                                osm.getName() == null ? osm.getId() : osm.getName(),
-                                        osm.getId()));
+                                timeLeft(progress, primitives.size()),
+                                osm.getName() == null ? osm.getId() : osm.getName(), osm.getId()));
                 makeApiRequest(osm, progressMonitor);
                 processed.add(osm);
@@ -134 +142 @@
             progressMonitor.beginTask(tr("Starting to upload in one request ..."));
             processed.addAll(api.uploadDiff(primitives, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
-        } catch (OsmTransferException e) {
-            throw e;
         } finally {
             progressMonitor.finishTask();
@@ -151 +157 @@
      */
     protected void uploadChangesInChunks(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor, int chunkSize)
-            throws OsmTransferException, IllegalArgumentException {
+            throws OsmTransferException {
         if (chunkSize <= 0)
             throw new IllegalArgumentException(tr("Value >0 expected for parameter ''{0}'', got {1}", "chunkSize", chunkSize));
@@ -176 +182 @@
                 processed.addAll(api.uploadDiff(chunk, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
             }
-        } catch (OsmTransferException e) {
-            throw e;
         } finally {
             progressMonitor.finishTask();
@@ -223 +227 @@
                 break;
             }
-        } catch (OsmTransferException e) {
-            throw e;
         } finally {
             executePostprocessors(monitor);
@@ -242 +244 @@
     }
 
+    /**
+     * Cancel operation.
+     */
     public void cancel() {
         this.canceled = true;

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -54 +54 @@
     }
 
+    /**
+     * Constructs a {@code ImageryReader} from a given filename, URL or internal resource.
+     *
+     * @param source can be:<ul>
+     *  <li>relative or absolute file name</li>
+     *  <li>{@code file:///SOME/FILE} the same as above</li>
+     *  <li>{@code http://...} a URL. It will be cached on disk.</li>
+     *  <li>{@code resource://SOME/FILE} file from the classpath (usually in the current *.jar)</li>
+     *  <li>{@code josmdir://SOME/FILE} file inside josm user data directory (since r7058)</li>
+     *  <li>{@code josmplugindir://SOME/FILE} file inside josm plugin directory (since r7834)</li></ul>
+     */
     public ImageryReader(String source) {
         this.source = source;
     }
 
+    /**
+     * Parses imagery source.
+     * @return list of imagery info
+     * @throws SAXException if any SAX error occurs
+     * @throws IOException if any I/O error occurs
+     */
     public List<ImageryInfo> parse() throws SAXException, IOException {
         Parser parser = new Parser();
@@ -328 +345 @@
                         }
                         break;
+                    default: // Do nothing
                     }
                 }
@@ -456 +474 @@
                 projections = null;
                 break;
-            /* nothing to do for these or the unknown type:
             case NO_TILE:
             case NO_TILESUM:
             case METADATA:
             case UNKNOWN:
-                break;
-            */
+            default:
+                // nothing to do for these or the unknown type
             }
         }