directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r573543 - in /directory/studio/trunk: studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/ studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ stu...
Date Fri, 07 Sep 2007 11:09:53 GMT
Author: seelmann
Date: Fri Sep  7 04:09:53 2007
New Revision: 573543

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

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

Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java?rev=573543&r1=573542&r2=573543&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
Fri Sep  7 04:09:53 2007
@@ -123,10 +123,10 @@
      * 
      * @param rdn the initial RDN
      * @param attributeNames the attribute names that could be selected from drop-down list
-     * @param connection the connection
+     * @param browserConnection the connection
      * @param parentDn the initial parent DN
      */
-    public void setInput( IBrowserConnection connection, String[] attributeNames, RDN rdn,
DN parentDn )
+    public void setInput( IBrowserConnection browserConnection, String[] attributeNames,
RDN rdn, DN parentDn )
     {
         this.attributeNames = attributeNames;
         this.currentRdn = rdn;
@@ -184,7 +184,7 @@
 
         if ( showParent )
         {
-            parentEntryWidget.setInput( connection, currentParentDn );
+            parentEntryWidget.setInput( browserConnection, currentParentDn );
         }
 
         validate();

Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java?rev=573543&r1=573542&r2=573543&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java
Fri Sep  7 04:09:53 2007
@@ -70,7 +70,7 @@
     private Button entryBrowseButton;
 
     /** The connection. */
-    private IBrowserConnection connection;
+    private IBrowserConnection browserConnection;
 
     /** The selected DN. */
     private DN dn;
@@ -84,7 +84,7 @@
      */
     public EntryWidget()
     {
-        this.connection = null;
+        this.browserConnection = null;
         this.dn = null;
     }
 
@@ -92,25 +92,25 @@
     /**
      * Creates a new instance of EntryWidget.
      *
-     * @param connection the connection
+     * @param browserConnection the connection
      * @param dn the initial DN
      */
-    public EntryWidget( IBrowserConnection connection, DN dn )
+    public EntryWidget( IBrowserConnection browserConnection, DN dn )
     {
-        this( connection, dn, null );
+        this( browserConnection, dn, null );
     }
 
 
     /**
      * Creates a new instance of EntryWidget.
      *
-     * @param connection the connection
+     * @param browserConnection the connection
      * @param dn the initial DN
      * @param suffix the suffix
      */
-    public EntryWidget( IBrowserConnection connection, DN dn, DN suffix )
+    public EntryWidget( IBrowserConnection browserConnection, DN dn, DN suffix )
     {
-        this.connection = connection;
+        this.browserConnection = browserConnection;
         this.dn = dn;
         this.suffix = suffix;
     }
@@ -178,16 +178,16 @@
         {
             public void widgetSelected( SelectionEvent e )
             {
-                if ( connection != null )
+                if ( browserConnection != null )
                 {
                     // get root entry
-                    IEntry rootEntry = connection.getRootDSE();
+                    IEntry rootEntry = browserConnection.getRootDSE();
                     if( suffix != null && suffix.getRdns().length > 0 )
                     {
-                        rootEntry = connection.getEntryFromCache( suffix );
+                        rootEntry = browserConnection.getEntryFromCache( suffix );
                         if ( rootEntry == null )
                         {
-                            ReadEntryJob job = new ReadEntryJob( connection, suffix );
+                            ReadEntryJob job = new ReadEntryJob( browserConnection, suffix
);
                             RunnableContextJobAdapter.execute( job );
                             rootEntry = job.getReadEntry();
                         }
@@ -207,10 +207,10 @@
                     IEntry entry = rootEntry;
                     if ( initialDN != null && initialDN.getRdns().length > 0 )
                     {
-                        entry = connection.getEntryFromCache( initialDN );
+                        entry = browserConnection.getEntryFromCache( initialDN );
                         if ( entry == null )
                         {
-                            ReadEntryJob job = new ReadEntryJob( connection, initialDN );
+                            ReadEntryJob job = new ReadEntryJob( browserConnection, initialDN
);
                             RunnableContextJobAdapter.execute( job );
                             entry = job.getReadEntry();
                         }
@@ -279,7 +279,7 @@
     private void internalSetEnabled()
     {
         upButton.setEnabled( dn != null && dn.getParentDn() != null && dnCombo.isEnabled()
);
-        entryBrowseButton.setEnabled( connection != null && dnCombo.isEnabled() );
+        entryBrowseButton.setEnabled( browserConnection != null && dnCombo.isEnabled()
);
     }
 
 
@@ -315,13 +315,13 @@
 
 
     /**
-     * Gets the connection.
+     * Gets the browser connection.
      *
-     * @return the connection
+     * @return the browser connection
      */
-    public IBrowserConnection getConnection()
+    public IBrowserConnection getBrowserConnection()
     {
-        return connection;
+        return browserConnection;
     }
 
 
@@ -329,26 +329,26 @@
      * Sets the input.
      *
      * @param dn the DN
-     * @param connection the connection
+     * @param browserConnection the connection
      */
-    public void setInput( IBrowserConnection connection, DN dn )
+    public void setInput( IBrowserConnection browserConnection, DN dn )
     {
-        setInput( connection, dn, null );
+        setInput( browserConnection, dn, null );
     }
 
 
     /**
      * Sets the input.
      *
-     * @param connection the connection
+     * @param browserConnection the connection
      * @param dn the DN
      * @param suffix the suffix
      */
-    public void setInput( IBrowserConnection connection, DN dn, DN suffix )
+    public void setInput( IBrowserConnection browserConnection, DN dn, DN suffix )
     {
-        if ( this.connection != connection || this.dn != dn || this.suffix != suffix )
+        if ( this.browserConnection != browserConnection || this.dn != dn || this.suffix
!= suffix )
         {
-            this.connection = connection;
+            this.browserConnection = browserConnection;
             this.dn = dn;
             this.suffix = suffix;
             dnChanged();

Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java?rev=573543&r1=573542&r2=573543&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
Fri Sep  7 04:09:53 2007
@@ -75,7 +75,7 @@
     private FilterContentAssistProcessor contentAssistProcessor;
 
     /** The connection. */
-    private IBrowserConnection connection;
+    private IBrowserConnection browserConnection;
 
     /** The inital filter. */
     private String initalFilter;
@@ -87,12 +87,12 @@
     /**
      * Creates a new instance of FilterWidget.
      * 
-     * @param connection the connection
+     * @param browserConnection the connection
      * @param initalFilter the inital filter
      */
-    public FilterWidget( IBrowserConnection connection, String initalFilter )
+    public FilterWidget( IBrowserConnection browserConnection, String initalFilter )
     {
-        this.connection = connection;
+        this.browserConnection = browserConnection;
         this.initalFilter = initalFilter;
     }
 
@@ -103,7 +103,7 @@
      */
     public FilterWidget()
     {
-        this.connection = null;
+        this.browserConnection = null;
         this.initalFilter = null;
     }
 
@@ -158,10 +158,10 @@
         {
             public void widgetSelected( SelectionEvent e )
             {
-                if ( connection != null )
+                if ( browserConnection != null )
                 {
                     FilterDialog dialog = new FilterDialog( parent.getShell(), "Filter Editor",
filterCombo.getText(),
-                        connection );
+                        browserConnection );
                     dialog.open();
                     String filter = dialog.getFilter();
                     if ( filter != null )
@@ -177,7 +177,7 @@
         filterCombo.setItems( history );
 
         // initial values
-        setConnection( connection );
+        setBrowserConnection( browserConnection );
         filterCombo.setText( initalFilter == null ? "(objectClass=*)" : initalFilter );
     }
 
@@ -206,16 +206,16 @@
 
 
     /**
-     * Sets the connection.
+     * Sets the browser connection.
      * 
-     * @param connection the connection
+     * @param browserConnection the browser connection
      */
-    public void setConnection( IBrowserConnection connection )
+    public void setBrowserConnection( IBrowserConnection browserConnection )
     {
-        if ( this.connection != connection )
+        if ( this.browserConnection != browserConnection )
         {
-            this.connection = connection;
-            contentAssistProcessor.setSchema( connection == null ? null : connection.getSchema()
);
+            this.browserConnection = browserConnection;
+            contentAssistProcessor.setSchema( browserConnection == null ? null : browserConnection.getSchema()
);
             filterCPA.setAutoActivationCharacters( contentAssistProcessor
                 .getCompletionProposalAutoActivationCharacters() );
         }

Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java?rev=573543&r1=573542&r2=573543&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java
Fri Sep  7 04:09:53 2007
@@ -54,7 +54,7 @@
     private ReturningAttributesContentAssistProcessor contentAssistProcessor;
 
     /** The connection. */
-    private IBrowserConnection connection;
+    private IBrowserConnection browserConnection;
 
     /** The initial returning attributes. */
     private String[] initialReturningAttributes;
@@ -64,11 +64,11 @@
      * Creates a new instance of ReturningAttributesWidget.
      * 
      * @param initialReturningAttributes the initial returning attributes
-     * @param connection the connection
+     * @param browserConnection the browser  connection
      */
-    public ReturningAttributesWidget( IBrowserConnection connection, String[] initialReturningAttributes
)
+    public ReturningAttributesWidget( IBrowserConnection browserConnection, String[] initialReturningAttributes
)
     {
-        this.connection = connection;
+        this.browserConnection = browserConnection;
         this.initialReturningAttributes = initialReturningAttributes;
     }
 
@@ -80,7 +80,7 @@
      */
     public ReturningAttributesWidget()
     {
-        this.connection = null;
+        this.browserConnection = null;
         this.initialReturningAttributes = null;
     }
 
@@ -125,19 +125,19 @@
             }
         } );
 
-        setConnection( connection );
+        setBrowserConnection( browserConnection );
     }
 
 
     /**
-     * Sets the connection.
+     * Sets the browser connection.
      * 
-     * @param connection the connection
+     * @param browserConnection the browser connection
      */
-    public void setConnection( IBrowserConnection connection )
+    public void setBrowserConnection( IBrowserConnection browserConnection )
     {
-        this.connection = connection;
-        contentAssistProcessor.setPossibleAttributeTypes( connection == null ? new String[0]
: connection.getSchema()
+        this.browserConnection = browserConnection;
+        contentAssistProcessor.setPossibleAttributeTypes( browserConnection == null ? new
String[0] : browserConnection.getSchema()
             .getAttributeTypeDescriptionNames() );
     }
 

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=573543&r1=573542&r2=573543&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 04:09:53 2007
@@ -532,13 +532,13 @@
         if ( browserConnectionWidget.getBrowserConnection() != null )
         {
             if ( searchBaseWidget.getDn() == null
-                || searchBaseWidget.getConnection() != browserConnectionWidget.getBrowserConnection()
)
+                || searchBaseWidget.getBrowserConnection() != browserConnectionWidget.getBrowserConnection()
)
             {
                 searchBaseWidget.setInput( browserConnectionWidget.getBrowserConnection(),
null );
             }
         }
 
-        filterWidget.setConnection( browserConnectionWidget.getBrowserConnection() );
+        filterWidget.setBrowserConnection( browserConnectionWidget.getBrowserConnection()
);
 
         super.notifyListeners();
     }
@@ -584,13 +584,13 @@
 
             if ( filterWidget != null )
             {
-                filterWidget.setConnection( browserConnection );
+                filterWidget.setBrowserConnection( browserConnection );
                 filterWidget.setFilter( search.getFilter() );
             }
 
             if ( returningAttributesWidget != null )
             {
-                returningAttributesWidget.setConnection( browserConnection );
+                returningAttributesWidget.setBrowserConnection( browserConnection );
                 returningAttributesWidget.setInitialReturningAttributes( search.getReturningAttributes()
);
             }
 

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java?rev=573543&r1=573542&r2=573543&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewEntryTypeWizardPage.java
Fri Sep  7 04:09:53 2007
@@ -108,7 +108,7 @@
         }
         else if ( templateButton.getSelection() )
         {
-            setPageComplete( entryWidget.getConnection() != null && entryWidget.getDn()
!= null );
+            setPageComplete( entryWidget.getBrowserConnection() != null && entryWidget.getDn()
!= null );
         }
         else
         {
@@ -140,11 +140,11 @@
     {
         if ( templateButton.getSelection() )
         {
-            final IBrowserConnection connection = entryWidget.getConnection();
+            final IBrowserConnection browserConnection = entryWidget.getBrowserConnection();
             final DN dn = entryWidget.getDn();
             final IEntry[] templateEntries = new IEntry[1];
 
-            if ( connection == null )
+            if ( browserConnection == null )
             {
                 getShell().getDisplay().syncExec( new Runnable()
                 {
@@ -168,7 +168,7 @@
             }
 
             // check if selected DN exists
-            ReadEntryJob readEntryJob = new ReadEntryJob( connection, dn );
+            ReadEntryJob readEntryJob = new ReadEntryJob( browserConnection, dn );
             RunnableContextJobAdapter.execute( readEntryJob, getContainer(), false );
             templateEntries[0] = readEntryJob.getReadEntry();
             if ( templateEntries[0] == null )
@@ -196,7 +196,7 @@
                 EventRegistry.suspendEventFireingInCurrentThread();
 
                 LdifContentRecord record = ModelConverter.entryToLdifContentRecord( templateEntries[0]
);
-                DummyEntry prototypeEntry = ModelConverter.ldifContentRecordToEntry( record,
new DummyConnection( connection.getSchema() ) );
+                DummyEntry prototypeEntry = ModelConverter.ldifContentRecordToEntry( record,
new DummyConnection( browserConnection.getSchema() ) );
                 IAttribute[] attributes = prototypeEntry.getAttributes();
                 for ( int i = 0; i < attributes.length; i++ )
                 {



Mime
View raw message