directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r441567 - in /directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages: ConcreteControl.java Control.java
Date Fri, 08 Sep 2006 16:51:30 GMT
Author: elecharny
Date: Fri Sep  8 09:51:29 2006
New Revision: 441567

URL: http://svn.apache.org/viewvc?view=rev&rev=441567
Log:
Renamed the Control class to ConcreteClass to avoid a collision with the javax.naming.Control
interface

Added:
    directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/ConcreteControl.java
      - copied, changed from r441459, directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/Control.java
Removed:
    directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/Control.java

Copied: directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/ConcreteControl.java
(from r441459, directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/Control.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/ConcreteControl.java?view=diff&rev=441567&p1=directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/Control.java&r1=441459&p2=directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/ConcreteControl.java&r2=441567
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/Control.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/messages/ConcreteControl.java
Fri Sep  8 09:51:29 2006
@@ -19,9 +19,16 @@
  */
 package org.apache.directory.shared.ldap.messages;
 
+import javax.naming.ldap.Control;
+
 import org.apache.directory.shared.ldap.utils.StringTools;
 
-public class Control implements javax.naming.ldap.Control {
+/**
+ * A concrete instance of a Control.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class ConcreteControl implements Control {
     /**
      * Declares the Serial Version Uid.
      *
@@ -157,14 +164,14 @@
     }
 
     /**
-     * Return a String representing a Control
+     * Return a String representing a ConcreteControl
      */
     public String toString()
     {
         StringBuffer sb = new StringBuffer();
 
-        sb.append( "    Control\n" );
-        sb.append( "        Control type : '" ).append( controlType != null ? controlType.toString()
: "null" ).append(
+        sb.append( "    ConcreteControl\n" );
+        sb.append( "        ConcreteControl type : '" ).append( controlType != null ? controlType.toString()
: "null" ).append(
             "'\n" );
         sb.append( "        Criticality : '" ).append( criticality ).append( "'\n" );
 
@@ -172,12 +179,12 @@
         {
             if ( controlValue instanceof byte[] )
             {
-                sb.append( "        Control value : '" ).append( StringTools.dumpBytes( (
byte[] ) controlValue ) )
+                sb.append( "        ConcreteControl value : '" ).append( StringTools.dumpBytes(
( byte[] ) controlValue ) )
                     .append( "'\n" );
             }
             else
             {
-                sb.append( "        Control value : '" ).append( controlValue ).append( "'\n"
);
+                sb.append( "        ConcreteControl value : '" ).append( controlValue ).append(
"'\n" );
             }
         }
 



Mime
View raw message