directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r573540 - in /directory/studio/trunk: studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/ studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ stu...
Date Fri, 07 Sep 2007 10:58:13 GMT
Author: seelmann
Date: Fri Sep  7 03:58:12 2007
New Revision: 573540

URL: http://svn.apache.org/viewvc?rev=573540&view=rev
Log:
Some renamings.

Added:
    directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java
      - copied, changed from r573519, directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java
    directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/BrowserConnectionWidget.java
      - copied, changed from r573535, directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ConnectionWidget.java
Removed:
    directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java
    directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ConnectionWidget.java
Modified:
    directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
    directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java
    directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java

Copied: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java
(from r573519, directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java?p2=directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java&p1=directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java&r1=573519&r2=573540&rev=573540&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java
Fri Sep  7 03:58:12 2007
@@ -46,12 +46,12 @@
 
 
 /**
- * Dialog to select a connection.
+ * Dialog to select an {@link IBrowserConnection}.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class SelectConnectionDialog extends Dialog
+public class SelectBrowserConnectionDialog extends Dialog
 {
 
     /** The title. */
@@ -83,7 +83,7 @@
      * @param title the title
      * @param initialBrowserConnection the initial browser connection
      */
-    public SelectConnectionDialog( Shell parentShell, String title, IBrowserConnection initialBrowserConnection
)
+    public SelectBrowserConnectionDialog( Shell parentShell, String title, IBrowserConnection
initialBrowserConnection )
     {
         super( parentShell );
         super.setShellStyle( super.getShellStyle() | SWT.RESIZE );

Copied: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/BrowserConnectionWidget.java
(from r573535, directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ConnectionWidget.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/BrowserConnectionWidget.java?p2=directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/BrowserConnectionWidget.java&p1=directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ConnectionWidget.java&r1=573535&r2=573540&rev=573540&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ConnectionWidget.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/BrowserConnectionWidget.java
Fri Sep  7 03:58:12 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldapbrowser.common.widgets.search;
 
 
-import org.apache.directory.studio.ldapbrowser.common.dialogs.SelectConnectionDialog;
+import org.apache.directory.studio.ldapbrowser.common.dialogs.SelectBrowserConnectionDialog;
 import org.apache.directory.studio.ldapbrowser.common.widgets.BaseWidgetUtils;
 import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -33,14 +33,14 @@
 
 
 /**
- * The ConnectionWidget could be used to select a connection. 
+ * The BrowserConnectionWidget could be used to select an {@link IBrowserConnection}. 
  * It is composed of a text to display the selected connection
- * and a browse button to open a {@link SelectConnectionDialog}.
+ * and a browse button to open a {@link SelectBrowserConnectionDialog}.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ConnectionWidget extends BrowserWidget
+public class BrowserConnectionWidget extends BrowserWidget
 {
 
     /** The connection text, displays the selected connection */
@@ -58,7 +58,7 @@
      * 
      * @param connection the initial connection
      */
-    public ConnectionWidget( IBrowserConnection connection )
+    public BrowserConnectionWidget( IBrowserConnection connection )
     {
         this.selectedBrowserConnection = connection;
     }
@@ -67,7 +67,7 @@
     /**
      * Creates a new instance of ConnectionWidget with no initial connection.
      */
-    public ConnectionWidget()
+    public BrowserConnectionWidget()
     {
         this.selectedBrowserConnection = null;
     }
@@ -91,7 +91,7 @@
             public void widgetSelected( SelectionEvent e )
             {
                 // if(selectedConnection != null) {
-                SelectConnectionDialog dialog = new SelectConnectionDialog( parent.getShell(),
"Select Connection",
+                SelectBrowserConnectionDialog dialog = new SelectBrowserConnectionDialog(
parent.getShell(), "Select Connection",
                     selectedBrowserConnection );
                 dialog.open();
                 IBrowserConnection browserConnection = dialog.getSelectedBrowserConnection();

Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java?rev=573540&r1=573539&r2=573540&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
Fri Sep  7 03:58:12 2007
@@ -141,8 +141,8 @@
     /** The connection label. */
     protected Label connectionLabel;
 
-    /** The connection widget. */
-    protected ConnectionWidget connectionWidget;
+    /** The browser connection widget. */
+    protected BrowserConnectionWidget browserConnectionWidget;
 
     /** The search base label. */
     protected Label searchBaseLabel;
@@ -290,10 +290,10 @@
         }
 
         connectionLabel = BaseWidgetUtils.createLabel( composite, "Connection:", 1 );
-        connectionWidget = new ConnectionWidget();
-        connectionWidget.createWidget( composite );
-        connectionWidget.setEnabled( !isActive( CONNECTION_READONLY ) );
-        connectionWidget.addWidgetModifyListener( new WidgetModifyListener()
+        browserConnectionWidget = new BrowserConnectionWidget();
+        browserConnectionWidget.createWidget( composite );
+        browserConnectionWidget.setEnabled( !isActive( CONNECTION_READONLY ) );
+        browserConnectionWidget.addWidgetModifyListener( new WidgetModifyListener()
         {
             public void widgetModified( WidgetModifyEvent event )
             {
@@ -529,16 +529,16 @@
     protected void validate()
     {
 
-        if ( connectionWidget.getBrowserConnection() != null )
+        if ( browserConnectionWidget.getBrowserConnection() != null )
         {
             if ( searchBaseWidget.getDn() == null
-                || searchBaseWidget.getConnection() != connectionWidget.getBrowserConnection()
)
+                || searchBaseWidget.getConnection() != browserConnectionWidget.getBrowserConnection()
)
             {
-                searchBaseWidget.setInput( connectionWidget.getBrowserConnection(), null
);
+                searchBaseWidget.setInput( browserConnectionWidget.getBrowserConnection(),
null );
             }
         }
 
-        filterWidget.setConnection( connectionWidget.getBrowserConnection() );
+        filterWidget.setConnection( browserConnectionWidget.getBrowserConnection() );
 
         super.notifyListeners();
     }
@@ -569,28 +569,28 @@
 
         if ( search.getBrowserConnection() != null )
         {
-            IBrowserConnection connection = search.getBrowserConnection();
+            IBrowserConnection browserConnection = search.getBrowserConnection();
             DN searchBase = search.getSearchBase();
 
-            if ( connectionWidget != null )
+            if ( browserConnectionWidget != null )
             {
-                connectionWidget.setBrowserConnection( connection );
+                browserConnectionWidget.setBrowserConnection( browserConnection );
             }
 
             if ( searchBase != null )
             {
-                searchBaseWidget.setInput( connection, searchBase );
+                searchBaseWidget.setInput( browserConnection, searchBase );
             }
 
             if ( filterWidget != null )
             {
-                filterWidget.setConnection( connection );
+                filterWidget.setConnection( browserConnection );
                 filterWidget.setFilter( search.getFilter() );
             }
 
             if ( returningAttributesWidget != null )
             {
-                returningAttributesWidget.setConnection( connection );
+                returningAttributesWidget.setConnection( browserConnection );
                 returningAttributesWidget.setInitialReturningAttributes( search.getReturningAttributes()
);
             }
 
@@ -646,10 +646,10 @@
             search.getSearchParameter().setName( searchNameText.getText() );
             searchModified = true;
         }
-        if ( connectionWidget != null && connectionWidget.getBrowserConnection()
!= null
-            && connectionWidget.getBrowserConnection() != search.getBrowserConnection()
)
+        if ( browserConnectionWidget != null && browserConnectionWidget.getBrowserConnection()
!= null
+            && browserConnectionWidget.getBrowserConnection() != search.getBrowserConnection()
)
         {
-            search.setConnection( connectionWidget.getBrowserConnection() );
+            search.setConnection( browserConnectionWidget.getBrowserConnection() );
             searchModified = true;
         }
         if ( searchBaseWidget != null && searchBaseWidget.getDn() != null
@@ -698,7 +698,7 @@
                     if ( returnOperationalAttributesButton.getSelection() )
                     {
                         AttributeTypeDescription[] opAtds = SchemaUtils
-                            .getOperationalAttributeDescriptions( connectionWidget.getBrowserConnection().getSchema()
);
+                            .getOperationalAttributeDescriptions( browserConnectionWidget.getBrowserConnection().getSchema()
);
                         String[] attributeTypeDescriptionNames = SchemaUtils.getAttributeTypeDescriptionNames(
opAtds );
                         raList.addAll( Arrays.asList( attributeTypeDescriptionNames ) );
                         raList.add( ISearch.ALL_OPERATIONAL_ATTRIBUTES );
@@ -821,7 +821,7 @@
      */
     public boolean isValid()
     {
-        if ( connectionWidget != null && connectionWidget.getBrowserConnection()
== null )
+        if ( browserConnectionWidget != null && browserConnectionWidget.getBrowserConnection()
== null )
         {
             return false;
         }
@@ -850,7 +850,7 @@
      */
     public String getErrorMessage()
     {
-        if ( connectionWidget != null && connectionWidget.getBrowserConnection()
== null )
+        if ( browserConnectionWidget != null && browserConnectionWidget.getBrowserConnection()
== null )
         {
             return "Please select a connection.";
         }
@@ -883,10 +883,10 @@
             searchNameLabel.setEnabled( b );
             searchNameText.setEnabled( b );
         }
-        if ( connectionWidget != null )
+        if ( browserConnectionWidget != null )
         {
             connectionLabel.setEnabled( b );
-            connectionWidget.setEnabled( b && !isActive( CONNECTION_READONLY ) );
+            browserConnectionWidget.setEnabled( b && !isActive( CONNECTION_READONLY
) );
         }
         if ( searchBaseWidget != null )
         {

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java?rev=573540&r1=573539&r2=573540&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java
Fri Sep  7 03:58:12 2007
@@ -27,7 +27,7 @@
 import org.apache.directory.studio.ldapbrowser.common.widgets.FileBrowserWidget;
 import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
 import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
-import org.apache.directory.studio.ldapbrowser.common.widgets.search.ConnectionWidget;
+import org.apache.directory.studio.ldapbrowser.common.widgets.search.BrowserConnectionWidget;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
 import org.eclipse.jface.wizard.WizardPage;
@@ -56,8 +56,8 @@
     /** The dsml file browser widget. */
     private FileBrowserWidget dsmlFileBrowserWidget;
 
-    /** The connection widget. */
-    private ConnectionWidget connectionWidget;
+    /** The browser connection widget. */
+    private BrowserConnectionWidget browserConnectionWidget;
 
     /** The save response button. */
     private Button saveResponseButton;
@@ -123,13 +123,13 @@
 
         // Connection
         BaseWidgetUtils.createLabel( composite, "Import into:", 1 );
-        connectionWidget = new ConnectionWidget( wizard.getImportConnection() );
-        connectionWidget.createWidget( composite );
-        connectionWidget.addWidgetModifyListener( new WidgetModifyListener()
+        browserConnectionWidget = new BrowserConnectionWidget( wizard.getImportConnection()
);
+        browserConnectionWidget.createWidget( composite );
+        browserConnectionWidget.addWidgetModifyListener( new WidgetModifyListener()
         {
             public void widgetModified( WidgetModifyEvent event )
             {
-                wizard.setImportConnection( connectionWidget.getBrowserConnection() );
+                wizard.setImportConnection( browserConnectionWidget.getBrowserConnection()
);
                 validate();
             }
         } );
@@ -275,7 +275,7 @@
             }
         }
 
-        if ( ( wizard.getImportConnection() == null ) || ( connectionWidget.getBrowserConnection()
== null ) )
+        if ( ( wizard.getImportConnection() == null ) || ( browserConnectionWidget.getBrowserConnection()
== null ) )
         {
             setErrorMessage( "Please select a Connection." );
             ok = false;

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java?rev=573540&r1=573539&r2=573540&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
Fri Sep  7 03:58:12 2007
@@ -27,7 +27,7 @@
 import org.apache.directory.studio.ldapbrowser.common.widgets.FileBrowserWidget;
 import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
 import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
-import org.apache.directory.studio.ldapbrowser.common.widgets.search.ConnectionWidget;
+import org.apache.directory.studio.ldapbrowser.common.widgets.search.BrowserConnectionWidget;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
 import org.eclipse.jface.wizard.WizardPage;
@@ -61,8 +61,8 @@
     /** The ldif file browser widget. */
     private FileBrowserWidget ldifFileBrowserWidget;
 
-    /** The connection widget. */
-    private ConnectionWidget connectionWidget;
+    /** The browser connection widget. */
+    private BrowserConnectionWidget browserConnectionWidget;
 
     /** The enable logging button. */
     private Button enableLoggingButton;
@@ -205,13 +205,13 @@
 
         // Connection
         BaseWidgetUtils.createLabel( composite, "Import into:", 1 );
-        connectionWidget = new ConnectionWidget( wizard.getImportConnection() );
-        connectionWidget.createWidget( composite );
-        connectionWidget.addWidgetModifyListener( new WidgetModifyListener()
+        browserConnectionWidget = new BrowserConnectionWidget( wizard.getImportConnection()
);
+        browserConnectionWidget.createWidget( composite );
+        browserConnectionWidget.addWidgetModifyListener( new WidgetModifyListener()
         {
             public void widgetModified( WidgetModifyEvent event )
             {
-                wizard.setImportConnection( connectionWidget.getBrowserConnection() );
+                wizard.setImportConnection( browserConnectionWidget.getBrowserConnection()
);
                 validate();
             }
         } );



Mime
View raw message