Changeset 4330 in josm

Timestamp:

Aug 21, 2011 5:53:28 PM (22 months ago)

Author:

hansendc

Message:

renane TileSet.allTiles()

The previous bug with paintAllImages() shows that allTiles() is
badly named. It really has two incarnations: one that creates
tiles and one that does not. Make this clear in the function
names, and do not epose allTiles(bool) any longer.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -827 +827 @@
         List<Tile> missedTiles = new LinkedList<Tile>();
         // The callers of this code *require* that we return any tiles
-        // that we do not draw in missedTiles.  ts.allTiles() by default
-        // will only return already-existing tiles.  However, we need
-        // to return *all* tiles to the callers, so force creation here.
+        // that we do not draw in missedTiles.  ts.allExistingTiles() by
+        // default will only return already-existing tiles.  However, we
+        // need to return *all* tiles to the callers, so force creation
+        // here.
         boolean forceTileCreation = true;
-        for (Tile tile : ts.allTiles(forceTileCreation)) {
+        for (Tile tile : ts.allTilesCreate()) {
             Image img = getLoadedTileImage(tile);
             if (img == null || tile.hasError()) {
@@ -1012 +1013 @@
          * already in the tileCache.
          */
-        List<Tile> allTiles()
+        List<Tile> allExistingTiles()
         {
-            return this.allTiles(false);
-        }
-        private List<Tile> allTiles(boolean create)
+            return this.__allTiles(false);
+        }
+        List<Tile> allTilesCreate()
+        {
+            return this.__allTiles(true);
+        }
+        private List<Tile> __allTiles(boolean create)
         {
             // Tileset is either empty or too large
@@ -1040 +1045 @@
         {
             List<Tile> ret = new ArrayList<Tile>();
-            for (Tile t : this.allTiles()) {
+            for (Tile t : this.allExistingTiles()) {
                 if (t.isLoaded())
                     ret.add(t);
@@ -1051 +1056 @@
             if (!autoLoad && !force)
                 return;
-            for (Tile t : this.allTiles(true)) {
+            for (Tile t : this.allTilesCreate()) {
                 loadTile(t, false);
             }
@@ -1060 +1065 @@
             if (!autoLoad && !force)
                 return;
-            for (Tile t : this.allTiles(true)) {
+            for (Tile t : this.allTilesCreate()) {
                 if (t.hasError()) {
                     loadTile(t, true);
@@ -1076 +1081 @@
 
     private static TileSetInfo getTileSetInfo(TileSet ts) {
-        List<Tile> allTiles = ts.allTiles();
+        List<Tile> allTiles = ts.allExistingTiles();
         TileSetInfo result = new TileSetInfo();
         result.hasLoadingTiles = allTiles.size() < ts.size();
@@ -1252 +1257 @@
         // The current zoom tileset is guaranteed to have all of
         // its tiles
-        for (Tile t : ts.allTiles()) {
+        for (Tile t : ts.allExistingTiles()) {
             this.paintTileText(ts, t, g, mv, displayZoomLevel, t);
         }
@@ -1340 +1345 @@
         }
         Tile clickedTile = null;
-        for (Tile t1 : ts.allTiles()) {
+        for (Tile t1 : ts.allExistingTiles()) {
             Tile t2 = tempCornerTile(t1);
             Rectangle r = new Rectangle(pixelPos(t1));