[Exist-commits] SF.net SVN: exist:[18383] stable/eXist-2.0.x

[<di...@us...>]

Revision: 18383
          http://sourceforge.net/p/exist/code/18383
Author:   dizzzz
Date:     2013-04-29 13:30:43 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
[bugfix] Avoid NPE when buttons are not present in launcher; port of rev18382

Revision Links:
--------------
    http://sourceforge.net/p/exist/code/18382

Modified Paths:
--------------
    stable/eXist-2.0.x/src/org/exist/launcher/UtilityPanel.java

Property Changed:
----------------
    stable/eXist-2.0.x/

Index: stable/eXist-2.0.x
===================================================================
--- stable/eXist-2.0.x	2013-04-29 12:59:10 UTC (rev 18382)
+++ stable/eXist-2.0.x	2013-04-29 13:30:43 UTC (rev 18383)

Property changes on: stable/eXist-2.0.x
___________________________________________________________________
Modified: svn:mergeinfo
## -5,5 +5,5 ##
 /branches/dizzzz/xquery3:15611-15682
 /branches/jmfg/res64-eXist:12887-13224
 /stable/eXist-2.0.x:17695-17697
-/trunk/eXist:17992-18208,18306,18308,18315,18320
+/trunk/eXist:17992-18208,18306,18308,18315,18320,18382
 /trunk/eXist/nbproject:8007-14504
\ No newline at end of property
Modified: stable/eXist-2.0.x/src/org/exist/launcher/UtilityPanel.java
===================================================================
--- stable/eXist-2.0.x/src/org/exist/launcher/UtilityPanel.java	2013-04-29 12:59:10 UTC (rev 18382)
+++ stable/eXist-2.0.x/src/org/exist/launcher/UtilityPanel.java	2013-04-29 13:30:43 UTC (rev 18383)
@@ -188,9 +188,9 @@
     public void update(Observable observable, final Object o) {
         if (o instanceof ExistRepository.Notification) {
             ExistRepository.Notification notification = (ExistRepository.Notification) o;
-            if (notification.getPackageURI().equals(Launcher.PACKAGE_DASHBOARD)) {
+            if (notification.getPackageURI().equals(Launcher.PACKAGE_DASHBOARD) && dashboardButton != null) {
                 dashboardButton.setEnabled(notification.getAction() == ExistRepository.Action.INSTALL);
-            } else if (notification.getPackageURI().equals(Launcher.PACKAGE_EXIDE)) {
+            } else if (notification.getPackageURI().equals(Launcher.PACKAGE_EXIDE) && eXideButton != null) {
                 eXideButton.setEnabled(notification.getAction() == ExistRepository.Action.INSTALL);
             }
         } else {