Changeset 214

Timestamp:

05/12/08 14:52:50 (5 years ago)

Author:

seb

Message:

store tar index in idx file after first read. removed system.out

Location:

bbtracker/branches/map/src/org/bbtracker/mobile

Files:

• config/ConfigFile.java (modified) (1 diff)
• gui/MapBackground.java (modified) (16 diffs)

bbtracker/branches/map/src/org/bbtracker/mobile/config/ConfigFile.java

@@ -137 +137 @@
                 FileConnection connection = 
                         (FileConnection) Connector.open(url, Connector.WRITE);
-                OutputStream out = connection.openOutputStream();
-                OutputStreamWriter writer = new OutputStreamWriter(out);
-
-                Enumeration keys = params.keys();
-                Enumeration values = params.elements();
-                while (keys.hasMoreElements()) {
-                        String key = (String) keys.nextElement();
-                        String value = (String) values.nextElement();
-                        
-                        writer.write(key);
-                        writer.write(' ');
-                        writer.write(value);
-                        writer.write('\n');
-                }
-                writer.close();
-                out.close();
-                connection.close();
+                try {
+                        OutputStream out = connection.openOutputStream();
+                        OutputStreamWriter writer = new OutputStreamWriter(out);
+
+                        try {
+                                Enumeration keys = params.keys();
+                                Enumeration values = params.elements();
+                                while (keys.hasMoreElements()) {
+                                        String key = (String) keys.nextElement();
+                                        String value = (String) values.nextElement();
+
+                                        writer.write(key);
+                                        writer.write(' ');
+                                        writer.write(value);
+                                        writer.write('\n');
+                                }
+                        } finally {
+                                writer.close();
+                                out.close();
+                        }
+                } finally {
+                        connection.close();
+                }
         }
         

bbtracker/branches/map/src/org/bbtracker/mobile/gui/MapBackground.java

@@ -19 +19 @@
 
 import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -93 +95 @@
         /** Constant for loading progress state. */
         private static final int STATE_DONE = 2;
+
+        /** Constant for loading progress state. */
+        private static final int STATE_ERROR = 3;
         
         /** Filename. */
@@ -149 +154 @@
         
         /** Index in tar file. */
-        private long[] tarFileIndex;
+        private int[] tarFileIndex;
 
         /** Index in tar file. */
@@ -283 +288 @@
                                 if (Math.abs(self.scaleX - googleScale) 
                                                 < googleScale / percent) {
-                                        System.out.println("Using rounded google scale.");
                                         self.scaleX = googleScale;
                                         break;
@@ -333 +337 @@
                         paintLoadingProgress(g);
                 }
+                paintMemoryStatus(g);
                 
                 g.setColor(POSITION_COLOR);
@@ -363 +368 @@
                         (int) ((normalisedPixelLat - normalisedPixelLatOffset) * scaleY) 
                         + centerOffsetY;
-                System.out.println("Offset: " + offX + "," + offY 
-                                + "max: " + maxTileX + ", " + maxTileY);
                 boolean missingImage = false;
 
@@ -373 +376 @@
                                         int startY = offY + y;
                                         if (startY < height && startY + tileHeight > 0) {
-                                                System.out.println("Found tile.");
                                                 Image img = getTileImage(x, y);
                                                 if (img != null) {
@@ -395 +397 @@
         }
         
+        /**
+         * Paint memory status.
+         * 
+         * @param g graphic object
+         */
+        private static void paintMemoryStatus(Graphics g) {
+                g.setColor(PROGRESS_BACKGROUND_COLOR);
+                 
+                final long totalMemory = Runtime.getRuntime().totalMemory();
+                final long freeMemory  = Runtime.getRuntime().freeMemory();
+                final int barX = (int) (PROGRESS_BAR_WIDTH * freeMemory / totalMemory);
+                g.fillRect(0, PROGRESS_BAR_HEIGHT, barX, PROGRESS_BAR_HEIGHT);
+                g.setColor(PROGRESS_DONE_COLOR);
+                g.fillRect(barX, PROGRESS_BAR_HEIGHT, 
+                                PROGRESS_BAR_WIDTH - barX, PROGRESS_BAR_HEIGHT);
+                g.setColor(PROGRESS_TEXT_COLOR);
+                StringBuffer state = new StringBuffer();
+                state.append(freeMemory);
+                state.append('/');
+                state.append(totalMemory);
+                g.drawString(state.toString(), 
+                                PROGRESS_TEXT_POSITION_X, 
+                                PROGRESS_TEXT_POSITION_Y + PROGRESS_BAR_HEIGHT, 
+                                Graphics.TOP | Graphics.LEFT);
+        }
+
         /**
          * Paint progress bar.
@@ -421 +449 @@
                         state.append("Reading");
                         break;
+                case STATE_DONE:
+                        state.append("Done");
+                        break;
                 default:
                         state.append("Error");
@@ -476 +507 @@
                         repaint();
                 } catch (Throwable e) {
+                        queueState = STATE_ERROR;
                         Log.log(this, e, "loading Map Tile " + tile.fileNumber);
                 } finally {
@@ -499 +531 @@
                                 }
                         } else {
-                                if (!in.markSupported()) {
+                                if (in != null && !in.markSupported()) {
                                         closeTarInputStream();
                                 }
@@ -523 +555 @@
                                 }
                                 if (tarFileIndex == null) {
-                                        readFileIndex(is);
-                                        if (markSupported) {
-                                                is.reset();
-                                        } else {
-                                                closeTarInputStream();
-                                                is = openTarFileInputStream();
+                                        readTarFileIndex();
+                                        if (tarFileIndex == null) {
+                                                readFileIndex(is);
+                                                if (markSupported) {
+                                                        is.reset();
+                                                } else {
+                                                        closeTarInputStream();
+                                                        is = openTarFileInputStream();
+                                                }
+                                                storeTarFileIndex();
                                         }
                                 }
@@ -546 +582 @@
                 }
 
-                if (is != null) {
+                if (is != null && tarFileIndex != null) {
                         try {
                                 if (markSupported) {
@@ -582 +618 @@
                 return is;
         }
-        
+
+        /**
+         * store tar file index.
+         * 
+         * @throws IOException io error
+         */
+        private void storeTarFileIndex() throws IOException {
+                FileConnection file = 
+                        (FileConnection) Connector.open(
+                                        "file:///" + tarFileDirectory + getTarIndexFileName(), 
+                                        Connector.WRITE);
+                try {
+                        DataOutputStream out = file.openDataOutputStream();
+
+                        try {
+                                out.writeInt(tarFileIndex.length);
+                                for (int i = 0; i < tarFileIndex.length; i++) {
+                                        out.writeInt(tarFileIndex[i]);
+                                        out.writeInt(tarFileSize[i]);
+                                }
+                        } finally {
+                                out.close();
+                        }
+                } finally {
+                        file.close();
+                }
+        }
+
+        /**
+         * @return tar file index (replace .tar by .idx)
+         */
+        private String getTarIndexFileName() {
+                int pos = tarFileName.lastIndexOf('.');
+                if (pos == -1) {
+                        throw new RuntimeException("Invalid tar filename");
+                }
+                return tarFileName.substring(0, pos + 1) + "idx";
+        }
+
+        /**
+         * open and read tar file index and file sizes.
+         */
+        private void readTarFileIndex() {
+                int[] tarIndex = null;
+                int[] tarSize  = null;
+                try {
+                        FileConnection file = 
+                                (FileConnection) Connector.open(
+                                                "file:///" + tarFileDirectory + getTarIndexFileName(), 
+                                                Connector.READ);
+                        DataInputStream in = file.openDataInputStream();
+                        try {
+                                int length = in.readInt();
+                                tarIndex = new int[length];
+                                tarSize  = new int[length];
+                                for (int i = 0; i < length; i++) {
+                                        tarIndex[i] = in.readInt();
+                                        tarSize[i]  = in.readInt();
+                                }
+                        } finally {
+                                in.close();
+                        }
+                } catch (IOException e) {
+                        Log.log(this, e, "reading tar file index");
+                        tarIndex = null;
+                }
+                tarFileIndex = tarIndex;
+                tarFileSize  = tarSize;
+        }
         /**
          * Read Tar file index.
@@ -593 +697 @@
                 final int nElements = (maxTileX / tileWidth) * (maxTileY / tileHeight);
                 queueTotal = nElements;
-                final long[] fileIndex = new long[nElements];
-                final int[] tarSize    = new int[nElements];
+                final int[] fileIndex = new int[nElements];
+                final int[] tarSize   = new int[nElements];
                 long fileOffset = 0;
                 final int blockSize = 512;
@@ -630 +734 @@
                                 if (name.startsWith(baseFileName)) {
                                         final int fileNumber = parseFileNumber(name);
-                                        fileIndex[fileNumber] = fileOffset;
+                                        fileIndex[fileNumber] = (int) fileOffset;
                                         tarSize[fileNumber] = fileSize;
                                         ++imageFound;