Changeset 349

Timestamp:

08/22/08 20:54:29 (3 months ago)

Author:

arneke

Message:

Fixes minor issue where FilePathKey?2 would generate 012 and 011 for 12 and 11 respectively, when order was 2 to begin with.

Location:

trunk/geowebcache/src

Files:

• main/java/org/geowebcache/cache/file/FilePathKey2.java (modified) (1 diff)
• test/java/org/geowebcache/cache/file/FilePathKey2Test.java (modified) (1 diff)

trunk/geowebcache/src/main/java/org/geowebcache/cache/file/FilePathKey2.java

@@ -86 +86 @@
 
         if (number > 9) {
-            numberOrder = (int) Math.ceil(Math.log10(number) - 0.1);
+            if(number > 11) {
+                numberOrder = (int) Math.ceil(Math.log10(number) - 0.01);
+            } else {
+                numberOrder = 2;
+            }
         }
 

trunk/geowebcache/src/test/java/org/geowebcache/cache/file/FilePathKey2Test.java

@@ -26 +26 @@
         actual = FilePathKey2.zeroPadder(1, 3);
         this.assertEquals("001", actual);
+        
+        actual = FilePathKey2.zeroPadder(12, 2);
+        this.assertEquals("12", actual);
+
+        actual = FilePathKey2.zeroPadder(11, 2);
+        this.assertEquals("11", actual);
+        
+        actual = FilePathKey2.zeroPadder(10, 2);
+        this.assertEquals("10", actual);
         
         actual = FilePathKey2.zeroPadder(100, 2);