directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r573535 - in /directory/studio/trunk: studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/
Date Fri, 07 Sep 2007 10:46:01 GMT
Author: seelmann
Date: Fri Sep  7 03:46:00 2007
New Revision: 573535

URL: http://svn.apache.org/viewvc?rev=573535&view=rev
Log:
Renamed some members and methods

Modified:
    directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ConnectionWidget.java
    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

Modified: 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/ConnectionWidget.java?rev=573535&r1=573534&r2=573535&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/ConnectionWidget.java
Fri Sep  7 03:46:00 2007
@@ -44,13 +44,13 @@
 {
 
     /** The connection text, displays the selected connection */
-    private Text connectionText;
+    private Text browserConnectionText;
 
     /** The connection browse button, opens the dialog */
     private Button connectionBrowseButton;
 
     /** The selected connection */
-    private IBrowserConnection selectedConnection;
+    private IBrowserConnection selectedBrowserConnection;
 
 
     /**
@@ -60,7 +60,7 @@
      */
     public ConnectionWidget( IBrowserConnection connection )
     {
-        this.selectedConnection = connection;
+        this.selectedBrowserConnection = connection;
     }
 
 
@@ -69,7 +69,7 @@
      */
     public ConnectionWidget()
     {
-        this.selectedConnection = null;
+        this.selectedBrowserConnection = null;
     }
 
 
@@ -82,7 +82,7 @@
     {
 
         // Text
-        connectionText = BaseWidgetUtils.createReadonlyText( parent, "", 1 );
+        browserConnectionText = BaseWidgetUtils.createReadonlyText( parent, "", 1 );
 
         // Button
         connectionBrowseButton = BaseWidgetUtils.createButton( parent, "B&rowse...",
1 );
@@ -92,12 +92,12 @@
             {
                 // if(selectedConnection != null) {
                 SelectConnectionDialog dialog = new SelectConnectionDialog( parent.getShell(),
"Select Connection",
-                    selectedConnection );
+                    selectedBrowserConnection );
                 dialog.open();
                 IBrowserConnection browserConnection = dialog.getSelectedBrowserConnection();
                 if ( browserConnection != null )
                 {
-                    setConnection( browserConnection );
+                    setBrowserConnection( browserConnection );
                     notifyListeners();
                 }
                 // }
@@ -105,7 +105,7 @@
         } );
 
         // initial values
-        setConnection( selectedConnection );
+        setBrowserConnection( selectedBrowserConnection );
 
     }
 
@@ -115,9 +115,9 @@
      * 
      * @return the connection
      */
-    public IBrowserConnection getConnection()
+    public IBrowserConnection getBrowserConnection()
     {
-        return selectedConnection;
+        return selectedBrowserConnection;
     }
 
 
@@ -126,10 +126,10 @@
      * 
      * @param connection the connection
      */
-    public void setConnection( IBrowserConnection connection )
+    public void setBrowserConnection( IBrowserConnection connection )
     {
-        selectedConnection = connection;
-        connectionText.setText( selectedConnection != null ? selectedConnection.getName()
: "" );
+        selectedBrowserConnection = connection;
+        browserConnectionText.setText( selectedBrowserConnection != null ? selectedBrowserConnection.getName()
: "" );
     }
 
 
@@ -140,7 +140,7 @@
      */
     public void setEnabled( boolean b )
     {
-        connectionText.setEnabled( b );
+        browserConnectionText.setEnabled( b );
         connectionBrowseButton.setEnabled( b );
     }
 

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=573535&r1=573534&r2=573535&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:46:00 2007
@@ -529,16 +529,16 @@
     protected void validate()
     {
 
-        if ( connectionWidget.getConnection() != null )
+        if ( connectionWidget.getBrowserConnection() != null )
         {
             if ( searchBaseWidget.getDn() == null
-                || searchBaseWidget.getConnection() != connectionWidget.getConnection() )
+                || searchBaseWidget.getConnection() != connectionWidget.getBrowserConnection()
)
             {
-                searchBaseWidget.setInput( connectionWidget.getConnection(), null );
+                searchBaseWidget.setInput( connectionWidget.getBrowserConnection(), null
);
             }
         }
 
-        filterWidget.setConnection( connectionWidget.getConnection() );
+        filterWidget.setConnection( connectionWidget.getBrowserConnection() );
 
         super.notifyListeners();
     }
@@ -574,7 +574,7 @@
 
             if ( connectionWidget != null )
             {
-                connectionWidget.setConnection( connection );
+                connectionWidget.setBrowserConnection( connection );
             }
 
             if ( searchBase != null )
@@ -646,10 +646,10 @@
             search.getSearchParameter().setName( searchNameText.getText() );
             searchModified = true;
         }
-        if ( connectionWidget != null && connectionWidget.getConnection() != null
-            && connectionWidget.getConnection() != search.getBrowserConnection()
)
+        if ( connectionWidget != null && connectionWidget.getBrowserConnection()
!= null
+            && connectionWidget.getBrowserConnection() != search.getBrowserConnection()
)
         {
-            search.setConnection( connectionWidget.getConnection() );
+            search.setConnection( connectionWidget.getBrowserConnection() );
             searchModified = true;
         }
         if ( searchBaseWidget != null && searchBaseWidget.getDn() != null
@@ -698,7 +698,7 @@
                     if ( returnOperationalAttributesButton.getSelection() )
                     {
                         AttributeTypeDescription[] opAtds = SchemaUtils
-                            .getOperationalAttributeDescriptions( connectionWidget.getConnection().getSchema()
);
+                            .getOperationalAttributeDescriptions( connectionWidget.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.getConnection() == null
)
+        if ( connectionWidget != null && connectionWidget.getBrowserConnection()
== null )
         {
             return false;
         }
@@ -850,7 +850,7 @@
      */
     public String getErrorMessage()
     {
-        if ( connectionWidget != null && connectionWidget.getConnection() == null
)
+        if ( connectionWidget != null && connectionWidget.getBrowserConnection()
== null )
         {
             return "Please select a connection.";
         }

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=573535&r1=573534&r2=573535&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:46:00 2007
@@ -129,7 +129,7 @@
         {
             public void widgetModified( WidgetModifyEvent event )
             {
-                wizard.setImportConnection( connectionWidget.getConnection() );
+                wizard.setImportConnection( connectionWidget.getBrowserConnection() );
                 validate();
             }
         } );
@@ -275,7 +275,7 @@
             }
         }
 
-        if ( ( wizard.getImportConnection() == null ) || ( connectionWidget.getConnection()
== null ) )
+        if ( ( wizard.getImportConnection() == null ) || ( connectionWidget.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=573535&r1=573534&r2=573535&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:46:00 2007
@@ -211,7 +211,7 @@
         {
             public void widgetModified( WidgetModifyEvent event )
             {
-                wizard.setImportConnection( connectionWidget.getConnection() );
+                wizard.setImportConnection( connectionWidget.getBrowserConnection() );
                 validate();
             }
         } );



Mime
View raw message