Changeset 8509 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2015-06-20T14:36:00+02:00 (9 years ago)

Author:

Don-vip

Message:

fix many checkstyle violations

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• Shape.java (modified) (1 diff)
• TMSCachedTileLoader.java (modified) (1 diff)
• WmsCache.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/Shape.java

@@ -27 +27 @@
         String[] components = asString.split(separator);
         if (components.length % 2 != 0)
-            throw new IllegalArgumentException(MessageFormat.format("Even number of doubles expected in string, got {0}: {1}", components.length, asString));
+            throw new IllegalArgumentException(MessageFormat.format("Even number of doubles expected in string, got {0}: {1}",
+                    components.length, asString));
         for (int i=0; i<components.length; i+=2) {
             addPoint(components[i], components[i+1]);

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

@@ -80 +80 @@
      * @throws IOException      when cache initialization fails
      */
-    public TMSCachedTileLoader(TileLoaderListener listener, String name, int connectTimeout, int readTimeout, Map<String, String> headers, String cacheDir) throws IOException {
+    public TMSCachedTileLoader(TileLoaderListener listener, String name, int connectTimeout, int readTimeout,
+            Map<String, String> headers, String cacheDir) throws IOException {
         this.cache = JCSCacheManager.getCache(name,
                 200, // use fairly small memory cache, as cached objects are quite big, as they contain BufferedImages

trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

@@ -98 +98 @@
     private int totalFileSize;
     private boolean totalFileSizeDirty; // Some file was missing - size needs to be recalculated
-    // No need for hashCode/equals on CacheEntry, object identity is enough. Comparing by values can lead to error - CacheEntry for wrong projection could be found
+    // No need for hashCode/equals on CacheEntry, object identity is enough.
+    // Comparing by values can lead to error - CacheEntry for wrong projection could be found
     private Map<CacheEntry, SoftReference<BufferedImage>> memoryCache = new HashMap<>();
     private Set<ProjectionBounds> areaToCache;
@@ -458 +459 @@
     }
 
-    private String generateFileName(ProjectionEntries projectionEntries, double pixelPerDegree, Projection projection, double east, double north, String mimeType) {
+    private String generateFileName(ProjectionEntries projectionEntries, double pixelPerDegree, Projection projection,
+            double east, double north, String mimeType) {
         LatLon ll1 = projection.eastNorth2latlon(new EastNorth(east, north));
         LatLon ll2 = projection.eastNorth2latlon(new EastNorth(east + 100 / pixelPerDegree, north));
@@ -490 +492 @@
         FILENAME_LOOP:
             while (true) {
-                String result = String.format("%s_%." + precisionLat + "f_%." + precisionLon +"f%s.%s", zoom, ll1.lat(), ll1.lon(), counter==0?"":"_" + counter, extension);
+                String result = String.format("%s_%." + precisionLat + "f_%." + precisionLon +"f%s.%s",
+                        zoom, ll1.lat(), ll1.lon(), counter==0?"":"_" + counter, extension);
                 for (CacheEntry entry: projectionEntries.entries) {
                     if (entry.filename.equals(result)) {
@@ -511 +514 @@
      * @throws IOException if any I/O error occurs
      */
-    public synchronized void saveToCache(BufferedImage img, InputStream imageData, Projection projection, double pixelPerDegree, double east, double north)
-            throws IOException {
+    public synchronized void saveToCache(BufferedImage img, InputStream imageData, Projection projection, double pixelPerDegree,
+            double east, double north) throws IOException {
         ProjectionEntries projectionEntries = getProjectionEntries(projection);
         CacheEntry entry = findEntry(projectionEntries, pixelPerDegree, east, north);