Author: michiel
Date: 2010-04-20 16:05:14 +0200 (Tue, 20 Apr 2010)
New Revision: 41982
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/RelationStep.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicAggregatedField.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicCompareFieldsConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicDateSortOrder.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueBetweenConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueDateConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueInConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueInQueryConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFunctionValueConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicLegacyConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicRelationStep.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSearchQuery.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSortOrder.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStep.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStepField.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStringSearchConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/ModifiableQuery.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
Log:
@Override's
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/RelationStep.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/RelationStep.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/RelationStep.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -122,7 +122,6 @@
@Override
boolean equals(Object obj);
- // javadoc is inherited
@Override
int hashCode();
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicAggregatedField.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicAggregatedField.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicAggregatedField.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -74,7 +74,6 @@
}
}
- // javadoc is inherited
@Override
public boolean equals(Object obj) {
if (obj instanceof AggregatedField) {
@@ -88,14 +87,12 @@
}
}
- // javadoc is inherited
@Override
public int hashCode() {
return super.hashCode()
+ 149 * aggregationType;
}
- // javadoc is inherited
@Override
public String toString() {
StringBuilder sb = new StringBuilder("AggregatedField(step:");
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicCompareFieldsConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicCompareFieldsConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicCompareFieldsConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -47,13 +47,11 @@
this.field2 = field2;
}
- // javadoc is inherited
@Override
public StepField getField2() {
return field2;
}
- // javadoc is inherited
@Override
public boolean equals(Object obj) {
// Must be same class (subclasses should override this)!
@@ -74,7 +72,6 @@
}
}
- // javadoc is inherited
@Override
public int hashCode() {
return super.hashCode()
@@ -84,7 +81,6 @@
97 * field2.getStep().getAlias().hashCode());
}
- // javadoc is inherited
@Override
public String toString() {
StringBuilder sb = new
StringBuilder("CompareFieldsConstraint(inverse:").append(isInverse()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -47,19 +47,16 @@
return this;
}
- // javadoc is inherited
@Override
public boolean isInverse() {
return inverse;
}
- // javadoc is inherited
@Override
public int getBasicSupportLevel() {
return 3; // TODO SearchQueryHandler.SUPPORT_OPTIMAL;
}
- // javadoc is inherited
@Override
public boolean equals(Object obj) {
// Must be same class (subclasses should override this)!
@@ -71,7 +68,6 @@
}
}
- // javadoc is inherited
@Override
public int hashCode() {
return (inverse? 0: 107);
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicDateSortOrder.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicDateSortOrder.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicDateSortOrder.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -55,7 +55,6 @@
part = p;
}
- // javadoc is inherited
@Override
public boolean equals(Object obj) {
if (obj instanceof DateSortOrder) {
@@ -66,13 +65,11 @@
}
}
- // javadoc is inherited
@Override
public int hashCode() {
return super.hashCode() + part * 117;
}
- // javadoc is inherited
@Override
public String toString() {
return "DateSortOrder(field:" +
BasicStepField.getFieldName(getField()) + ", dir:" + getDirectionDescription() +
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueBetweenConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueBetweenConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueBetweenConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -78,17 +78,17 @@
return this;
}
- // javadoc is inherited
+ @Override
public Object getLowerLimit() {
return lowerLimit;
}
- // javadoc is inherited
- public Object getUpperLimit() {
+ @Override
+ public Object getUpperLimit() {
return upperLimit;
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -108,14 +108,14 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return 101 * (lowerLimit.hashCode()
+ 97 * (upperLimit.hashCode()
+ 89 * super.hashCode()));
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("FieldValueBetweenConstraint(inverse:").append(isInverse()).
append(", field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -54,12 +54,12 @@
return this;
}
- // javadoc is inherited
+ @Override
public Object getValue() {
return value;
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
// Must be same class (subclasses should override this)!
if (obj != null && obj.getClass() == getClass()) {
@@ -77,13 +77,13 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return super.hashCode()
+ (value == null? 0: value.hashCode());
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("BasicFieldValueConstraint(inverse:").append(isInverse()).
append(", field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueDateConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueDateConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueDateConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -42,6 +42,7 @@
setPart(part);
}
+ @Override
public int getPart() {
return part;
}
@@ -62,17 +63,18 @@
part = p;
}
- // javadoc is inherited
+ @Override
+ @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
public boolean equals(Object obj) {
return super.equals(obj) && ((FieldValueDateConstraint)obj).getPart()
== part;
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return super.hashCode() + part * 117;
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("BasicFieldValueDateConstraint(inverse:").append(isInverse()).
append(", field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueInConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueInConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueInConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -48,12 +48,12 @@
return this;
}
- // javadoc is inherited
+ @Override
public SortedSet<Object> getValues() {
return Collections.unmodifiableSortedSet(values);
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -72,13 +72,13 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return super.hashCode()
+ 89 * values.hashCode();
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("FieldValueInConstraint(inverse:").append(isInverse()).
append(", field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueInQueryConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueInQueryConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldValueInQueryConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -9,7 +9,6 @@
*/
package org.mmbase.storage.search.implementation;
-import java.util.*;
import org.mmbase.storage.search.*;
/**
@@ -37,11 +36,13 @@
}
+ @Override
public SearchQuery getInQuery() {
return query;
}
// javadoc is inherited
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -60,13 +61,13 @@
}
}
- // javadoc is inherited
- public int hashCode() {
+ @Override
+ public int hashCode() {
return super.hashCode()
+ 89 * query.hashCode();
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("FieldValueInConstraint(inverse:").append(isInverse()).
append(", field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFunctionValueConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFunctionValueConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFunctionValueConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -35,6 +35,7 @@
}
}
+ @Override
public String getFunction() {
if (log.isDebugEnabled()) {
log.debug("for field(" + getField() + ") and object(" + getValue()
+ "): getting function(" + function + ")");
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicLegacyConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicLegacyConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicLegacyConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -63,12 +63,12 @@
return this;
}
- // javadoc is inherited
+ @Override
public String getConstraint() {
return constraint;
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
// Must be same class (subclasses should override this)!
if (obj != null && obj.getClass() == getClass()) {
@@ -79,12 +79,12 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return 31 * (constraint.hashCode() + super.hashCode());
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("LegacyConstraint(inverse:").append(isInverse()).
append(", constraint:").append(getConstraint()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicRelationStep.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicRelationStep.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicRelationStep.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -109,12 +109,12 @@
return this;
}
- // javadoc is inherited
+ @Override
public boolean getCheckedDirectionality() {
return checkedDirectionality;
}
- // javadoc is inherited
+ @Override
public int getDirectionality() {
return directionality;
}
@@ -130,12 +130,11 @@
}
}
- // javadoc is inherited
+ @Override
public Integer getRole() {
return role;
}
- // javadoc is inherited
public String getRoleDescription() {
String roleName = "reldef:" + role;
/*
@@ -149,17 +148,17 @@
return roleName;
}
- // javadoc is inherited
+ @Override
public Step getPrevious() {
return previous;
}
- // javadoc is inherited
+ @Override
public Step getNext() {
return next;
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -176,7 +175,7 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return 41 * (getTableName().hashCode()
+ 43 * ( (alias != null ? alias.hashCode() : 0)
@@ -185,7 +184,7 @@
+ 31 * (role != null ?
role.intValue() : 0)))));
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("RelationStep(tablename:").append(getTableName()).
append(", alias:").append(getAlias()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSearchQuery.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSearchQuery.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSearchQuery.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -11,7 +11,6 @@
import java.util.*;
import org.mmbase.bridge.Field;
-import org.mmbase.bridge.NodeManager;
import org.mmbase.cache.CachePolicy;
import org.mmbase.storage.search.*;
import org.mmbase.util.SizeMeasurable;
@@ -117,6 +116,7 @@
}
+ @Override
public BasicSearchQuery clone() {
try {
BasicSearchQuery clone = (BasicSearchQuery) super.clone();
@@ -534,53 +534,55 @@
this.constraint = constraint;
}
- // javadoc is inherited
+ @Override
public boolean isDistinct() {
return distinct;
}
- // javadoc is inherited
+ @Override
public boolean isAggregating() {
return aggregating;
}
- // javadoc is inherited
+ @Override
public List<SortOrder> getSortOrders() {
// return as unmodifiable list
return Collections.unmodifiableList(sortOrders);
}
- // javadoc is inherited
+ @Override
public List<Step> getSteps() {
return unmodifiableSteps;
}
- // javadoc is inherited
+ @Override
public List<StepField> getFields() {
// return as unmodifiable list
return Collections.unmodifiableList(fields);
}
- // javadoc is inherited
+ @Override
public Constraint getConstraint() {
return constraint;
}
- // javadoc is inherited
+ @Override
public int getMaxNumber() {
return maxNumber;
}
- //javadoc is inherited
+ @Override
public int getOffset() {
return offset;
}
+ @Override
public CachePolicy getCachePolicy() {
return cachePolicy;
}
+ @Override
public void setCachePolicy(CachePolicy policy) {
if (! modifiable) throw new IllegalStateException("Unmodifiable");
this.cachePolicy = policy;
@@ -597,6 +599,7 @@
/**
* @since MMBase-1.9.2
*/
+ @Override
public boolean markUsed() {
boolean wasModifiable = modifiable;
modifiable = false;
@@ -670,10 +673,12 @@
return sb.toString();
}
+ @Override
public int getByteSize() {
return getByteSize(new SizeOf());
}
+ @Override
public int getByteSize(SizeOf sizeof) {
int size = 47;
size += 21 * steps.size(); // 21: Size of a BasicStep
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSortOrder.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSortOrder.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicSortOrder.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -46,6 +46,7 @@
/**
* @since MMBase-1.9.2
*/
+ @Override
public void setUnmodifiable() {
modifiable = false;
}
@@ -67,12 +68,12 @@
return this;
}
- // javadoc is inherited
+ @Override
public StepField getField() {
return field;
}
- // javadoc is inherited
+ @Override
public int getDirection() {
return direction;
}
@@ -88,6 +89,7 @@
}
}
+ @Override
public boolean isCaseSensitive() {
return caseSensitive;
}
@@ -100,7 +102,7 @@
return this;
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
if (obj instanceof SortOrder) {
SortOrder order = (SortOrder) obj;
@@ -115,7 +117,7 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
String alias = field.getStep().getAlias();
return
@@ -123,7 +125,7 @@
+ 67 * (alias != null ? alias.hashCode() : 1) + 103 * direction +
(caseSensitive ? 13 : 0);
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("SortOrder(field:").append(BasicStepField.getFieldName(getField())).
append(", dir:").append(getDirectionDescription()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStep.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStep.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStep.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -70,6 +70,7 @@
* @return This <code>BasicStep</code> instance.
* @throws IllegalArgumentException when an invalid argument is supplied.
*/
+ @Override
public Step addNode(int nodeNumber) {
if (! modifiable) throw new IllegalStateException();
if (nodes == null) {
@@ -90,22 +91,22 @@
}
*/
- // javadoc is inherited
+ @Override
public String getTableName() {
return builder;
}
- // javadoc is inherited
+ @Override
public String getAlias() {
return alias;
}
- // javadoc is inherited
+ @Override
public SortedSet<Integer> getNodes() {
return nodes == null ? null : (modifiable ? nodes :
Collections.unmodifiableSortedSet(nodes));
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -120,13 +121,13 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return 41 * builder.hashCode()
+ (alias == null? 0: 43 * alias.hashCode()) + 47 * (nodes == null
? 1 : nodes.hashCode());
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("Step(tablename:").append(getTableName()).
append(", alias:").append(alias).
@@ -135,6 +136,7 @@
return sb.toString();
}
+ @Override
public void setUnmodifiable() {
modifiable = false;
}
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStepField.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStepField.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStepField.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -170,6 +170,7 @@
/**
* @since MMBase-1.9.2
*/
+ @Override
public void setUnmodifiable() {
modifiable = false;
}
@@ -200,22 +201,22 @@
return field;
}
- // javadoc is inherited
+ @Override
public final String getFieldName() {
return field.getName();
}
- // javadoc is inherited
- public String getAlias() {
+ @Override
+ public String getAlias() {
return alias;
}
- // javadoc is inherited
+ @Override
public Step getStep() {
return step;
}
- // javadoc in inherited
+ @Override
public int getType() {
return field.getType();
}
@@ -296,11 +297,11 @@
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- Step step = getStep();
- if (step == null) {
+ Step s = getStep();
+ if (s == null) {
sb.append("null");
} else {
- String stepAlias = step.getAlias();
+ String stepAlias = s.getAlias();
if (stepAlias == null) {
sb.append(getStep().getTableName());
} else {
@@ -308,17 +309,19 @@
}
}
sb.append(".").append(getFieldName());
- String alias = getAlias();
- if (alias != null) {
- sb.append(" as ").append(alias);
+ String a = getAlias();
+ if (a != null) {
+ sb.append(" as ").append(a);
}
return sb.toString();
}
+ @Override
public int getByteSize() {
return getByteSize(new SizeOf());
}
+ @Override
public int getByteSize(SizeOf sizeof) {
int size = 21;
size += sizeof.sizeof(alias);
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStringSearchConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStringSearchConstraint.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicStringSearchConstraint.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -240,12 +240,12 @@
return this;
}
- // javadoc is inherited
+ @Override
public Map<String,Object> getParameters() {
return Collections.unmodifiableMap(parameters);
}
- // javadoc is inherited
+ @Override
public int getMatchType() {
return matchType;
}
@@ -261,7 +261,7 @@
}
}
- // javadoc is inherited
+ @Override
public int getSearchType() {
return searchType;
}
@@ -277,18 +277,18 @@
}
}
- // javadoc is inherited
+ @Override
public List<String> getSearchTerms() {
return Collections.unmodifiableList(searchTerms);
}
- // javadoc is inherited
+ @Override
public int getBasicSupportLevel() {
// no basic support
return 0; //SearchQueryHandler.SUPPORT_NONE;
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
// Must be same class (subclasses should override this)!
if (obj != null && obj.getClass() == getClass()) {
@@ -307,7 +307,7 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return super.hashCode()
+ 117 * searchType
@@ -316,7 +316,7 @@
+ 137 + searchTerms.hashCode();
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("StringSearchConstraint(inverse:").append(isInverse()).
append("field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/ModifiableQuery.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/ModifiableQuery.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/ModifiableQuery.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -203,7 +203,7 @@
return this;
}
- // javadoc is inherited
+ @Override
public int getMaxNumber() {
if (maxNumber != -1) {
return maxNumber;
@@ -212,7 +212,7 @@
}
}
- // javadoc is inherited
+ @Override
public int getOffset() {
if (offset != -1) {
return offset;
@@ -221,7 +221,7 @@
}
}
- // javadoc is inherited
+ @Override
public Constraint getConstraint() {
if (constraint != null) {
return constraint;
@@ -230,7 +230,7 @@
}
}
- // javadoc is inherited
+ @Override
public List<StepField> getFields() {
if (fields != null) {
return fields;
@@ -239,7 +239,7 @@
}
}
- // javadoc is inherited
+ @Override
public List<SortOrder> getSortOrders() {
if (sortOrders != null) {
return sortOrders;
@@ -248,7 +248,7 @@
}
}
- // javadoc is inherited
+ @Override
public List<Step> getSteps() {
if (steps != null) {
return steps;
@@ -257,7 +257,7 @@
}
}
- // javadoc is inherited
+ @Override
public boolean isDistinct() {
if (distinct != null) {
return distinct.booleanValue();
@@ -266,7 +266,7 @@
}
}
- // javadoc is inherited
+ @Override
public boolean isAggregating() {
if (aggregating != null) {
return aggregating.booleanValue();
@@ -275,6 +275,7 @@
}
}
+ @Override
public CachePolicy getCachePolicy() {
if (cachePolicy != null) {
return cachePolicy;
@@ -284,6 +285,7 @@
}
}
+ @Override
public void setCachePolicy(CachePolicy policy) {
if (! modifiable) throw new IllegalStateException("Unmodifiable");
this.cachePolicy = policy;
@@ -294,22 +296,23 @@
* {...@inheritdoc}
* Should correspond to {...@link BasicSearchQuery#equals}
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
}
if (obj instanceof SearchQuery) {
- SearchQuery query = (SearchQuery) obj;
- Constraint constraint = getConstraint();
- return isDistinct() == query.isDistinct()
- && getMaxNumber() == query.getMaxNumber()
- && getOffset() == query.getOffset()
- && getSteps().equals(query.getSteps())
- && getFields().equals(query.getFields())
- && getSortOrders().equals(query.getSortOrders())
- && (constraint == null?
- query.getConstraint() == null:
- constraint.equals(query.getConstraint()));
+ SearchQuery q = (SearchQuery) obj;
+ Constraint con = getConstraint();
+ return isDistinct() == q.isDistinct()
+ && getMaxNumber() == q.getMaxNumber()
+ && getOffset() == q.getOffset()
+ && getSteps().equals(q.getSteps())
+ && getFields().equals(q.getFields())
+ && getSortOrders().equals(q.getSortOrders())
+ && (con == null?
+ q.getConstraint() == null:
+ con.equals(q.getConstraint()));
} else {
return false;
}
@@ -319,17 +322,18 @@
* {...@inheritdoc}
* Should correspond to {...@link BasicSearchQuery#hashCode}
*/
+ @Override
public int hashCode() {
- Constraint constraint = getConstraint();
+ Constraint con = getConstraint();
return (isDistinct()? 0: 101)
+ getMaxNumber() * 17 + getOffset() * 19
+ 23 * getSteps().hashCode()
+ 29 * getFields().hashCode()
+ 31 * getSortOrders().hashCode()
- + 37 * (constraint == null ? 0 : constraint.hashCode());
+ + 37 * (con == null ? 0 : con.hashCode());
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("ModifiableSearchQuery(distinct:").append(isDistinct()).
append(", steps:").append(getSteps()).
@@ -342,6 +346,7 @@
return sb.toString();
}
+ @Override
public boolean markUsed() {
boolean wasUsed = !modifiable;
query.markUsed();
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
2010-04-20 14:02:03 UTC (rev 41981)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/NodeSearchQuery.java
2010-04-20 14:05:14 UTC (rev 41982)
@@ -10,7 +10,6 @@
package org.mmbase.storage.search.implementation;
import java.util.*;
-import org.mmbase.core.*;
import org.mmbase.bridge.*;
import org.mmbase.storage.search.*;
@@ -82,11 +81,13 @@
}
*/
+ @Override
protected void copySteps(SearchQuery q) {
// no need, can be done by clone
}
+ @Override
protected void copyFields(SearchQuery q) {
// no need, can be done by clone
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
