Author: michiel
Date: 2009-05-29 15:33:31 +0200 (Fri, 29 May 2009)
New Revision: 35516
Modified:
mmbase/trunk/src/org/mmbase/storage/search/AggregatedField.java
mmbase/trunk/src/org/mmbase/storage/search/CompareFieldsConstraint.java
mmbase/trunk/src/org/mmbase/storage/search/CompositeConstraint.java
mmbase/trunk/src/org/mmbase/storage/search/Constraint.java
mmbase/trunk/src/org/mmbase/storage/search/FieldCompareConstraint.java
mmbase/trunk/src/org/mmbase/storage/search/FieldNullConstraint.java
mmbase/trunk/src/org/mmbase/storage/search/FieldValueBetweenConstraint.java
mmbase/trunk/src/org/mmbase/storage/search/FieldValueConstraint.java
Log:
@Override's, removed modified from entries in an interface (default is public)
Modified: mmbase/trunk/src/org/mmbase/storage/search/AggregatedField.java
===================================================================
--- mmbase/trunk/src/org/mmbase/storage/search/AggregatedField.java
2009-05-29 13:32:32 UTC (rev 35515)
+++ mmbase/trunk/src/org/mmbase/storage/search/AggregatedField.java
2009-05-29 13:33:31 UTC (rev 35516)
@@ -27,25 +27,25 @@
* Aggregation type, resulting in grouping the results on non-null
* values of this field.
*/
- public final static int AGGREGATION_TYPE_GROUP_BY = 1;
+ final static int AGGREGATION_TYPE_GROUP_BY = 1;
/**
* Aggregation type, resulting in count of non-null
* values in this field.
*/
- public final static int AGGREGATION_TYPE_COUNT = 2;
+ final static int AGGREGATION_TYPE_COUNT = 2;
/**
* Aggregation type, resulting in count of distinct non-null
* values in this field.
*/
- public final static int AGGREGATION_TYPE_COUNT_DISTINCT = 3;
+ final static int AGGREGATION_TYPE_COUNT_DISTINCT = 3;
/** Aggregation type, resulting in minimum value in this field. */
- public final static int AGGREGATION_TYPE_MIN = 4;
+ final static int AGGREGATION_TYPE_MIN = 4;
/** Aggregation type, resulting in maximum value in this field. */
- public final static int AGGREGATION_TYPE_MAX = 5;
+ final static int AGGREGATION_TYPE_MAX = 5;
/**
* Search type descriptions corresponding to the search type values:
@@ -61,7 +61,7 @@
/**
* Gets the aggregation type.
*/
- public int getAggregationType();
+ int getAggregationType();
/**
* Compares this aggregated field to the specified object. The result is
@@ -73,7 +73,8 @@
* @return <code>true</code> if the objects are equal,
* <code>false</code> otherwise.
*/
- public boolean equals(Object obj);
+ @Override
+ boolean equals(Object obj);
/**
* Returns a string representation of this AggregatedField.
@@ -96,5 +97,6 @@
*
* @return A string representation of this AggregatedField.
*/
+ @Override
public String toString();
}
\ No newline at end of file
Modified:
mmbase/trunk/src/org/mmbase/storage/search/CompareFieldsConstraint.java
===================================================================
--- mmbase/trunk/src/org/mmbase/storage/search/CompareFieldsConstraint.java
2009-05-29 13:32:32 UTC (rev 35515)
+++ mmbase/trunk/src/org/mmbase/storage/search/CompareFieldsConstraint.java
2009-05-29 13:33:31 UTC (rev 35516)
@@ -44,7 +44,8 @@
*
* @return A string representation of this CompareFieldsConstraint.
*/
- public String toString();
+ @Override
+ String toString();
}
Modified: mmbase/trunk/src/org/mmbase/storage/search/CompositeConstraint.java
===================================================================
--- mmbase/trunk/src/org/mmbase/storage/search/CompositeConstraint.java
2009-05-29 13:32:32 UTC (rev 35515)
+++ mmbase/trunk/src/org/mmbase/storage/search/CompositeConstraint.java
2009-05-29 13:33:31 UTC (rev 35516)
@@ -23,15 +23,15 @@
public interface CompositeConstraint extends Constraint {
/** Logical operator 'and' */
- public final static int LOGICAL_AND = 2;
+ final static int LOGICAL_AND = 2;
/** Logical operator 'or' */
- public final static int LOGICAL_OR = 1;
+ final static int LOGICAL_OR = 1;
/**
* Operator descriptions corresponding to the operator values:
* {...@link #LOGICAL_AND}, and {...@link #LOGICAL_OR}
*/
- public final static String[] LOGICAL_OPERATOR_DESCRIPTIONS = new String[] {
+ final static String[] LOGICAL_OPERATOR_DESCRIPTIONS = new String[]{
null, // not specified
"or",
"and"
@@ -55,10 +55,12 @@
* @return <code>true</code> if the objects are equal,
* <code>false</code> otherwise.
*/
- public boolean equals(Object obj);
+ @Override
+ boolean equals(Object obj);
// javadoc is inherited
- public int hashCode();
+ @Override
+ int hashCode();
/**
* Returns a string representation of this CompositeConstraint.
@@ -77,7 +79,8 @@
*
* @return A string representation of this CompositeConstraint.
*/
- public String toString();
+ @Override
+ String toString();
}
Modified: mmbase/trunk/src/org/mmbase/storage/search/Constraint.java
===================================================================
--- mmbase/trunk/src/org/mmbase/storage/search/Constraint.java 2009-05-29
13:32:32 UTC (rev 35515)
+++ mmbase/trunk/src/org/mmbase/storage/search/Constraint.java 2009-05-29
13:33:31 UTC (rev 35516)
@@ -40,9 +40,11 @@
* @return <code>true</code> if the objects are equal,
* <code>false</code> otherwise.
*/
- public boolean equals(Object obj);
+ @Override
+ boolean equals(Object obj);
// javadoc is inherited
- public int hashCode();
+ @Override
+ int hashCode();
}
Modified: mmbase/trunk/src/org/mmbase/storage/search/FieldCompareConstraint.java
===================================================================
--- mmbase/trunk/src/org/mmbase/storage/search/FieldCompareConstraint.java
2009-05-29 13:32:32 UTC (rev 35515)
+++ mmbase/trunk/src/org/mmbase/storage/search/FieldCompareConstraint.java
2009-05-29 13:33:31 UTC (rev 35516)
@@ -21,28 +21,28 @@
public interface FieldCompareConstraint extends FieldConstraint {
/** Operator 'less than' */
- public final static int LESS = 1;
+ final static int LESS = 1;
/** Operator 'less than or equal' */
- public final static int LESS_EQUAL = 2;
+ final static int LESS_EQUAL = 2;
/** Operator 'equal' */
- public final static int EQUAL = 3;
+ final static int EQUAL = 3;
/** Operator 'not equal' */
- public final static int NOT_EQUAL = 4;
+ final static int NOT_EQUAL = 4;
/** Operator 'greater than' */
- public final static int GREATER = 5;
+ final static int GREATER = 5;
/** Operator 'greater than or equal' */
- public final static int GREATER_EQUAL = 6;
+ final static int GREATER_EQUAL = 6;
/** Operator 'like' */
- public final static int LIKE = 7;
+ final static int LIKE = 7;
- public final static int REGEXP = 8;
+ final static int REGEXP = 8;
/**
* Operator descriptions corresponding to the operator values:
* {...@link #LESS}, {...@link #LESS_EQUAL}, {...@link #EQUAL}, {...@link
#NOT_EQUAL},
* {...@link #GREATER}, {...@link #GREATER_EQUAL}, and {...@link #LIKE}
*/
- public final static String[] OPERATOR_DESCRIPTIONS = new String[] {
+ final static String[] OPERATOR_DESCRIPTIONS = new String[]{
null, // not specified
"less than", "less than or equal", "equal", "not equal",
"greater than", "greater than or equal", "like", "regexp"
Modified: mmbase/trunk/src/org/mmbase/storage/search/FieldNullConstraint.java
===================================================================
--- mmbase/trunk/src/org/mmbase/storage/search/FieldNullConstraint.java
2009-05-29 13:32:32 UTC (rev 35515)
+++ mmbase/trunk/src/org/mmbase/storage/search/FieldNullConstraint.java
2009-05-29 13:33:31 UTC (rev 35516)
@@ -37,6 +37,7 @@
*
* @return A string representation of this FieldNullConstraint.
*/
- public String toString();
+ @Override
+ String toString();
}
Modified:
mmbase/trunk/src/org/mmbase/storage/search/FieldValueBetweenConstraint.java
===================================================================
--- mmbase/trunk/src/org/mmbase/storage/search/FieldValueBetweenConstraint.java
2009-05-29 13:32:32 UTC (rev 35515)
+++ mmbase/trunk/src/org/mmbase/storage/search/FieldValueBetweenConstraint.java
2009-05-29 13:33:31 UTC (rev 35516)
@@ -55,6 +55,7 @@
*
* @return A string representation of this FieldValueInConstraint.
*/
- public String toString();
+ @Override
+ String toString();
}
Modified: mmbase/trunk/src/org/mmbase/storage/search/FieldValueConstraint.java
===================================================================
--- mmbase/trunk/src/org/mmbase/storage/search/FieldValueConstraint.java
2009-05-29 13:32:32 UTC (rev 35515)
+++ mmbase/trunk/src/org/mmbase/storage/search/FieldValueConstraint.java
2009-05-29 13:33:31 UTC (rev 35516)
@@ -58,6 +58,7 @@
*
* @return A string representation of this FieldValueConstraint.
*/
- public String toString();
+ @Override
+ String toString();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
