directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r811137 - in /directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor: LdifDocumentProvider.java LdifEditor.java
Date Thu, 03 Sep 2009 21:39:00 GMT
Author: seelmann
Date: Thu Sep  3 21:38:59 2009
New Revision: 811137

URL: http://svn.apache.org/viewvc?rev=811137&view=rev
Log:
DIRSTUDIO-515:
o Make the toolbar configurable
o Extend visibility of methods

Modified:
    directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
    directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java

Modified: directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java?rev=811137&r1=811136&r2=811137&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
(original)
+++ directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifDocumentProvider.java
Thu Sep  3 21:38:59 2009
@@ -322,7 +322,7 @@
      * 
      * @param document the new document
      */
-    private void setupDocument( IDocument document )
+    protected void setupDocument( IDocument document )
     {
 
         // setup document partitioning

Modified: directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java?rev=811137&r1=811136&r2=811137&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
(original)
+++ directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
Thu Sep  3 21:38:59 2009
@@ -139,6 +139,7 @@
 
     private ValueEditorPreferencesAction valueEditorPreferencesAction;
 
+    protected boolean showToolBar = true;
 
     /**
      * Creates a new instance of LdifEditor.
@@ -158,7 +159,7 @@
 
         setHelpContextId( LdifEditorConstants.PLUGIN_ID + "." + "tools_ldif_editor" ); //$NON-NLS-1$
//$NON-NLS-2$
     }
-
+    
 
     /**
      * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent)
@@ -387,10 +388,13 @@
         setAction( "ContentAssistProposal", action ); //$NON-NLS-1$
 
         // add execute action (for tool bar)
-        ExecuteLdifAction executeLdifAction = new ExecuteLdifAction( this );
-        actionToolBarManager.add( executeLdifAction );
-        setAction( LdifEditorConstants.ACTION_ID_EXECUTE_LDIF, executeLdifAction );
-        actionToolBarManager.update( true );
+        if ( actionToolBarManager != null )
+        {
+            ExecuteLdifAction executeLdifAction = new ExecuteLdifAction( this );
+            actionToolBarManager.add( executeLdifAction );
+            setAction( LdifEditorConstants.ACTION_ID_EXECUTE_LDIF, executeLdifAction );
+            actionToolBarManager.update( true );
+        }
 
         // add context menu edit actions
         EditLdifAttributeAction editLdifAttributeAction = new EditLdifAttributeAction( this
);
@@ -449,50 +453,57 @@
     {
         setHelpContextId( LdifEditorConstants.PLUGIN_ID + "." + "tools_ldif_editor" ); //$NON-NLS-1$
//$NON-NLS-2$
 
-        Composite composite = new Composite( parent, SWT.NONE );
-        composite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-        GridLayout layout = new GridLayout();
-        layout.marginWidth = 0;
-        layout.marginHeight = 0;
-        // layout.horizontalSpacing = 0;
-        layout.verticalSpacing = 0;
-        composite.setLayout( layout );
-
-        control = new ViewForm( composite, SWT.NONE );
-        control.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-
-        Composite browserConnectionWidgetControl = BaseWidgetUtils.createColumnContainer(
control, 2, 1 );
-        browserConnectionWidget = new BrowserConnectionWidget();
-        browserConnectionWidget.createWidget( browserConnectionWidgetControl );
-        connectionUpdated( null );
-        browserConnectionWidget.addWidgetModifyListener( new WidgetModifyListener()
-        {
-            public void widgetModified( WidgetModifyEvent event )
-            {
-                IBrowserConnection browserConnection = browserConnectionWidget.getBrowserConnection();
-                setConnection( browserConnection );
-            }
-        } );
-        control.setTopLeft( browserConnectionWidgetControl );
-
-        // tool bar
-        actionToolBar = new ToolBar( control, SWT.FLAT | SWT.RIGHT );
-        actionToolBar.setLayoutData( new GridData( SWT.END, SWT.NONE, true, false ) );
-        actionToolBarManager = new ToolBarManager( actionToolBar );
-        control.setTopCenter( actionToolBar );
-
-        // local menu
-        control.setTopRight( null );
-
-        // content
-        Composite editorComposite = new Composite( control, SWT.NONE );
-        editorComposite.setLayout( new FillLayout() );
-        GridData data = new GridData( GridData.FILL_BOTH );
-        data.widthHint = 450;
-        data.heightHint = 250;
-        editorComposite.setLayoutData( data );
-        super.createPartControl( editorComposite );
-        control.setContent( editorComposite );
+        if(showToolBar)
+        {
+            // create the toolbar (including connection widget and execute button) on top
of the editor 
+            Composite composite = new Composite( parent, SWT.NONE );
+            composite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
+            GridLayout layout = new GridLayout();
+            layout.marginWidth = 0;
+            layout.marginHeight = 0;
+            layout.verticalSpacing = 0;
+            composite.setLayout( layout );
+    
+            control = new ViewForm( composite, SWT.NONE );
+            control.setLayoutData( new GridData( GridData.FILL_BOTH ) );
+    
+            Composite browserConnectionWidgetControl = BaseWidgetUtils.createColumnContainer(
control, 2, 1 );
+            browserConnectionWidget = new BrowserConnectionWidget();
+            browserConnectionWidget.createWidget( browserConnectionWidgetControl );
+            connectionUpdated( null );
+            browserConnectionWidget.addWidgetModifyListener( new WidgetModifyListener()
+            {
+                public void widgetModified( WidgetModifyEvent event )
+                {
+                    IBrowserConnection browserConnection = browserConnectionWidget.getBrowserConnection();
+                    setConnection( browserConnection );
+                }
+            } );
+            control.setTopLeft( browserConnectionWidgetControl );
+    
+            // tool bar
+            actionToolBar = new ToolBar( control, SWT.FLAT | SWT.RIGHT );
+            actionToolBar.setLayoutData( new GridData( SWT.END, SWT.NONE, true, false ) );
+            actionToolBarManager = new ToolBarManager( actionToolBar );
+            control.setTopCenter( actionToolBar );
+    
+            // local menu
+            control.setTopRight( null );
+    
+            // content
+            Composite editorComposite = new Composite( control, SWT.NONE );
+            editorComposite.setLayout( new FillLayout() );
+            GridData data = new GridData( GridData.FILL_BOTH );
+            data.widthHint = 450;
+            data.heightHint = 250;
+            editorComposite.setLayoutData( data );
+            super.createPartControl( editorComposite );
+            control.setContent( editorComposite );
+        }
+        else
+        {
+            super.createPartControl( parent );
+        }
 
         ProjectionViewer projectionViewer = ( ProjectionViewer ) getSourceViewer();
         projectionSupport = new ProjectionSupport( projectionViewer, getAnnotationAccess(),
getSharedColors() );
@@ -566,7 +577,7 @@
      * @param browserConnection
      *      the browser connection to set
      */
-    private void setConnection( IBrowserConnection browserConnection )
+    protected void setConnection( IBrowserConnection browserConnection )
     {
         this.browserConnection = browserConnection;
         getEditorSite().getActionBars().getStatusLineManager().setMessage(



Mime
View raw message