OSDN Git Service

Fix image reousrces in HierarchyViewer application.
authorRaphael Moll <ralf@android.com>
Fri, 29 Apr 2011 03:07:49 +0000 (20:07 -0700)
committerRaphael Moll <ralf@android.com>
Fri, 29 Apr 2011 03:07:49 +0000 (20:07 -0700)
Currently the HierarchyViewer application crashes when
trying to run it from Eclipse. The issue is that the
code looks for all the images in /images/ whereas the
source code places them in /resources/images/ and the
makefile was setup to "erase" the /resources part.

The fix is:
- move all images back to hierarchyviewerlib/src/images.
- adjust the makefile accordingly.

Another issue is that the about box JPEG files failed
to load (at least on Eclipse 3.5 under Win7). That's OK
we had a real icon in PNG that works, so we should be
using it for the about box anyway.

Change-Id: Id3edc3d714480d4251b190706371db2481a14b63

38 files changed:
ddms/libs/ddmuilib/src/com/android/ddmuilib/ImageLoader.java
hierarchyviewer2/app/src/com/android/hierarchyviewer/AboutDialog.java
hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/AboutAction.java
hierarchyviewer2/libs/hierarchyviewerlib/src/Android.mk
hierarchyviewer2/libs/hierarchyviewerlib/src/images/auto-refresh.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/auto-refresh.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/capture-psd.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/capture-psd.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view-selected.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view-selected.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/display.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/display.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/filtered.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/filtered.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/green.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/green.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/inspect-screenshot.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/inspect-screenshot.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/invalidate.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/invalidate.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-all-views.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-all-views.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-overlay.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-overlay.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-view-hierarchy.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-view-hierarchy.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/not-selected.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/not-selected.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-black.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-black.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-white.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-white.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/pixel-perfect-view-selected.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/pixel-perfect-view-selected.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/pixel-perfect-view.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/pixel-perfect-view.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/red.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/red.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/refresh-windows.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/refresh-windows.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/request-layout.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/request-layout.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/save.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/save.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-128.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/sdk-hierarchyviewer-128.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-16.png [new file with mode: 0755]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered-small.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered-small.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-small.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-small.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-extras.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-extras.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-overlay.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-overlay.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view-selected.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view-selected.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/images/yellow.png [moved from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/yellow.png with 100% similarity]
hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about-small.jpg [deleted file]
hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about.jpg [deleted file]

index 40cbd1d..fd480f6 100644 (file)
@@ -140,13 +140,11 @@ public class ImageLoader {
 
             if (imageStream != null) {
                 img = new Image(display, imageStream);
-                if (img == null) {
-                    throw new NullPointerException("couldn't load " + tmp);
-                }
-
                 mLoadedImages.put(filename, img);
+            }
 
-                return img;
+            if (img == null) {
+                throw new RuntimeException("Failed to load " + tmp);
             }
         }
 
@@ -159,7 +157,6 @@ public class ImageLoader {
      * Extra parameters allows for creation of a replacement image of the
      * loading failed.
      *
-     * @param loader the image loader used.
      * @param display the Display object
      * @param fileName the file name
      * @param width optional width to create replacement Image. If -1, null be
index 3f973e7..150c70a 100644 (file)
@@ -41,8 +41,8 @@ public class AboutDialog extends Dialog {
     public AboutDialog(Shell shell) {
         super(shell);
         ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class);
-        mSmallImage = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); //$NON-NLS-1$
-        mAboutImage = imageLoader.loadImage("about.jpg", Display.getDefault()); //$NON-NLS-1$
+        mSmallImage = imageLoader.loadImage("sdk-hierarchyviewer-16.png", Display.getDefault()); //$NON-NLS-1$
+        mAboutImage = imageLoader.loadImage("sdk-hierarchyviewer-128.png", Display.getDefault()); //$NON-NLS-1$
     }
 
     @Override
index 0c7c7b2..332b2dc 100644 (file)
@@ -41,7 +41,7 @@ public class AboutAction extends Action implements ImageAction {
         this.mShell = shell;
         setAccelerator(SWT.MOD1 + 'A');
         ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class);
-        mImage = imageLoader.loadImage("about-small.jpg", Display.getDefault()); //$NON-NLS-1$
+        mImage = imageLoader.loadImage("sdk-hierarchyviewer-16.png", Display.getDefault()); //$NON-NLS-1$
         setImageDescriptor(ImageDescriptor.createFromImage(mImage));
         setToolTipText("Shows the about dialog");
     }
index ded20e1..3ca63dd 100644 (file)
@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_JAVA_RESOURCE_DIRS := resources
+LOCAL_JAVA_RESOURCE_DIRS := ../src
 
 LOCAL_JAR_MANIFEST := ../manifest.txt
 
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-16.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-16.png
new file mode 100755 (executable)
index 0000000..8c3c23d
Binary files /dev/null and b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-16.png differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about-small.jpg b/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about-small.jpg
deleted file mode 100644 (file)
index 6fe9291..0000000
Binary files a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about-small.jpg and /dev/null differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about.jpg b/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about.jpg
deleted file mode 100644 (file)
index 8e10514..0000000
Binary files a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about.jpg and /dev/null differ