Author: michiel
Date: 2010-04-20 13:54:02 +0200 (Tue, 20 Apr 2010)
New Revision: 41969
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/Fields.java
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/implementation/BasicField.java
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/mock/AggregatedQueryHandler.java
mmbase/trunk/bridge/src/main/java/org/mmbase/cache/CacheManager.java
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/BinaryDataType.java
mmbase/trunk/bridge/src/main/java/org/mmbase/framework/ErrorRenderer.java
mmbase/trunk/bridge/src/main/java/org/mmbase/framework/basic/BasicUrlConverter.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/BridgeClusterQueries.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/QueryContext.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/BasicCompositeConstraint.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/BasicFieldCompareConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldNullConstraint.java
mmbase/trunk/bridge/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
Log:
@Overrids', evaluated some TODO's
Modified: mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/Fields.java
===================================================================
--- mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/Fields.java
2010-04-20 11:23:20 UTC (rev 41968)
+++ mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/Fields.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -87,9 +87,8 @@
*/
public static int getType(String type) {
if (type == null) return Field.TYPE_UNKNOWN;
- // XXX: deprecated VARCHAR
type = type.toUpperCase();
- if (type.equals("VARCHAR")) return Field.TYPE_STRING;
+ if (type.equals("VARCHAR")) return Field.TYPE_STRING; // deprecated
if (type.equals("STRING")) return Field.TYPE_STRING;
if (type.equals("XML")) return Field.TYPE_XML;
if (type.equals("INTEGER")) return Field.TYPE_INTEGER;
@@ -216,6 +215,7 @@
/**
* Compare two objects.
*/
+ @Override
public int compare(Field o1, Field o2) {
int pos1 = getPos(o1);
int pos2 = getPos(o2);
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/implementation/BasicField.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/implementation/BasicField.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/implementation/BasicField.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -37,6 +37,7 @@
return nodeManager;
}
+ @Override
public int compareTo(Field f) {
int compared = getName().compareTo(f.getName());
if (compared == 0) compared = getDataType().compareTo(f.getDataType());
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/mock/AggregatedQueryHandler.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/mock/AggregatedQueryHandler.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/mock/AggregatedQueryHandler.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -31,6 +31,7 @@
}
+ @Override
public List<Map<String, Object>> getRecords(Query query) {
if (query.getSteps().size() == 1 && query.getFields().size() == 1) {
StepField field = query.getFields().get(0);
Modified: mmbase/trunk/bridge/src/main/java/org/mmbase/cache/CacheManager.java
===================================================================
--- mmbase/trunk/bridge/src/main/java/org/mmbase/cache/CacheManager.java
2010-04-20 11:23:20 UTC (rev 41968)
+++ mmbase/trunk/bridge/src/main/java/org/mmbase/cache/CacheManager.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -72,6 +72,7 @@
if (instance == null) {
instance = new CacheManager();
ThreadPools.jobsExecutor.execute(new Runnable() {
+ @Override
public void run() {
ObjectName on;
@@ -163,11 +164,12 @@
private static ThreadPoolExecutor cachePutter = new ThreadPoolExecutor(0,
1, 2 , TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new
ThreadFactory() {
- public Thread newThread(Runnable r) {
- return ThreadPools.newThread(r, "CachePutter");
- }
- });
-/* static {
+ @Override
+ public Thread newThread(Runnable r) {
+ return ThreadPools.newThread(r, "CachePutter");
+ }
+ });
+ /* static {
cachePutter.allowCoreThreadTimeOut(true);
}
*/
@@ -186,18 +188,19 @@
log.error(t.getMessage(), t);
}
Runnable run = new Runnable() {
- public void run() {
- ObjectName name = getObjectName(cache, true);
- try {
- MBeanServer mbs =
ManagementFactory.getPlatformMBeanServer();
- mbs.registerMBean(cache, name);
- } catch (JMException jmo) {
- log.warn("" + name + " " + jmo.getClass() + " " +
jmo.getMessage());
- } catch (Throwable t) {
- log.error("" + name + " " + t.getClass() + " " +
t.getMessage());
- }
+ @Override
+ public void run() {
+ ObjectName name = getObjectName(cache, true);
+ try {
+ MBeanServer mbs =
ManagementFactory.getPlatformMBeanServer();
+ mbs.registerMBean(cache, name);
+ } catch (JMException jmo) {
+ log.warn("" + name + " " + jmo.getClass() + " " +
jmo.getMessage());
+ } catch (Throwable t) {
+ log.error("" + name + " " + t.getClass() + " " +
t.getMessage());
}
- };
+ }
+ };
if (org.mmbase.bridge.ContextProvider.getDefaultCloudContext().isUp())
{
run.run();
} else {
@@ -267,27 +270,25 @@
if (only != null && ! only.equals(cacheName)) {
continue;
}
- // TODO: fix again when everybody runs 1.5.0_08, because of
- // generics bug
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4916620
- Cache cache = getCache(cacheName);
+ Cache<?, ?> cache = getCache(cacheName);
if (cache == null) {
log.service("No cache " + cacheName + " is present (perhaps
not used yet?)");
} else {
- String clazz =
xmlReader.getElementValue(xmlReader.getElementByPath(cacheElement,
"cache.implementation.class"));
+ String clazz =
DocumentReader.getElementValue(DocumentReader.getElementByPath(cacheElement,
"cache.implementation.class"));
if(!"".equals(clazz)) {
- Element cacheImpl =
xmlReader.getElementByPath(cacheElement, "cache.implementation");
+ Element cacheImpl =
DocumentReader.getElementByPath(cacheElement, "cache.implementation");
Map<String,String> configValues = new
HashMap<String,String>();
- for (Element attrNode:
xmlReader.getChildElements(cacheImpl, "param")) {
+ for (Element attrNode:
DocumentReader.getChildElements(cacheImpl, "param")) {
String paramName =
xmlReader.getElementAttributeValue(attrNode, "name");
- String paramValue =
xmlReader.getElementValue(attrNode);
+ String paramValue =
DocumentReader.getElementValue(attrNode);
configValues.put(paramName, paramValue);
}
cache.setImplementation(clazz, configValues);
}
- String status =
xmlReader.getElementValue(xmlReader.getElementByPath(cacheElement,
"cache.status"));
+ String status =
DocumentReader.getElementValue(DocumentReader.getElementByPath(cacheElement,
"cache.status"));
cache.setActive(status.equalsIgnoreCase("active"));
try {
- Integer size =
Integer.valueOf(xmlReader.getElementValue(xmlReader.getElementByPath(cacheElement,
"cache.size")));
+ Integer size =
Integer.valueOf(DocumentReader.getElementValue(DocumentReader.getElementByPath(cacheElement,
"cache.size")));
cache.setMaxSize(size.intValue());
log.service("Setting " + cacheName + " " + status + " with
size " + size);
} catch (NumberFormatException nfe) {
@@ -295,7 +296,7 @@
} catch (Throwable t) {
log.error(" " + cacheName + " maxsize " + t.getMessage());
}
- String maxSize =
xmlReader.getElementValue(xmlReader.getElementByPath(cacheElement,
"cache.maxEntrySize"));
+ String maxSize =
DocumentReader.getElementValue(DocumentReader.getElementByPath(cacheElement,
"cache.maxEntrySize"));
if (!"".equals(maxSize)) {
try {
cache.maxEntrySize = Integer.parseInt(maxSize);
@@ -345,18 +346,19 @@
* be changed which causes the caches to be reconfigured automaticly.
*/
private static ResourceWatcher configWatcher = new ResourceWatcher () {
- public void onChange(String resource) {
- try {
- org.xml.sax.InputSource is =
ResourceLoader.getConfigurationRoot().getInputSource(resource);
- log.service("Reading " + is.getSystemId());
- configReader = new DocumentReader(is, Cache.class);
- } catch (Exception e) {
- log.warn(e.getClass() + " " + e.getMessage());
- return;
- }
- configure(configReader);
+ @Override
+ public void onChange(String resource) {
+ try {
+ org.xml.sax.InputSource is =
ResourceLoader.getConfigurationRoot().getInputSource(resource);
+ log.service("Reading " + is.getSystemId());
+ configReader = new DocumentReader(is, Cache.class);
+ } catch (Exception e) {
+ log.warn(e.getClass() + " " + e.getMessage());
+ return;
}
- };
+ configure(configReader);
+ }
+ };
static { // configure
try {
@@ -440,6 +442,7 @@
/**
* @since MMBase-1.9.1
*/
+ @Override
public String clear(String pattern) {
if (pattern == null) pattern = ".*";
StringBuilder buf = new StringBuilder();
@@ -456,6 +459,7 @@
/**
* @since MMBase-1.9.1
*/
+ @Override
public String enable(String pattern) {
if (pattern == null) pattern = ".*";
StringBuilder buf = new StringBuilder();
@@ -478,6 +482,7 @@
/**
* @since MMBase-1.9.1
*/
+ @Override
public String disable(String pattern) {
if (pattern == null) pattern = ".*";
StringBuilder buf = new StringBuilder();
@@ -500,6 +505,7 @@
/**
* @since MMBase-1.9.1
*/
+ @Override
public String readConfiguration() {
configWatcher.onChange("caches.xml");
return "Read " +
ResourceLoader.getConfigurationRoot().getResource("caches.xml");
@@ -532,6 +538,7 @@
public int getSize() { return cache.size(); }
public double getRatio() { return cache.getRatio(); }
public String getStats() { return cache.getStats(); }
+ @Override
public String toString() { return cache.toString(); }
public boolean isActive() { return cache.isActive(); }
public int getByteSize() { return cache.getByteSize(); }
@@ -545,21 +552,27 @@
public Map<K, V> getMap() { return cache; }
public Map<K, Integer> getCounts() {
return new AbstractMap<K, Integer>() {
+ @Override
public Set<Map.Entry<K, Integer>> entrySet() {
return new AbstractSet<Map.Entry<K, Integer>>() {
+ @Override
public int size() {
return cache.size();
}
+ @Override
public Iterator<Map.Entry<K, Integer>> iterator() {
return new Iterator<Map.Entry<K, Integer>>() {
private Iterator<K> iterator =
Bean.this.getKeySet().iterator();
+ @Override
public boolean hasNext() {
return iterator.hasNext();
}
+ @Override
public Map.Entry<K, Integer> next() {
K key = iterator.next();
return new org.mmbase.util.Entry<K,
Integer>(key, cache.getCount(key));
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -569,12 +582,15 @@
}
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof Bean && ((Bean) o).cache.equals(cache);
}
+ @Override
public int hashCode() {
return cache.hashCode();
}
+ @Override
public int compareTo(Bean<?, ?> bean) {
return getName().compareTo(bean.getName());
}
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/BinaryDataType.java
===================================================================
--- mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/BinaryDataType.java
2010-04-20 11:23:20 UTC (rev 41968)
+++ mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/BinaryDataType.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -10,7 +10,6 @@
package org.mmbase.datatypes;
import org.mmbase.util.logging.*;
-import org.mmbase.util.SerializableInputStream;
import org.mmbase.bridge.*;
import org.mmbase.util.*;
import org.mmbase.util.magicfile.MagicFile;
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/framework/ErrorRenderer.java
===================================================================
--- mmbase/trunk/bridge/src/main/java/org/mmbase/framework/ErrorRenderer.java
2010-04-20 11:23:20 UTC (rev 41968)
+++ mmbase/trunk/bridge/src/main/java/org/mmbase/framework/ErrorRenderer.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -26,9 +26,6 @@
/**
* If rendering of a {...@link Block} fails for some reason this renderer
should be used to present the error.
*
- * @todo Its workings are similar to /mmbase/errorpages/500.jsp, and we should
consider that these two
- * share code.
- *
* @author Michiel Meeuwissen
* @version $Id$
* @since MMBase-1.9
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/framework/basic/BasicUrlConverter.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/framework/basic/BasicUrlConverter.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/framework/basic/BasicUrlConverter.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -118,10 +118,12 @@
/**
* This URLConverter can work on any url, so is wlays in 'filtered' mode'.
*/
+ @Override
public boolean isFilteredMode(Parameters frameworkParameters) throws
FrameworkException {
return true;
}
+ @Override
public int getDefaultWeight() {
return Integer.MIN_VALUE + 1000;
}
@@ -139,6 +141,7 @@
* @todo Actually these parameters are only added here, because this
urlconverter is always in
* BasicFramework. Actually BasicFramework should add them itself.
*/
+ @Override
public Parameter<?>[] getParameterDefinition() {
return DEF;
}
@@ -213,17 +216,20 @@
}
+ @Override
public Url getUrl(String path,
Map<String, ?> parameters,
Parameters frameworkParameters, boolean
escapeAmps) {
return new BasicUrl(this, getUrl(path, parameters,
frameworkParameters, escapeAmps, false));
}
+ @Override
public Url getProcessUrl(String path,
Map<String, ?> parameters,
Parameters frameworkParameters, boolean
escapeAmps) {
return new BasicUrl(this, getUrl(path, parameters,
frameworkParameters, escapeAmps, true));
}
+ @Override
public Url getInternalUrl(String page, Map<String, ?> params, Parameters
frameworkParameters) {
HttpServletRequest request =
frameworkParameters.get(Parameter.REQUEST);
return new BasicUrl(this, BasicUrlConverter.getUrl(page, params,
request, false));
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/BridgeClusterQueries.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/BridgeClusterQueries.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/BridgeClusterQueries.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -19,6 +19,7 @@
* @since MMBase-2.0
*/
public class BridgeClusterQueries extends ClusterQueries {
+ private static final Logger LOG =
Logging.getLoggerInstance(BridgeClusterQueries.class);
private final QueryContext.Bridge queryContext;
public BridgeClusterQueries(QueryContext.Bridge qc) {
this.queryContext = qc;
@@ -83,7 +84,8 @@
@Override
protected boolean optimizeRelationStep(RelationStep rs, int sourceType,
int destType, int role, int searchDir) {
- // TODO
+ // TODO implement optimizeRelationStep
+ LOG.warn("TODO Not yet implemented");
return false;
}
@@ -110,6 +112,7 @@
throw new UnsupportedOperationException("Not supported yet.");
}
+ @Override
protected void setConstraint(BasicSearchQuery query, String where) {
throw new UnsupportedOperationException("Not supported yet.");
}
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/QueryContext.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/QueryContext.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/QueryContext.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -39,18 +39,22 @@
cloud = c;
clusterQueries = new BridgeClusterQueries(this);
}
+ @Override
public String getStorageIdentifier(String s) {
return s;
}
+ @Override
public Field getField(String builder, String fieldName) {
return cloud.getNodeManager(builder).getField(fieldName);
}
+ @Override
public Collection<Field> getFields(String builder) {
return
cloud.getNodeManager(builder).getFields(NodeManager.ORDER_CREATE);
}
+ @Override
public BridgeClusterQueries getClusterQueries() {
return clusterQueries;
}
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 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicAggregatedField.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -58,6 +58,7 @@
/**
* Gets the aggregation type.
*/
+ @Override
public int getAggregationType() {
return aggregationType;
}
@@ -74,6 +75,7 @@
}
// javadoc is inherited
+ @Override
public boolean equals(Object obj) {
if (obj instanceof AggregatedField) {
AggregatedField field = (AggregatedField) obj;
@@ -87,12 +89,14 @@
}
// 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:");
if (getStep() == null) {
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 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicCompareFieldsConstraint.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -48,11 +48,13 @@
}
// 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)!
if (obj != null && obj.getClass() == getClass()) {
@@ -73,6 +75,7 @@
}
// javadoc is inherited
+ @Override
public int hashCode() {
return super.hashCode()
+ 93 * field2.getFieldName().hashCode()
@@ -82,6 +85,7 @@
}
// javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("CompareFieldsConstraint(inverse:").append(isInverse()).
append(", field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicCompositeConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicCompositeConstraint.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicCompositeConstraint.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -49,6 +49,7 @@
}
}
+ @Override
public void setUnmodifiable() {
super.setUnmodifiable();
for (Constraint c : childs) {
@@ -86,12 +87,14 @@
// javadoc is inherited
+ @Override
public List<Constraint> getChilds() {
// return a unmodifiable list
return Collections.unmodifiableList(childs);
}
// javadoc is inherited
+ @Override
public int getLogicalOperator() {
return logicalOperator;
}
@@ -108,6 +111,7 @@
}
// javadoc is inherited
+ @Override
public int getBasicSupportLevel() {
// Calculate support as lowest value among childs.
int result = 3; //TODO SearchQueryHandler.SUPPORT_OPTIMAL;
@@ -127,6 +131,7 @@
}
// javadoc is inherited
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -143,6 +148,7 @@
}
// javadoc is inherited
+ @Override
public int hashCode() {
return super.hashCode()
+ 109 * logicalOperator
@@ -150,6 +156,7 @@
}
// javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("CompositeConstraint(inverse:").append(isInverse()).
append(", operator:").append(getLogicalOperatorDescription()).
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 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicConstraint.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -30,6 +30,7 @@
/**
* @since MMBase-1.9.2
*/
+ @Override
public void setUnmodifiable() {
modifiable = false;
}
@@ -47,16 +48,19 @@
}
// 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)!
if (obj != null && obj.getClass() == getClass()) {
@@ -68,6 +72,7 @@
}
// 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 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicDateSortOrder.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -35,6 +35,7 @@
super(field);
}
+ @Override
public int getPart() {
return part;
}
@@ -55,6 +56,7 @@
}
// javadoc is inherited
+ @Override
public boolean equals(Object obj) {
if (obj instanceof DateSortOrder) {
DateSortOrder order = (DateSortOrder) obj;
@@ -65,11 +67,13 @@
}
// 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() +
", part: " + getPartDescription() + ")";
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldCompareConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldCompareConstraint.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldCompareConstraint.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -69,7 +69,7 @@
return this;
}
- // javadoc is inherited
+ @Override
public int getOperator() {
return operator;
}
@@ -85,7 +85,7 @@
}
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
// Must be same class (subclasses should override this)!
if (obj != null && obj.getClass() == getClass()) {
@@ -102,13 +102,13 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return super.hashCode()
+ 113 * operator;
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("BasicFieldCompareConstraint(inverse:").append(isInverse()).
append(", field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldConstraint.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldConstraint.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -56,17 +56,17 @@
return this;
}
- // javadoc is inherited
+ @Override
public StepField getField() {
return field;
}
- // javadoc is inheritied
+ @Override
public boolean isCaseSensitive() {
return caseSensitive;
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
// Must be same class (subclasses should override this)!
if (obj != null && obj.getClass() == getClass()) {
@@ -81,7 +81,7 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return super.hashCode()
+ (isCaseSensitive()? 0: 73)
@@ -99,7 +99,7 @@
return BasicStepField.getFieldName(getField());
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("BasicFieldConstraint(inverse:").append(isInverse()).
append("field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldNullConstraint.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldNullConstraint.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/storage/search/implementation/BasicFieldNullConstraint.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -31,7 +31,7 @@
super(field);
}
- // javadoc is inherited
+ @Override
public boolean equals(Object obj) {
// Must be same class (subclasses should override this)!
if (obj != null && obj.getClass() == getClass()) {
@@ -46,12 +46,12 @@
}
}
- // javadoc is inherited
+ @Override
public int hashCode() {
return super.hashCode();
}
- // javadoc is inherited
+ @Override
public String toString() {
StringBuilder sb = new
StringBuilder("FieldNullConstraint(inverse:").append(isInverse()).
append(", field:").append(getFieldName()).
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
2010-04-20 11:23:20 UTC (rev 41968)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
2010-04-20 11:54:02 UTC (rev 41969)
@@ -381,7 +381,6 @@
/**
* Determine a data type instance based on the given gui element
- * @todo 'guitype' may become deprecated in favour of the 'datatype'
element
* @param builder the MMObjectBuilder to which the field belongs
* @param collector The DataTypeCollector of the bulider.
* @param fieldName the name of the field (used in log messages)
@@ -404,7 +403,7 @@
BasicDataType dataType = null;
Element guiTypeElement = getElementByPath(field, "field.gui.guitype");
- // XXX: deprecated tag 'type'
+ // deprecated tag 'type'
if (guiTypeElement == null) {
guiTypeElement = getElementByPath(field, "field.gui.type");
}
@@ -693,6 +692,7 @@
* {...@inheritdoc}
* @since MMBase-1.7
*/
+ @Override
public boolean equals(Object o) {
if (o instanceof AbstractBuilderReader) {
AbstractBuilderReader b = (AbstractBuilderReader) o;
@@ -716,6 +716,15 @@
}
@Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 53 * hash + (this.inheritanceResolved ? 1 : 0);
+ hash = 53 * hash + (this.searchPositions != null ?
this.searchPositions.hashCode() : 0);
+ hash = 53 * hash + (this.inputPositions != null ?
this.inputPositions.hashCode() : 0);
+ return hash;
+ }
+
+ @Override
public String toString() {
return super.toString() + ":" + getSystemId();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
