directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1073551 - in /directory/studio/branches/akarasulu: ./ plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/
Date Tue, 22 Feb 2011 23:41:21 GMT
Author: akarasulu
Date: Tue Feb 22 23:41:21 2011
New Revision: 1073551

URL: http://svn.apache.org/viewvc?rev=1073551&view=rev
Log:
merging in changes from studio trunk

Modified:
    directory/studio/branches/akarasulu/   (props changed)
    directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java
    directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionPropertyPageProvider.java

Propchange: directory/studio/branches/akarasulu/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 22 23:41:21 2011
@@ -1,3 +1,3 @@
 /directory/studio/branches/shared-trunk-merge:1004968-1005876
 /directory/studio/branches/studio-connection-refactoring:1022102-1030058
-/directory/studio/trunk:1066125-1067996,1068027-1072726
+/directory/studio/trunk:1066125-1067996,1068027-1072726,1072812-1073550

Modified: directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java?rev=1073551&r1=1073550&r2=1073551&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java
(original)
+++ directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java
Tue Feb 22 23:41:21 2011
@@ -158,7 +158,6 @@ public class Connection implements Conne
                 case 1:
                     return FOLLOW;
                 case 2:
-                    //return MANAGE;
                     return FOLLOW_MANUALLY;
                 case 3:
                     return FOLLOW_MANUALLY;
@@ -220,36 +219,36 @@ public class Connection implements Conne
 
 
     /**
-     * Gets a JNDI connection wrapper.
+     * Gets the JNDI connection wrapper.
      *
      * @return
-     *      a JNDI connection wrapper
+     *      the JNDI connection wrapper
      */
-    private JNDIConnectionWrapper getJndiConnectionWrapper()
+    private ConnectionWrapper getJndiConnectionWrapper()
     {
         if ( ( connectionWrapper == null ) || !( connectionWrapper instanceof JNDIConnectionWrapper
) )
         {
             connectionWrapper = new JNDIConnectionWrapper( this );
         }
 
-        return ( JNDIConnectionWrapper ) connectionWrapper;
+        return connectionWrapper;
     }
 
 
     /**
-     * Gets a Directory API connection wrapper.
+     * Gets the Directory API connection wrapper.
      *
      * @return
-     *      a Directory API connection wrapper
+     *      the Directory API connection wrapper
      */
-    private DirectoryApiConnectionWrapper getDirectoryApiConnectionWrapper()
+    private ConnectionWrapper getDirectoryApiConnectionWrapper()
     {
         if ( ( connectionWrapper == null ) || !( connectionWrapper instanceof DirectoryApiConnectionWrapper
) )
         {
             connectionWrapper = new DirectoryApiConnectionWrapper( this );
         }
 
-        return ( DirectoryApiConnectionWrapper ) connectionWrapper;
+        return connectionWrapper;
     }
 
 

Modified: directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionPropertyPageProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionPropertyPageProvider.java?rev=1073551&r1=1073550&r2=1073551&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionPropertyPageProvider.java
(original)
+++ directory/studio/branches/akarasulu/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionPropertyPageProvider.java
Tue Feb 22 23:41:21 2011
@@ -27,11 +27,10 @@ import org.eclipse.core.runtime.IAdaptab
 /**
  * Tagging interface for objects that provide input for the connection
  * property page. Implementations must also implement the IAdaptable interface
- * and the getAdaptable() metho must return the right {@link Connection} object. 
+ * and the getAdaptable() method must return the right {@link Connection} object. 
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public interface ConnectionPropertyPageProvider extends IAdaptable
 {
-
 }



Mime
View raw message