[ jEdit-commits ] SF.net SVN: jedit:[22271] plugins/Navigator/trunk/src/ise/plugin/nav/ NavigatorPlugin.java

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

Revision: 22271
          http://jedit.svn.sourceforge.net/jedit/?rev=22271&view=rev
Author:   daleanson
Date:     2012-09-28 18:50:32 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Fix for NPE thrown when no toolbar is present and properties change.

Modified Paths:
--------------
    plugins/Navigator/trunk/src/ise/plugin/nav/NavigatorPlugin.java

Modified: plugins/Navigator/trunk/src/ise/plugin/nav/NavigatorPlugin.java
===================================================================
--- plugins/Navigator/trunk/src/ise/plugin/nav/NavigatorPlugin.java	2012-09-28 17:41:29 UTC (rev 22270)
+++ plugins/Navigator/trunk/src/ise/plugin/nav/NavigatorPlugin.java	2012-09-28 18:50:32 UTC (rev 22271)
@@ -159,7 +159,13 @@
                         clearToolBars(true);
                         View[] views = jEdit.getViews();
                         for (View view : views) {
-                            view.getToolBar().add(new NavToolBar(getNavigator(view)));
+                            if (view.getToolBar() != null) {
+                                Navigator nav = getNavigator(view);
+                                if (nav != null) {
+                                    NavToolBar toolBar = new NavToolBar(nav);
+                                    view.getToolBar().add(toolBar);
+                                }
+                            }
                         }
                     }
                 }

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