Author: seelmann
Date: Sun Feb 11 08:54:05 2007
New Revision: 506065
URL: http://svn.apache.org/viewvc?view=rev&rev=506065
Log:
Fixed NPE.
Modified:
directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorManager.java
directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/schemabrowser/SchemaBrowserManager.java
directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorManager.java
Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorManager.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorManager.java?view=diff&rev=506065&r1=506064&r2=506065
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorManager.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/entry/EntryEditorManager.java
Sun Feb 11 08:54:05 2007
@@ -101,7 +101,7 @@
e.printStackTrace();
}
}
- else
+ else if ( editor != null )
{
// set the input to already opened entry editor
editor.setInput( input );
Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/schemabrowser/SchemaBrowserManager.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/schemabrowser/SchemaBrowserManager.java?view=diff&rev=506065&r1=506064&r2=506065
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/schemabrowser/SchemaBrowserManager.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/schemabrowser/SchemaBrowserManager.java
Sun Feb 11 08:54:05 2007
@@ -77,12 +77,12 @@
e.printStackTrace();
}
}
- else
+ else if ( editor != null )
{
// set the input to already opened schema browser
editor.setInput( input );
- // bring schema browser to top only if schema element schould be displayed.
+ // bring schema browser to top only if a schema element should be displayed.
if ( input.getSchemaElement() != null )
{
if ( !PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().isPartVisible(
editor ) )
Modified: directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorManager.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorManager.java?view=diff&rev=506065&r1=506064&r2=506065
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorManager.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-ui/src/main/java/org/apache/directory/ldapstudio/browser/ui/editors/searchresult/SearchResultEditorManager.java
Sun Feb 11 08:54:05 2007
@@ -76,12 +76,12 @@
e.printStackTrace();
}
}
- else
+ else if ( editor != null )
{
// set the input to already opened search result editor
editor.setInput( input );
- // bring search result editor to top only if an search is displayed in it.
+ // bring search result editor to top only if a search is displayed in it.
if ( input.getSearch() != null )
{
if ( !PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().isPartVisible(
editor ) )
|