directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r692016 - in /directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors: entry/ schemabrowser/ searchresult/
Date Thu, 04 Sep 2008 13:55:54 GMT
Author: seelmann
Date: Thu Sep  4 06:55:53 2008
New Revision: 692016

URL: http://svn.apache.org/viewvc?rev=692016&view=rev
Log:
DIRSTUDIO-389: fixed back/forward navigation, handling has been changed with eclipse 3.3,
hopefully it still works with eclipse 3.4

Modified:
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorUniversalListener.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java?rev=692016&r1=692015&r2=692016&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java
Thu Sep  4 06:55:53 2008
@@ -33,6 +33,7 @@
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.INavigationHistory;
 import org.eclipse.ui.INavigationLocation;
 import org.eclipse.ui.INavigationLocationProvider;
 import org.eclipse.ui.IReusableEditor;
@@ -99,13 +100,15 @@
             // mark location for back/forward history navigation
             if ( entry != null )
             {
-                // enable one instance hack before fireing the input change event 
+                // disable one instance hack before fireing the input change event 
                 // otherwise the navigation history is cleared.
-                EntryEditorInput.enableOneInstanceHack( true );
+                // Note: seems this behavior has been changed with Eclipse 3.3
+                EntryEditorInput.enableOneInstanceHack( false );
                 firePropertyChange( IEditorPart.PROP_INPUT );
 
-                // disable one instance hack for marking the location
-                EntryEditorInput.enableOneInstanceHack( false );
+                // enable one instance hack for marking the location
+                // Note: seems this behavior has been changed with Eclipse 3.3
+                EntryEditorInput.enableOneInstanceHack( true );
                 getSite().getPage().getNavigationHistory().markLocation( this );
             }
 

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorUniversalListener.java?rev=692016&r1=692015&r2=692016&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorUniversalListener.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorUniversalListener.java
Thu Sep  4 06:55:53 2008
@@ -216,7 +216,7 @@
     {
         if ( entryEditor != null )
         {
-            // deregister listneners
+            // deregister listeners
             entryEditor.getSite().getPage().removePartListener( partListener );
             entryEditor.getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(
                 BrowserView.getId(), entrySelectionListener );
@@ -227,9 +227,6 @@
     }
 
 
-
-
-
     /**
      * {@inheritDoc}
      *
@@ -248,7 +245,4 @@
         }
     }
 
-
-
-
 }

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java?rev=692016&r1=692015&r2=692016&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java
Thu Sep  4 06:55:53 2008
@@ -233,13 +233,15 @@
 
             if ( connection != null && schemaElement != null )
             {
-                // enable one instance hack before fireing the input change event 
+                // disable one instance hack before fireing the input change event 
                 // otherwise the navigation history is cleared.
-                SchemaBrowserInput.enableOneInstanceHack( true );
+                // Note: seems this behavior has been changed with Eclipse 3.3
+                SchemaBrowserInput.enableOneInstanceHack( false );
                 firePropertyChange( IEditorPart.PROP_INPUT );
 
-                // disable one instance hack for marking the location
-                SchemaBrowserInput.enableOneInstanceHack( false );
+                // enable one instance hack for marking the location
+                // Note: seems this behavior has been changed with Eclipse 3.3
+                SchemaBrowserInput.enableOneInstanceHack( true );
                 getSite().getPage().getNavigationHistory().markLocation( this );
             }
 

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java?rev=692016&r1=692015&r2=692016&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
Thu Sep  4 06:55:53 2008
@@ -29,6 +29,7 @@
 import org.apache.directory.shared.ldap.schema.syntax.ObjectClassDescription;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.INavigationLocation;
@@ -65,27 +66,28 @@
         {
             if ( schemaElement instanceof ObjectClassDescription )
             {
-                return "Object Class " + schemaElement.toString();
+
+                return "Object Class " + SchemaUtils.toString( schemaElement );
             }
             else if ( schemaElement instanceof AttributeTypeDescription )
             {
-                return "Attribute Type " + schemaElement.toString();
+                return "Attribute Type " + SchemaUtils.toString( schemaElement );
             }
             else if ( schemaElement instanceof LdapSyntaxDescription )
             {
-                return "Syntax " + schemaElement.toString();
+                return "Syntax " + SchemaUtils.toString( schemaElement );
             }
             else if ( schemaElement instanceof MatchingRuleDescription )
             {
-                return "Matching Rule " + schemaElement.toString();
+                return "Matching Rule " + SchemaUtils.toString( schemaElement );
             }
             else if ( schemaElement instanceof MatchingRuleUseDescription )
             {
-                return "Matching Rule Use " + schemaElement.toString();
+                return "Matching Rule Use " + SchemaUtils.toString( schemaElement );
             }
             else
             {
-                return schemaElement.getNumericOid();
+                return SchemaUtils.toString( schemaElement );
             }
         }
         else

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java?rev=692016&r1=692015&r2=692016&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java
Thu Sep  4 06:55:53 2008
@@ -97,13 +97,15 @@
 
             if ( search != null )
             {
-                // enable one instance hack before firing the input change event 
+                // disable one instance hack before firing the input change event 
                 // otherwise the navigation history is cleared.
-                SearchResultEditorInput.enableOneInstanceHack( true );
+                // Note: seems this behavior has been changed with Eclipse 3.3
+                SearchResultEditorInput.enableOneInstanceHack( false );
                 firePropertyChange( IEditorPart.PROP_INPUT );
 
-                // disable one instance hack for marking the location
-                SearchResultEditorInput.enableOneInstanceHack( false );
+                // enable one instance hack for marking the location
+                // Note: seems this behavior has been changed with Eclipse 3.3
+                SearchResultEditorInput.enableOneInstanceHack( true );
                 getSite().getPage().getNavigationHistory().markLocation( this );
             }
         }



Mime
View raw message