Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv25982/src/org/mmbase/module/core
Modified Files:
MMObjectNode.java ClusterBuilder.java SmartPathFunction.java
VirtualBuilder.java
Log Message:
Cleaned the code a little
Added some generic stuff for function and datatypes
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: MMObjectNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMObjectNode.java,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -b -r1.212 -r1.213
--- MMObjectNode.java 23 Jul 2007 14:00:11 -0000 1.212
+++ MMObjectNode.java 3 Feb 2008 17:33:57 -0000 1.213
@@ -38,7 +38,7 @@
* @author Eduard Witteveen
* @author Michiel Meeuwissen
* @author Ernst Bunders
- * @version $Id: MMObjectNode.java,v 1.212 2007/07/23 14:00:11 michiel Exp $
+ * @version $Id: MMObjectNode.java,v 1.213 2008/02/03 17:33:57 nklasens Exp $
*/
public class MMObjectNode implements org.mmbase.util.SizeMeasurable,
java.io.Serializable {
@@ -781,7 +781,7 @@
* @javadoc
* @since MMBase-1.8
*/
- public Function getFunction(String functionName) {
+ public Function<?> getFunction(String functionName) {
return parent.getFunction(this, functionName);
}
Index: ClusterBuilder.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/ClusterBuilder.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- ClusterBuilder.java 20 Jun 2007 14:25:39 -0000 1.92
+++ ClusterBuilder.java 3 Feb 2008 17:33:57 -0000 1.93
@@ -50,7 +50,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Rob van Maris
- * @version $Id: ClusterBuilder.java,v 1.92 2007/06/20 14:25:39 michiel Exp $
+ * @version $Id: ClusterBuilder.java,v 1.93 2008/02/03 17:33:57 nklasens Exp $
* @see ClusterNode
*/
public class ClusterBuilder extends VirtualBuilder {
@@ -294,7 +294,7 @@
public Map<String, CoreField> getFields(MMObjectNode node) {
Map<String, CoreField> ret = new HashMap<String, CoreField>();
Iterator<String> i = node.getValues().keySet().iterator();
- DataType nodeType = DataTypes.getDataType("node");
+ DataType<? extends Object> nodeType = DataTypes.getDataType("node");
while (i.hasNext()) {
String name = i.next();
int pos = name.indexOf(".");
Index: SmartPathFunction.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/SmartPathFunction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- SmartPathFunction.java 6 Aug 2007 13:04:13 -0000 1.10
+++ SmartPathFunction.java 3 Feb 2008 17:33:57 -0000 1.11
@@ -25,7 +25,7 @@
* This class can be overriden to make an even smarter search possible.
*
* @since MMBase-1.8.5
- * @version $Id: SmartPathFunction.java,v 1.10 2007/08/06 13:04:13 michiel Exp
$
+ * @version $Id: SmartPathFunction.java,v 1.11 2008/02/03 17:33:57 nklasens
Exp $
*/
public class SmartPathFunction {
private static final Logger log =
Logging.getLoggerInstance(SmartPathFunction.class);
@@ -118,7 +118,7 @@
String key = null;
if (smartPathCache.isActive()) {
key = smartKey();
- result = (String) smartPathCache.get(key);
+ result = smartPathCache.get(key);
if (result != null || smartPathCache.containsKey(key)) {
return result;
}
Index: VirtualBuilder.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/VirtualBuilder.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- VirtualBuilder.java 11 Feb 2007 19:21:11 -0000 1.24
+++ VirtualBuilder.java 3 Feb 2008 17:33:57 -0000 1.25
@@ -24,7 +24,7 @@
* faulty behavior.
*
* @author Pierre van Rooden
- * @version $Id: VirtualBuilder.java,v 1.24 2007/02/11 19:21:11 nklasens Exp $
+ * @version $Id: VirtualBuilder.java,v 1.25 2008/02/03 17:33:57 nklasens Exp $
*/
public class VirtualBuilder extends MMObjectBuilder {
private static final Logger log =
Logging.getLoggerInstance(VirtualBuilder.class);
@@ -177,7 +177,7 @@
String fieldName = entry.getKey();
Object value = entry.getValue();
if (value == null) value = new Object();
- DataType fieldDataType = DataTypes.createDataType("field",
value.getClass());
+ DataType<? extends Object> fieldDataType =
DataTypes.createDataType("field", value.getClass());
int type = Fields.classToType(value.getClass());
CoreField fd = Fields.createField(fieldName, type,
Field.TYPE_UNKNOWN, Field.STATE_VIRTUAL, fieldDataType);
fd.finish();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
