Author: simonetripodi
Date: Sun Feb 20 15:40:57 2011
New Revision: 1072614
URL: http://svn.apache.org/viewvc?rev=1072614&view=rev
Log:
stripped out the TypeConverter interface, better not reiventing the wheel
Removed:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ConverterBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/spi/TypeConverter.java
Modified:
commons/sandbox/digester3/trunk/src/examples/document-markup/src/main/java/org/apache/commons/digester3/examples/documentmarkup/MarkupDigester.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/DigesterImpl.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/WithMemoryRulesBinder.java
Modified:
commons/sandbox/digester3/trunk/src/examples/document-markup/src/main/java/org/apache/commons/digester3/examples/documentmarkup/MarkupDigester.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/examples/document-markup/src/main/java/org/apache/commons/digester3/examples/documentmarkup/MarkupDigester.java?rev=1072614&r1=1072613&r2=1072614&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/examples/document-markup/src/main/java/org/apache/commons/digester3/examples/documentmarkup/MarkupDigester.java
(original)
+++
commons/sandbox/digester3/trunk/src/examples/document-markup/src/main/java/org/apache/commons/digester3/examples/documentmarkup/MarkupDigester.java
Sun Feb 20 15:40:57 2011
@@ -28,7 +28,6 @@ import java.util.Stack;
import org.apache.commons.digester3.Digester;
import org.apache.commons.digester3.Rule;
import org.apache.commons.digester3.spi.Rules;
-import org.apache.commons.digester3.spi.TypeConverter;
import org.apache.commons.logging.Log;
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
@@ -284,11 +283,6 @@ public class MarkupDigester implements D
return this.wrapped.createSAXException(message);
}
- public <T> TypeConverter<T> lookupConverter(Class<T> type) {
- // TODO Auto-generated method stub
- return null;
- }
-
/**
* Iterate over the list of rules most recently matched, and
* if any of them implement the TextSegmentHandler interface then
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java?rev=1072614&r1=1072613&r2=1072614&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java
Sun Feb 20 15:40:57 2011
@@ -17,7 +17,6 @@
*/
package org.apache.commons.digester3;
-import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;
/**
@@ -58,16 +57,6 @@ public abstract class AbstractRulesModul
}
/**
- * @see RulesBinder#convert(Class)
- * @param <T>
- * @param type
- * @return
- */
- protected <T> ConverterBuilder<T> convert(Class<T> type) {
- return this.rulesBinder.convert(type);
- }
-
- /**
* Return the wrapped {@link RulesBinder}.
*
* @return The wrapped {@link RulesBinder}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java?rev=1072614&r1=1072613&r2=1072614&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java
Sun Feb 20 15:40:57 2011
@@ -26,7 +26,6 @@ import java.util.EmptyStackException;
import java.util.Map;
import org.apache.commons.digester3.spi.Rules;
-import org.apache.commons.digester3.spi.TypeConverter;
import org.apache.commons.logging.Log;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
@@ -376,15 +375,4 @@ public interface Digester extends Conten
*/
SAXException createSAXException(String message);
- /**
- * Allows retrieve the bound converter for the given type.
- *
- * NOTE: the first version will be a commons-beanutils Converter facade.
- *
- * @param <T>
- * @param type
- * @return
- */
- <T> TypeConverter<T> lookupConverter(Class<T> type);
-
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java?rev=1072614&r1=1072613&r2=1072614&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java
Sun Feb 20 15:40:57 2011
@@ -17,7 +17,6 @@
*/
package org.apache.commons.digester3;
-import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;
/**
@@ -63,15 +62,6 @@ public interface RulesBinder {
LinkedRuleBuilder forPattern(String pattern);
/**
- * Allows to associate the given type to one {@link
org.apache.commons.digester3.spi.TypeConverter}.
- *
- * @param <T>
- * @param type
- * @return
- */
- <T> ConverterBuilder<T> convert(Class<T> type);
-
- /**
* Returns the {@code ClassLoader} used in the current bindings.
*
* @return The {@code ClassLoader} used in the current bindings.
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java?rev=1072614&r1=1072613&r2=1072614&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/annotations/WithMemoryRulesBinder.java
Sun Feb 20 15:40:57 2011
@@ -22,7 +22,6 @@ import java.util.Set;
import org.apache.commons.digester3.RulesBinder;
import org.apache.commons.digester3.RulesModule;
-import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;
final class WithMemoryRulesBinder implements RulesBinder {
@@ -74,13 +73,6 @@ final class WithMemoryRulesBinder implem
}
/**
- * {@inheritDoc}
- */
- public <T> ConverterBuilder<T> convert(Class<T> type) {
- return this.wrappedRulesBinder.convert(type);
- }
-
- /**
*
* @param bindingClass
* @return
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/DigesterImpl.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/DigesterImpl.java?rev=1072614&r1=1072613&r2=1072614&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/DigesterImpl.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/DigesterImpl.java
Sun Feb 20 15:40:57 2011
@@ -17,7 +17,11 @@
*/
package org.apache.commons.digester3.internal;
-import static org.apache.commons.digester3.utils.InputSources.*;
+import static
org.apache.commons.digester3.utils.InputSources.createInputSourceFromFile;
+import static
org.apache.commons.digester3.utils.InputSources.createInputSourceFromInputStream;
+import static
org.apache.commons.digester3.utils.InputSources.createInputSourceFromReader;
+import static
org.apache.commons.digester3.utils.InputSources.createInputSourceFromURL;
+import static
org.apache.commons.digester3.utils.InputSources.createInputSourceFromUri;
import java.io.File;
import java.io.IOException;
@@ -37,7 +41,6 @@ import org.apache.commons.digester3.Dige
import org.apache.commons.digester3.Rule;
import org.apache.commons.digester3.spi.Rules;
import org.apache.commons.digester3.spi.Substitutor;
-import org.apache.commons.digester3.spi.TypeConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
@@ -1167,12 +1170,4 @@ public final class DigesterImpl implemen
return createSAXException(message, null);
}
- /**
- * {@inheritDoc}
- */
- public <T> TypeConverter<T> lookupConverter(final Class<T> type) {
- // TODO empty implementation, will be changed for final version
- return null;
- }
-
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java?rev=1072614&r1=1072613&r2=1072614&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java
Sun Feb 20 15:40:57 2011
@@ -28,10 +28,8 @@ import org.apache.commons.digester3.Dige
import org.apache.commons.digester3.Rule;
import org.apache.commons.digester3.RulesBinder;
import org.apache.commons.digester3.RulesModule;
-import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;
import org.apache.commons.digester3.spi.Rules;
-import org.apache.commons.digester3.spi.TypeConverter;
/**
* The Digester EDSL implementation.
@@ -139,28 +137,6 @@ public final class RulesBinderImpl imple
}
/**
- * {@inheritDoc}
- */
- public <T> ConverterBuilder<T> convert(final Class<T> type) {
- if (type == null) {
- this.addError(new IllegalArgumentException("NULL type is not
allowed to be converted"));
- }
- return new ConverterBuilder<T>() {
-
- public void withConverter(TypeConverter<T> typeConverter) {
- if (typeConverter == null) {
- addError(new IllegalArgumentException(
- String.format("NULL TypeConverter is not allowed
for converting '%s' type",
- type.getName())));
- }
-
- // TODO register the type converter!!!
- }
-
- };
- }
-
- /**
* Invokes the bound providers, then create the rule and associate it to
the related pattern,
* storing them in the proper {@link Rules} implementation data structure.
*
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java?rev=1072614&r1=1072613&r2=1072614&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/PrefixedRulesBinder.java
Sun Feb 20 15:40:57 2011
@@ -19,7 +19,6 @@ package org.apache.commons.digester3.xml
import org.apache.commons.digester3.RulesBinder;
import org.apache.commons.digester3.RulesModule;
-import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;
final class PrefixedRulesBinder implements RulesBinder {
@@ -71,11 +70,4 @@ final class PrefixedRulesBinder implemen
return this.wrappedRulesBinder.forPattern(pattern);
}
- /**
- * {@inheritDoc}
- */
- public <T> ConverterBuilder<T> convert(Class<T> type) {
- return this.wrappedRulesBinder.convert(type);
- }
-
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/WithMemoryRulesBinder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/WithMemoryRulesBinder.java?rev=1072614&r1=1072613&r2=1072614&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/WithMemoryRulesBinder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/WithMemoryRulesBinder.java
Sun Feb 20 15:40:57 2011
@@ -22,7 +22,6 @@ import java.util.Set;
import org.apache.commons.digester3.RulesBinder;
import org.apache.commons.digester3.RulesModule;
-import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;
/**
@@ -85,13 +84,6 @@ class WithMemoryRulesBinder implements R
}
/**
- * {@inheritDoc}
- */
- public <T> ConverterBuilder<T> convert(Class<T> type) {
- return this.wrappedRulesBinder.convert(type);
- }
-
- /**
*
*
* @return
