svn commit: r1681860 - in /directory/studio/trunk/plugins: ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/ ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ ldapbrowser.ui/src/ma...

[se...@apache.org]

Author: seelmann
Date: Tue May 26 20:55:48 2015
New Revision: 1681860

URL: http://svn.apache.org/r1681860
Log:
DIRSTUDIO-1047: Add null checks for BrowserConnection on connection update. Contributed by Paul Richardson.

Modified:
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/BrowserConnectionWidgetContributionItem.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
    directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java?rev=1681860&r1=1681859&r2=1681860&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java Tue May 26 20:55:48 2015
@@ -411,6 +411,11 @@ public class BrowserConnectionManager im
      */
     private void saveSchema( IBrowserConnection browserConnection )
     {
+        if ( browserConnection == null )
+        {
+            return;
+        }
+
         try
         {
             String filename = getSchemaCacheFileName( browserConnection.getConnection().getId() );

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/BrowserConnectionWidgetContributionItem.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/BrowserConnectionWidgetContributionItem.java?rev=1681860&r1=1681859&r2=1681860&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/BrowserConnectionWidgetContributionItem.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/BrowserConnectionWidgetContributionItem.java Tue May 26 20:55:48 2015
@@ -198,6 +198,11 @@ public class BrowserConnectionWidgetCont
      */
     public final void connectionUpdated( Connection connection )
     {
+        if ( connection == null )
+        {
+            return;
+        }
+
         IBrowserConnection selectedConnection = browserConnectionWidget.getBrowserConnection();
         if ( connection.equals( selectedConnection.getConnection() ) )
         {
@@ -220,6 +225,11 @@ public class BrowserConnectionWidgetCont
      */
     public void connectionRemoved( Connection connection )
     {
+        if ( connection == null )
+        {
+            return;
+        }
+
         IBrowserConnection selectedConnection = browserConnectionWidget.getBrowserConnection();
         if ( connection.equals( selectedConnection.getConnection() ) )
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java?rev=1681860&r1=1681859&r2=1681860&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java Tue May 26 20:55:48 2015
@@ -488,6 +488,16 @@ public class BrowserViewUniversalListene
         IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
             .getBrowserConnection( connection );
 
+        if ( browserConnection == null )
+        {
+            //
+            // If browser connection is null then it has been temporarily created
+            // by a dialog or other transient entity. Only display in the view those
+            // browser connections stored in the connection manager
+            //
+            return;
+        }
+
         // expand viewer
         viewer.refresh( browserConnection );
         viewer.expandToLevel( 2 );
@@ -512,6 +522,16 @@ public class BrowserViewUniversalListene
         IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
             .getBrowserConnection( connection );
 
+        if (browserConnection == null)
+        {
+            //
+            // If browser connection is null then it has been temporarily created
+            // by a dialog or other transient entity. Only display in the view those
+            // browser connections stored in the connection manager
+            //
+            return;
+        }
+
         viewer.collapseAll();
         connectionToExpandedElementsMap.remove( browserConnection );
         connectionToSelectedElementMap.remove( browserConnection );

Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java?rev=1681860&r1=1681859&r2=1681860&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java (original)
+++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java Tue May 26 20:55:48 2015
@@ -623,8 +623,11 @@ public class LdifEditor extends TextEdit
         if ( browserConnectionWidget != null )
         {
             IBrowserConnection browserConnection = browserConnectionWidget.getBrowserConnection();
-            setConnection( browserConnection );
-            browserConnectionWidget.setBrowserConnection( browserConnection );
+            if ( browserConnection != null && browserConnection.getConnection().equals( connection ) )
+            {
+                setConnection( browserConnection );
+                browserConnectionWidget.setBrowserConnection( browserConnection );
+            }
         }
     }