directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r188711 - in /directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters: AndFilter.java AndFilterPOJO.java AttributeValueAssertionFilter.java AttributeValueAssertionFilterPOJO.java Filter.java FilterPOJO.java NotFilter.java NotFilterPOJO.java OrFilter.java OrFilterPOJO.java
Date Tue, 07 Jun 2005 06:39:32 GMT
Author: elecharny
Date: Mon Jun  6 23:39:31 2005
New Revision: 188711

URL: http://svn.apache.org/viewcvs?rev=188711&view=rev
Log:
Renamed the objects from xxxPOJO to xxx. Alex, I took the 2 cts you put on the table ;-)

Added:
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilter.java
      - copied, changed from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilterPOJO.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilter.java
      - copied, changed from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilterPOJO.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/Filter.java
      - copied, changed from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/FilterPOJO.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilter.java
      - copied, changed from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilterPOJO.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilter.java
      - copied, changed from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilterPOJO.java
Removed:
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilterPOJO.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilterPOJO.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/FilterPOJO.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilterPOJO.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilterPOJO.java

Copied: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilter.java
(from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilterPOJO.java)
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilter.java?p2=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilter.java&p1=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilterPOJO.java&r1=185059&r2=188711&rev=188711&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilterPOJO.java
(original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AndFilter.java
Mon Jun  6 23:39:31 2005
@@ -23,7 +23,7 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AndFilterPOJO extends FilterPOJO
+public class AndFilter extends Filter
 {
     //~ Instance fields ----------------------------------------------------------------------------
 
@@ -32,7 +32,7 @@
     /**
      * The constructor. We wont initialize the ArrayList as they may not be used. 
      */
-    public AndFilterPOJO()
+    public AndFilter()
     {
         super();
     }

Copied: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilter.java
(from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilterPOJO.java)
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilter.java?p2=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilter.java&p1=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilterPOJO.java&r1=185059&r2=188711&rev=188711&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilterPOJO.java
(original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/AttributeValueAssertionFilter.java
Mon Jun  6 23:39:31 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.asn1.ldap.pojo.filters;
 
-import org.apache.asn1.ldap.pojo.AttributeValueAssertionPOJO;
+import org.apache.asn1.ldap.pojo.AttributeValueAssertion;
 
 
 /**
@@ -24,18 +24,18 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AttributeValueAssertionFilterPOJO extends FilterPOJO
+public class AttributeValueAssertionFilter extends Filter
 {
     //~ Instance fields ----------------------------------------------------------------------------
     /** The assertion. */
-    private AttributeValueAssertionPOJO assertion;
+    private AttributeValueAssertion assertion;
 
     //~ Methods ------------------------------------------------------------------------------------
 
     /**
      * The constructor. 
      */
-    public AttributeValueAssertionFilterPOJO()
+    public AttributeValueAssertionFilter()
     {
     }
     
@@ -44,7 +44,7 @@
      *
      * @return Returns the assertion.
      */
-    public AttributeValueAssertionPOJO getAssertion()
+    public AttributeValueAssertion getAssertion()
     {
         return assertion;
     }
@@ -54,7 +54,7 @@
      *
      * @param assertion The assertion to set.
      */
-    public void setAssertion( AttributeValueAssertionPOJO assertion )
+    public void setAssertion( AttributeValueAssertion assertion )
     {
         this.assertion = assertion;
     }

Copied: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/Filter.java
(from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/FilterPOJO.java)
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/Filter.java?p2=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/Filter.java&p1=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/FilterPOJO.java&r1=185059&r2=188711&rev=188711&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/FilterPOJO.java
(original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/Filter.java
Mon Jun  6 23:39:31 2005
@@ -17,7 +17,7 @@
 package org.apache.asn1.ldap.pojo.filters;
 
 import org.apache.asn1.AbstractPOJO;
-import org.apache.asn1.ldap.pojo.SubstringFilterPOJO;
+import org.apache.asn1.ldap.pojo.SubstringFilter;
 
 import java.util.ArrayList;
 
@@ -27,35 +27,39 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class FilterPOJO extends AbstractPOJO
+public abstract class Filter extends AbstractPOJO
 {
     //~ Instance fields ----------------------------------------------------------------------------
+
     /** The set of filters used by And/Or filters */
     protected ArrayList filterSet;
 
     /** The 'substrings' filter */
-    private SubstringFilterPOJO SubStrings;
+    private SubstringFilter SubStrings;
 
-    //~ Methods ------------------------------------------------------------------------------------
+    //~ Constructors -------------------------------------------------------------------------------
 
     /**
      * The constructor. We wont initialize the ArrayList as they may not be used. 
      */
-    public FilterPOJO()
+    public Filter()
     {
     }
-    
+
+    //~ Methods ------------------------------------------------------------------------------------
+
     /**
      * Add a new Filter to the list.
-     * @param Filter The Filter to add
+     * @param filter The Filter to add
      */
-    public void addFilter( FilterPOJO filter )
+    public void addFilter( Filter filter )
     {
-        if (this.filterSet == null)
+
+        if ( this.filterSet == null )
         {
             this.filterSet = new ArrayList();
         }
-        
+
         this.filterSet.add( filter );
     }
 
@@ -64,7 +68,7 @@
      *
      * @return Returns the subStrings.
      */
-    public SubstringFilterPOJO getSubStrings()
+    public SubstringFilter getSubStrings()
     {
         return SubStrings;
     }
@@ -74,7 +78,7 @@
      *
      * @param subStrings The subStrings to set.
      */
-    public void setSubStrings( SubstringFilterPOJO subStrings )
+    public void setSubStrings( SubstringFilter subStrings )
     {
         SubStrings = subStrings;
     }

Copied: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilter.java
(from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilterPOJO.java)
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilter.java?p2=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilter.java&p1=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilterPOJO.java&r1=185059&r2=188711&rev=188711&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilterPOJO.java
(original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/NotFilter.java
Mon Jun  6 23:39:31 2005
@@ -21,18 +21,18 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class NotFilterPOJO extends FilterPOJO
+public class NotFilter extends Filter
 {
     //~ Instance fields ----------------------------------------------------------------------------
     /** The 'not' filter. */
-    private FilterPOJO notFilter;
+    private Filter notFilter;
 
     //~ Methods ------------------------------------------------------------------------------------
 
     /**
      * The constructor. 
      */
-    public NotFilterPOJO()
+    public NotFilter()
     {
     }
     
@@ -41,7 +41,7 @@
      * (we cannot have many elements).
      * @param Filter The Filter to add
      */
-    public void addFilter( FilterPOJO filter )
+    public void addFilter( Filter filter )
     {
         notFilter = filter;
     }
@@ -51,7 +51,7 @@
      *
      * @return Returns the notFilter.
      */
-    public FilterPOJO getNotFilter()
+    public Filter getNotFilter()
     {
         return notFilter;
     }
@@ -61,7 +61,7 @@
      *
      * @param not The notFilter to set.
      */
-    public void setNotFilter( FilterPOJO notFilter )
+    public void setNotFilter( Filter notFilter )
     {
         this.notFilter = notFilter;
     }

Copied: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilter.java
(from r185059, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilterPOJO.java)
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilter.java?p2=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilter.java&p1=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilterPOJO.java&r1=185059&r2=188711&rev=188711&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilterPOJO.java
(original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/filters/OrFilter.java
Mon Jun  6 23:39:31 2005
@@ -24,7 +24,7 @@
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class OrFilterPOJO extends FilterPOJO
+public class OrFilter extends Filter
 {
     //~ Instance fields ----------------------------------------------------------------------------
 
@@ -33,7 +33,7 @@
     /**
      * The constructor. We wont initialize the ArrayList as they may not be used. 
      */
-    public OrFilterPOJO()
+    public OrFilter()
     {
     }
     



Mime
View raw message