[ jEdit-commits ] SF.net SVN: jedit:[16722] plugins/ImageViewer/trunk

[<dal...@us...>]

Revision: 16722
          http://jedit.svn.sourceforge.net/jedit/?rev=16722&view=rev
Author:   daleanson
Date:     2009-12-23 21:34:14 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
Fixed a possible class cast exception and a possible null pointer exception.

Modified Paths:
--------------
    plugins/ImageViewer/trunk/build.xml
    plugins/ImageViewer/trunk/src/imageviewer/ImageViewer.java
    plugins/ImageViewer/trunk/src/imageviewer/ImageViewerPlugin.java

Modified: plugins/ImageViewer/trunk/build.xml
===================================================================
--- plugins/ImageViewer/trunk/build.xml	2009-12-23 16:45:18 UTC (rev 16721)
+++ plugins/ImageViewer/trunk/build.xml	2009-12-23 21:34:14 UTC (rev 16722)
@@ -87,9 +87,9 @@
    ========================================================================= -->
     <target name="dist"
             description="Compiles, jars, puts the jar in the jEdit jars directory."
-            depends="clean, init, compile">
+            depends="clean, init, compile, jar"/>
 
-
+    <target name="jar">
         <!-- make the plugin jar file -->
         <tstamp/>
         <jar jarfile="${install.dir}/${jar.name}">

Modified: plugins/ImageViewer/trunk/src/imageviewer/ImageViewer.java
===================================================================
--- plugins/ImageViewer/trunk/src/imageviewer/ImageViewer.java	2009-12-23 16:45:18 UTC (rev 16721)
+++ plugins/ImageViewer/trunk/src/imageviewer/ImageViewer.java	2009-12-23 21:34:14 UTC (rev 16722)
@@ -356,6 +356,9 @@
      * @param filename The filename to compress, if necessary, with an ellipsis in the middle.
      */
     private String compressFilename ( String filename ) {
+        if ( filename == null ) {
+            return "";
+        }
         int width = toolbar.getWidth() - buttonPanel.getWidth() - 6;
         FontMetrics fm = getGraphics().getFontMetrics();
         if ( fm == null ) {

Modified: plugins/ImageViewer/trunk/src/imageviewer/ImageViewerPlugin.java
===================================================================
--- plugins/ImageViewer/trunk/src/imageviewer/ImageViewerPlugin.java	2009-12-23 16:45:18 UTC (rev 16721)
+++ plugins/ImageViewer/trunk/src/imageviewer/ImageViewerPlugin.java	2009-12-23 21:34:14 UTC (rev 16722)
@@ -261,12 +261,15 @@
                     private void showImage( MouseEvent me ) {
                         if ( requireIVVisible( view ) ) {
                             TreePath treepath = tree.getClosestPathForLocation( me.getX(), me.getY() );
-                            VPTNode node = ( VPTNode ) treepath.getLastPathComponent();
-                            String path = node.getNodePath();
-                            if ( ImageViewer.isValidFilename( path ) ) {
-                                view.getDockableWindowManager().showDockableWindow( NAME );
-                                ImageViewer imageViewer = getImageViewer( view );
-                                imageViewer.showImage( path );
+                            Object lastComponent = treepath.getLastPathComponent();
+                            if ( lastComponent instanceof VPTNode ) {
+                                VPTNode node = ( VPTNode ) lastComponent;
+                                String path = node.getNodePath();
+                                if ( ImageViewer.isValidFilename( path ) ) {
+                                    view.getDockableWindowManager().showDockableWindow( NAME );
+                                    ImageViewer imageViewer = getImageViewer( view );
+                                    imageViewer.showImage( path );
+                                }
                             }
                         }
                     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.