Author: michiel
Date: 2010-05-18 18:59:21 +0200 (Tue, 18 May 2010)
New Revision: 42235
Added:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/util/DataTypeSetter.java
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/util/Fields.java
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/ParentBuilderReader.java
Log:
moved DataTypeSetter to standalone class as was needed in trunk
Added:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/util/DataTypeSetter.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/util/DataTypeSetter.java
(rev 0)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/util/DataTypeSetter.java
2010-05-18 16:59:21 UTC (rev 42235)
@@ -0,0 +1,53 @@
+/*
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+The license (Mozilla version 1.0) can be read at the MMBase site.
+See http://www.MMBase.org/license
+
+*/
+package org.mmbase.core.util;
+
+import org.mmbase.bridge.*;
+import org.mmbase.datatypes.*;
+import org.mmbase.core.AbstractField;
+
+
+
+/**
+ * Wraps a Field. It can and is extended to make some other modifications to
the field once the datatype is determined.
+ * @since MMBase-1.9.4
+ * @author Michiel Meeuwissen
+ * @version $Id: DataTypeSetter.java 42234 2010-05-18 16:47:29Z michiel $
+ */
+
+public class DataTypeSetter {
+ private int type = -1;
+ private int listItemType = -1;
+ protected AbstractField field;
+ public DataTypeSetter(AbstractField field) {
+ this.field = field;
+ }
+ public void set(DataType dt) {
+ field.setDataType(dt);
+ }
+ public AbstractField getField() {
+ return field;
+ }
+ public int getType() {
+ return type == -1 ? field.getType() : type;
+ }
+ public int getListItemType() {
+ return listItemType == -1 ? field.getListItemType() : listItemType;
+ }
+ public void setType(int t) {
+ type = t;
+ }
+ public void setListItemType(int t) {
+ listItemType = t;
+ }
+
+}
+
+
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/util/Fields.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/util/Fields.java
2010-05-18 16:47:29 UTC (rev 42234)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/core/util/Fields.java
2010-05-18 16:59:21 UTC (rev 42235)
@@ -210,42 +210,7 @@
public static void sort(List<? extends Field> fields, int order) {
Collections.sort(fields, new FieldComparator(order));
}
-
-
/**
- * Wraps a Field. It can and is extended to make some other modifications
to the field once the datatype is determined.
- */
-
- public static class DataTypeSetter {
- private int type = -1;
- private int listItemType = -1;
- protected AbstractField field;
- public DataTypeSetter(AbstractField field) {
- this.field = field;
- }
- public void set(DataType dt) {
- field.setDataType(dt);
- }
- public AbstractField getField() {
- return field;
- }
- public int getType() {
- return type == -1 ? field.getType() : type;
- }
- public int getListItemType() {
- return listItemType == -1 ? field.getListItemType() : listItemType;
- }
- public void setType(int t) {
- type = t;
- }
- public void setListItemType(int t) {
- listItemType = t;
- }
-
- }
-
-
- /**
* Comparator to sort CoreFields by creation order, or by position
* specified in one of the GUIPos fields.
*/
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
2010-05-18 16:47:29 UTC (rev 42234)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/AbstractBuilderReader.java
2010-05-18 16:59:21 UTC (rev 42235)
@@ -19,6 +19,7 @@
import org.mmbase.bridge.Field;
import org.mmbase.bridge.NodeManager;
import org.mmbase.core.CoreField;
+import org.mmbase.core.util.DataTypeSetter;
import org.mmbase.core.util.Fields;
import org.mmbase.core.AbstractField;
import org.mmbase.core.event.*;
@@ -472,7 +473,7 @@
- protected void decodeDataTypeLater(final Fields.DataTypeSetter setter,
+ protected void decodeDataTypeLater(final DataTypeSetter setter,
final String builder,
final DataTypeCollector collector,
final String fieldName,
@@ -502,7 +503,7 @@
* @param forceInstance If true, it will never return <code>null</code>,
but will return (a clone) of the DataType associated with the database type.
* @since MMBase-1.8
*/
- protected void decodeDataType(final Fields.DataTypeSetter setter,
+ protected void decodeDataType(final DataTypeSetter setter,
final String builder,
final DataTypeCollector collector,
final String fieldName,
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
2010-05-18 16:47:29 UTC (rev 42234)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/BuilderReader.java
2010-05-18 16:59:21 UTC (rev 42235)
@@ -18,6 +18,7 @@
import org.mmbase.bridge.NodeManager;
import org.mmbase.core.CoreField;
import org.mmbase.core.util.Fields;
+import org.mmbase.core.util.DataTypeSetter;
import org.mmbase.datatypes.*;
import org.mmbase.module.core.MMBase;
import org.mmbase.module.core.MMObjectBuilder;
@@ -215,7 +216,7 @@
if (def != null) {
def.rewrite();
- Fields.DataTypeSetter setter = new
Fields.DataTypeSetter(def) {
+ DataTypeSetter setter = new DataTypeSetter(def) {
@Override
public void set(DataType dt) {
if (dt != null) {
@@ -515,7 +516,7 @@
Field.STATE_VIRTUAL,/*temp
default, will set by decodeFieldAttributes*/
Constants.DATATYPE_UNKNOWN);
- Fields.DataTypeSetter setter = new Fields.DataTypeSetter(def) {
+ DataTypeSetter setter = new DataTypeSetter(def) {
@Override
public void set(DataType dataType) {
def.setDataType(dataType);
Modified:
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/ParentBuilderReader.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/ParentBuilderReader.java
2010-05-18 16:47:29 UTC (rev 42234)
+++
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/ParentBuilderReader.java
2010-05-18 16:59:21 UTC (rev 42235)
@@ -12,6 +12,7 @@
import org.mmbase.datatypes.DataType;
import org.mmbase.datatypes.Constants;
+import org.mmbase.core.util.DataTypeSetter;
import org.mmbase.core.util.Fields;
import org.mmbase.util.xml.AbstractBuilderReader;
import org.mmbase.bridge.mock.MockField;
@@ -120,7 +121,7 @@
final Element dbtype = getElementByPath(field,
"field.db.type");
final MockField newField = new MockField(fieldName, null,
Constants.DATATYPE_UNKNOWN);
- Fields.DataTypeSetter setter = new
Fields.DataTypeSetter(newField) {
+ DataTypeSetter setter = new DataTypeSetter(newField) {
@Override
public void set(DataType dt) {
super.set(dt);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
