Author: michiel
Date: 2010-06-15 11:18:45 +0200 (Tue, 15 Jun 2010)
New Revision: 42557
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/LanguageDataType.java
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/package-info.java
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/ObjectTypeChangerCommitProcessor.java
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/PathRelatedList.java
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/RelatedField.java
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeXml.java
Log:
svn:keywords
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/LanguageDataType.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/LanguageDataType.java
2010-06-15 09:17:05 UTC (rev 42556)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/LanguageDataType.java
2010-06-15 09:18:45 UTC (rev 42557)
@@ -18,7 +18,7 @@
/**
* Returns the current language as a default value. For the rest it is like
{...@link StringDataType}.
* @author Michiel Meeuwissen
- * @version $Id: NodeManagerNamesDataType.java 35348 2009-05-21 15:40:40Z
michiel $
+ * @version $Id$
* @since MMBase-1.9.1
*/
public class LanguageDataType extends StringDataType {
Property changes on:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/LanguageDataType.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/ObjectTypeChangerCommitProcessor.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/ObjectTypeChangerCommitProcessor.java
2010-06-15 09:17:05 UTC (rev 42556)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/ObjectTypeChangerCommitProcessor.java
2010-06-15 09:18:45 UTC (rev 42557)
@@ -18,7 +18,7 @@
* 'fieldName') parameter.
*
* @author Michiel Meeuwissen
- * @version $Id: FunctionValueIfEmptyCommitProcessor.java 34900 2009-05-01
16:29:42Z michiel $
+ * @version $Id$
* @since MMBase-1.9.1
*/
Property changes on:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/ObjectTypeChangerCommitProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/PathRelatedList.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/PathRelatedList.java
2010-06-15 09:17:05 UTC (rev 42556)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/PathRelatedList.java
2010-06-15 09:18:45 UTC (rev 42557)
@@ -17,7 +17,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.8.7
- * @version $Id: RelatedList.java 36281 2009-06-22 20:47:35Z michiel $
+ * @version $Id$
*/
public class PathRelatedList {
Property changes on:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/PathRelatedList.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/RelatedField.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/RelatedField.java
2010-06-15 09:17:05 UTC (rev 42556)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/RelatedField.java
2010-06-15 09:18:45 UTC (rev 42557)
@@ -19,7 +19,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.9.1
- * @version $Id: Related.java 34900 2009-05-01 16:29:42Z michiel $
+ * @version $Id$
*/
public class RelatedField {
Property changes on:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/processors/RelatedField.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
2010-06-15 09:17:05 UTC (rev 42556)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
2010-06-15 09:18:45 UTC (rev 42557)
@@ -340,7 +340,9 @@
private void addProcessor(int action, int processingType, Processor
newProcessor) {
Processor oldProcessor = dataType.getProcessorWithoutDefault(action,
processingType);
+ assert ! newProcessor.equals(oldProcessor) : "" + dataType;
newProcessor = DataTypeXml.chainProcessors(oldProcessor, newProcessor);
+
if (log.isDebugEnabled()) {
log.debug("Adding processor to " + processingType + " " + dataType
+ " Found processor " + oldProcessor + "--> " + newProcessor);
}
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeXml.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeXml.java
2010-06-15 09:17:05 UTC (rev 42556)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/datatypes/util/xml/DataTypeXml.java
2010-06-15 09:18:45 UTC (rev 42557)
@@ -85,6 +85,7 @@
((ChainedProcessor) processor).add(processor2);
} else {
ChainedProcessor chain = new ChainedProcessor();
+ assert ! processor1.equals(processor2);
chain.add(processor1);
chain.add(processor2);
processor = chain;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
