diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/X4ODriver.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/X4ODriver.java index 5cb0b33..8357269 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/X4ODriver.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/X4ODriver.java @@ -46,109 +46,116 @@ public abstract class X4ODriver { /** Defines the default version if none is defined. */ public final static String DEFAULT_LANGUAGE_VERSION = "1.0"; - + /** * marker constructor. */ - public X4ODriver(/* X4ODriverManager.ConstructorMarker marker */) { + public X4ODriver(/*X4ODriverManager.ConstructorMarker marker*/) { } - + /** - * @return Returns the langauge name of this driver. + * @return Returns the langauge name of this driver. */ abstract public String getLanguageName(); - + /** - * @return Returns the supported language versions for this driver. + * @return Returns the supported language versions for this driver. */ abstract public String[] getLanguageVersions(); - + + + // =============== build methods to override - + protected X4OLanguage buildLanguage(String version) { return X4ODriverManager.getDefaultBuildLanguage(this, version); } - + protected X4OPhaseManager buildPhaseManager() { return X4ODriverManager.getDefaultBuildPhaseManager(); } - + protected X4OLanguageConfiguration buildLanguageConfiguration() { return X4ODriverManager.getDefaultBuildLanguageConfiguration(); } - + + + // =============== Reader - + public X4OReader createReader() { return createReaderSession(); } - + public X4OReader createReader(String version) { return createReaderSession(version); } - + public X4OReaderSession createReaderSession() { return createReaderSession(getLanguageVersionDefault()); } - + public X4OReaderSession createReaderSession(String version) { return new DefaultX4OReader(createLanguage(version)); } - + + + // =============== Writer - + public X4OWriter createWriter() { return createWriterSession(); } - + public X4OWriter createWriter(String version) { return createWriterSession(version); } - + public X4OWriterSession createWriterSession() { return createWriterSession(getLanguageVersionDefault()); } - + public X4OWriterSession createWriterSession(String version) { return new DefaultX4OWriter(createLanguage(version)); } - + + + // =============== Language - + /** * Returns the default language which is the latest version. - * - * @return The default language version. + * @return The default language version. */ final public String getLanguageVersionDefault() { return X4ODriverManager.getDefaultLanguageVersion(getLanguageVersions()); - } - + } + /** * Creates the X4OLanguage for the specified version. - * - * @param version The language version to create. - * @return The created X4OLanguage. + * @param version The language version to create. + * @return The created X4OLanguage. */ final public X4OLanguage createLanguage(String version) { return buildLanguage(version); } - + /** * Creates the X4OLanguage for the default version. - * - * @return The created X4OLanguage. + * @return The created X4OLanguage. */ final public X4OLanguage createLanguage() { return buildLanguage(getLanguageVersionDefault()); } - + + + // =============== Language Tasks final public X4OLanguageTask getLanguageTask(String taskId) { return X4ODriverManager.getX4OLanguageTask(taskId); } - + final public List getLanguageTasks() { return X4ODriverManager.getX4OLanguageTasks(); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/AbstractObjectConverter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/AbstractObjectConverter.java index aa9eeb9..4bfe5f3 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/AbstractObjectConverter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/AbstractObjectConverter.java @@ -34,35 +34,33 @@ import java.util.Locale; */ @SuppressWarnings("serial") abstract public class AbstractObjectConverter implements ObjectConverter { - + protected List converters = new ArrayList(5); abstract public Object convertAfterTo(Object obj, Locale locale) throws ObjectConverterException; - abstract public Object convertAfterBack(Object obj, Locale locale) throws ObjectConverterException; - abstract public ObjectConverter clone() throws CloneNotSupportedException; - + protected List cloneConverters() throws CloneNotSupportedException { List result = new ArrayList(converters.size()); - for (ObjectConverter converter : converters) { + for (ObjectConverter converter:converters) { result.add(converter.clone()); } return result; } - + /** * @see org.x4o.xml.conv.ObjectConverter#convertTo(java.lang.Object, java.util.Locale) */ public Object convertTo(Object obj, Locale locale) throws ObjectConverterException { if (converters.isEmpty()) { - return convertAfterTo(obj, locale); + return convertAfterTo(obj,locale); } Object result = null; - for (ObjectConverter conv : converters) { + for (ObjectConverter conv:converters) { result = conv.convertTo(obj, locale); } - result = convertAfterTo(obj, locale); + result = convertAfterTo(obj,locale); return result; } @@ -71,13 +69,13 @@ abstract public class AbstractObjectConverter implements ObjectConverter { */ public Object convertBack(Object obj, Locale locale) throws ObjectConverterException { if (converters.isEmpty()) { - return convertAfterBack(obj, locale); + return convertAfterBack(obj,locale); } Object result = null; - for (ObjectConverter conv : converters) { + for (ObjectConverter conv:converters) { result = conv.convertBack(obj, locale); } - result = convertAfterBack(obj, locale); + result = convertAfterBack(obj,locale); return result; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/AbstractStringObjectConverter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/AbstractStringObjectConverter.java index 59cb76e..ff513bb 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/AbstractStringObjectConverter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/AbstractStringObjectConverter.java @@ -42,17 +42,16 @@ abstract public class AbstractStringObjectConverter extends AbstractObjectConver public Object convertAfterTo(Object obj, Locale locale) throws ObjectConverterException { if (obj instanceof String) { - return convertStringTo((String) obj, locale); + return convertStringTo((String)obj,locale); } else { - return convertStringTo(obj.toString(), locale); + return convertStringTo(obj.toString(),locale); } } - + public Object convertAfterBack(Object obj, Locale locale) throws ObjectConverterException { - return convertStringBack(obj, locale); + return convertStringBack(obj,locale); } abstract public Object convertStringTo(String str, Locale locale) throws ObjectConverterException; - - abstract public String convertStringBack(Object obj, Locale locale) throws ObjectConverterException; + abstract public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/DefaultObjectConverterProvider.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/DefaultObjectConverterProvider.java index 865de5f..0d90298 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/DefaultObjectConverterProvider.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/DefaultObjectConverterProvider.java @@ -43,20 +43,19 @@ import org.x4o.xml.conv.text.URLConverter; * @version 1.0 Jan 20, 2012 */ public class DefaultObjectConverterProvider implements ObjectConverterProvider { - - private Map, ObjectConverter> converters = null; - + + private Map,ObjectConverter> converters = null; + /** * Create new DefaultObjectConverterProvider. */ public DefaultObjectConverterProvider() { - converters = new HashMap, ObjectConverter>(20); + converters = new HashMap,ObjectConverter>(20); } - + /** * Create new DefaultObjectConverterProvider. - * - * @param addDefaults When true do the addDefaults(). + * @param addDefaults When true do the addDefaults(). */ public DefaultObjectConverterProvider(boolean addDefaults) { this(); @@ -64,7 +63,7 @@ public class DefaultObjectConverterProvider implements ObjectConverterProvider { addDefaults(); } } - + /** * Adds the default converters. */ @@ -79,9 +78,9 @@ public class DefaultObjectConverterProvider implements ObjectConverterProvider { addObjectConverter(new URLConverter()); addObjectConverter(new ClassConverter()); } - + /** - * @param converter The converter to add. + * @param converter The converter to add. */ public void addObjectConverter(ObjectConverter converter) { converters.put(converter.getObjectClassTo(), converter); @@ -90,14 +89,14 @@ public class DefaultObjectConverterProvider implements ObjectConverterProvider { /** * @see org.x4o.xml.conv.ObjectConverterProvider#getObjectConverterForClass(java.lang.Class) * @param clazz The Class to search an ObjectConverter for. - * @return The ObjectConverter or null for the class. + * @return The ObjectConverter or null for the class. */ public ObjectConverter getObjectConverterForClass(Class clazz) { return converters.get(clazz); } - + /** - * @return Returns all ObjectConverted stored in this class. + * @return Returns all ObjectConverted stored in this class. */ protected Collection getObjectConverters() { return converters.values(); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverter.java index e65c6b6..72259ad 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverter.java @@ -32,58 +32,56 @@ import java.util.Locale; * @author Willem Cazander * @version 1.0 Aug 28, 2008 */ -public interface ObjectConverter extends Cloneable, Serializable { +public interface ObjectConverter extends Cloneable,Serializable { /** - * @return Returns the class which we can convert to. + * @return Returns the class which we can convert to. */ Class getObjectClassTo(); - + /** - * @return Returns the class which we can convert from. + * @return Returns the class which we can convert from. */ Class getObjectClassBack(); - + /** * Convert to the object. - * - * @param obj The object to convert. - * @param locale The Object convert locale if needed. + * @param obj The object to convert. + * @param locale The Object convert locale if needed. * @return Returns the converted object. - * @throws ObjectConverterException When the conversion failes. + * @throws ObjectConverterException When the conversion failes. */ - Object convertTo(Object obj, Locale locale) throws ObjectConverterException; - + Object convertTo(Object obj,Locale locale) throws ObjectConverterException; + /** * Convert the object back. - * - * @param obj The object to convert. - * @param locale The Object convert locale if needed. + * @param obj The object to convert. + * @param locale The Object convert locale if needed. * @return Returns the converted object. - * @throws ObjectConverterException When the conversion failes. + * @throws ObjectConverterException When the conversion failes. */ - Object convertBack(Object obj, Locale locale) throws ObjectConverterException; - + Object convertBack(Object obj,Locale locale) throws ObjectConverterException; + /** - * @return Returns list of child converters. + * @return Returns list of child converters. */ List getObjectConverters(); - + /** - * @param converter Adds an child converter. + * @param converter Adds an child converter. */ void addObjectConverter(ObjectConverter converter); - + /** - * @param converter Removes this child converter. + * @param converter Removes this child converter. */ void removeObjectConverter(ObjectConverter converter); - + /** * Force impl to have public clone method. * - * @return An cloned ObjectConverter. - * @throws CloneNotSupportedException If thrown when cloning is not supported. + * @return An cloned ObjectConverter. + * @throws CloneNotSupportedException If thrown when cloning is not supported. */ ObjectConverter clone() throws CloneNotSupportedException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverterException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverterException.java index f8c3d01..69bba2c 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverterException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverterException.java @@ -29,35 +29,33 @@ package org.x4o.xml.conv; * @version 1.0 Jan 20, 2012 */ public class ObjectConverterException extends Exception { - + private static final long serialVersionUID = 1L; private final ObjectConverter converter; /** * Creates an ObjectConverterException. - * - * @param converter The converter which has the exception. - * @param message The exception message. + * @param converter The converter which has the exception. + * @param message The exception message. */ - public ObjectConverterException(ObjectConverter converter, String message) { + public ObjectConverterException(ObjectConverter converter,String message) { super(message); - this.converter = converter; + this.converter=converter; } - + /** * Creates an ObjectConverterException. - * - * @param converter The converter which has the exception. - * @param message The exception message. - * @param exception The parent exception. + * @param converter The converter which has the exception. + * @param message The exception message. + * @param exception The parent exception. */ - public ObjectConverterException(ObjectConverter converter, String message, Exception exception) { - super(message, exception); - this.converter = converter; + public ObjectConverterException(ObjectConverter converter,String message,Exception exception) { + super(message,exception); + this.converter=converter; } - + /** - * @return Returns the ObjectConverter of this exception. + * @return Returns the ObjectConverter of this exception. */ public ObjectConverter getObjectConverter() { return converter; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverterProvider.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverterProvider.java index 0c54d97..d3a940d 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverterProvider.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/ObjectConverterProvider.java @@ -29,12 +29,11 @@ package org.x4o.xml.conv; * @version 1.0 Jan 20, 2012 */ public interface ObjectConverterProvider { - + /** * Provides an ObjectConvert based on the converted class result. - * - * @param clazz The result class we want. - * @return The ObjectConverter which can convert for us. + * @param clazz The result class we want. + * @return The ObjectConverter which can convert for us. */ ObjectConverter getObjectConverterForClass(Class clazz); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/EnumConverter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/EnumConverter.java index 57f0425..d2c8071 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/EnumConverter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/EnumConverter.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.conv.text; +package org.x4o.xml.conv.text; import java.util.Locale; @@ -35,66 +35,67 @@ import org.x4o.xml.lang.X4OLanguageClassLoader; * @author Willem Cazander * @version 1.0 Aug 31, 2007 */ -@SuppressWarnings({ "rawtypes", "unchecked" }) +@SuppressWarnings({"rawtypes","unchecked"}) public class EnumConverter extends AbstractStringObjectConverter { - + private static final long serialVersionUID = 8860785472427794548L; + private String enumClass = null; - + + private Class enumObjectClass = null; - + /** * Returns the convert to class. - * * @see org.x4o.xml.conv.ObjectConverter#getObjectClassTo() * @return The class to convert to. */ public Class getObjectClassTo() { return Enum.class; } - + /** * Converts string into object. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringTo(java.lang.String, java.util.Locale) - * @param str The string to convert to object. + * @param str The string to convert to object. * @param locale The locale to convert the string from. * @return The object converted from the string. * @throws ObjectConverterException When conversion fails. */ public Object convertStringTo(String str, Locale locale) throws ObjectConverterException { - if (getEnumClass() == null) { - throw new ObjectConverterException(this, "enumClass String attribute is not set."); + if (getEnumClass()==null) { + throw new ObjectConverterException(this,"enumClass String attribute is not set."); } - // if (value instanceof Enum) { - // return value; - // } - String v = str; // value.toString(); + //if (value instanceof Enum) { + // return value; + //} + String v = str; //value.toString(); try { - if (enumObjectClass == null) { - enumObjectClass = (Class) X4OLanguageClassLoader.loadClass(getEnumClass()); + if (enumObjectClass==null) { + enumObjectClass = (Class)X4OLanguageClassLoader.loadClass(getEnumClass()); } - if (enumObjectClass == null) { - throw new ObjectConverterException(this, "Could not load enumClass"); + if (enumObjectClass==null) { + throw new ObjectConverterException(this,"Could not load enumClass"); } return Enum.valueOf(enumObjectClass, v); } catch (Exception e) { - throw new ObjectConverterException(this, e.getMessage(), e); + throw new ObjectConverterException(this,e.getMessage(),e); } } - + /** * Converts object into string. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringBack(java.lang.Object, java.util.Locale) - * @param obj The object to convert to string. + * @param obj The object to convert to string. * @param locale The locale to convert the object from. * @return The string converted from the object. * @throws ObjectConverterException When conversion fails. */ - public String convertStringBack(Object obj, Locale locale) throws ObjectConverterException { - return ((Enum) obj).name(); + public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException { + return ((Enum)obj).name(); } /** @@ -104,16 +105,16 @@ public class EnumConverter extends AbstractStringObjectConverter { return enumClass; } + /** * @param enumClass the enumClass to set */ public void setEnumClass(String enumClass) { this.enumClass = enumClass; } - + /** * Clone this ObjectConverter. - * * @see org.x4o.xml.conv.AbstractObjectConverter#clone() * @return The cloned ObjectConverter. * @throws CloneNotSupportedException When cloning fails. @@ -121,8 +122,8 @@ public class EnumConverter extends AbstractStringObjectConverter { @Override public ObjectConverter clone() throws CloneNotSupportedException { EnumConverter result = new EnumConverter(); - result.converters = cloneConverters(); - result.enumClass = enumClass; + result.converters=cloneConverters(); + result.enumClass=enumClass; return result; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/FloatConverter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/FloatConverter.java index 55bd54d..e7720e5 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/FloatConverter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/FloatConverter.java @@ -40,19 +40,18 @@ public class FloatConverter extends AbstractStringObjectConverter { /** * Returns the convert to class. - * * @see org.x4o.xml.conv.ObjectConverter#getObjectClassTo() * @return The class to convert to. */ public Class getObjectClassTo() { return Float.class; } - + /** * Converts string into object. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringTo(java.lang.String, java.util.Locale) - * @param str The string to convert to object. + * @param str The string to convert to object. * @param locale The locale to convert the string from. * @return The object converted from the string. * @throws ObjectConverterException When conversion fails. @@ -60,23 +59,22 @@ public class FloatConverter extends AbstractStringObjectConverter { public Object convertStringTo(String str, Locale locale) throws ObjectConverterException { return Float.valueOf(str); } - + /** * Converts object into string. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringBack(java.lang.Object, java.util.Locale) - * @param obj The object to convert to string. + * @param obj The object to convert to string. * @param locale The locale to convert the object from. * @return The string converted from the object. * @throws ObjectConverterException When conversion fails. */ - public String convertStringBack(Object obj, Locale locale) throws ObjectConverterException { - return ((Float) obj).toString(); + public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException { + return ((Float)obj).toString(); } - + /** * Clone this ObjectConverter. - * * @see org.x4o.xml.conv.AbstractObjectConverter#clone() * @return The cloned ObjectConverter. * @throws CloneNotSupportedException When cloning fails. @@ -84,7 +82,7 @@ public class FloatConverter extends AbstractStringObjectConverter { @Override public ObjectConverter clone() throws CloneNotSupportedException { FloatConverter result = new FloatConverter(); - result.converters = cloneConverters(); + result.converters=cloneConverters(); return result; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/IntegerConverter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/IntegerConverter.java index f5228e5..e941dd3 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/IntegerConverter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/IntegerConverter.java @@ -40,19 +40,18 @@ public class IntegerConverter extends AbstractStringObjectConverter { /** * Returns the convert to class. - * * @see org.x4o.xml.conv.ObjectConverter#getObjectClassTo() * @return The class to convert to. */ public Class getObjectClassTo() { return Integer.class; } - + /** * Converts string into object. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringTo(java.lang.String, java.util.Locale) - * @param str The string to convert to object. + * @param str The string to convert to object. * @param locale The locale to convert the string from. * @return The object converted from the string. * @throws ObjectConverterException When conversion fails. @@ -60,23 +59,22 @@ public class IntegerConverter extends AbstractStringObjectConverter { public Object convertStringTo(String str, Locale locale) throws ObjectConverterException { return Integer.valueOf(str); } - + /** * Converts object into string. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringBack(java.lang.Object, java.util.Locale) - * @param obj The object to convert to string. + * @param obj The object to convert to string. * @param locale The locale to convert the object from. * @return The string converted from the object. * @throws ObjectConverterException When conversion fails. */ - public String convertStringBack(Object obj, Locale locale) throws ObjectConverterException { - return ((Integer) obj).toString(); + public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException { + return ((Integer)obj).toString(); } - + /** * Clone this ObjectConverter. - * * @see org.x4o.xml.conv.AbstractObjectConverter#clone() * @return The cloned ObjectConverter. * @throws CloneNotSupportedException When cloning fails. @@ -84,7 +82,7 @@ public class IntegerConverter extends AbstractStringObjectConverter { @Override public ObjectConverter clone() throws CloneNotSupportedException { IntegerConverter result = new IntegerConverter(); - result.converters = cloneConverters(); + result.converters=cloneConverters(); return result; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/LongConverter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/LongConverter.java index f6c2ecc..fa6c9d7 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/LongConverter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/LongConverter.java @@ -40,19 +40,18 @@ public class LongConverter extends AbstractStringObjectConverter { /** * Returns the convert to class. - * * @see org.x4o.xml.conv.ObjectConverter#getObjectClassTo() * @return The class to convert to. */ public Class getObjectClassTo() { return Long.class; } - + /** * Converts string into object. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringTo(java.lang.String, java.util.Locale) - * @param str The string to convert to object. + * @param str The string to convert to object. * @param locale The locale to convert the string from. * @return The object converted from the string. * @throws ObjectConverterException When conversion fails. @@ -60,23 +59,22 @@ public class LongConverter extends AbstractStringObjectConverter { public Object convertStringTo(String str, Locale locale) throws ObjectConverterException { return Long.valueOf(str); } - + /** * Converts object into string. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringBack(java.lang.Object, java.util.Locale) - * @param obj The object to convert to string. + * @param obj The object to convert to string. * @param locale The locale to convert the object from. * @return The string converted from the object. * @throws ObjectConverterException When conversion fails. */ - public String convertStringBack(Object obj, Locale locale) throws ObjectConverterException { - return ((Long) obj).toString(); + public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException { + return ((Long)obj).toString(); } - + /** * Clone this ObjectConverter. - * * @see org.x4o.xml.conv.AbstractObjectConverter#clone() * @return The cloned ObjectConverter. * @throws CloneNotSupportedException When cloning fails. @@ -84,7 +82,7 @@ public class LongConverter extends AbstractStringObjectConverter { @Override public ObjectConverter clone() throws CloneNotSupportedException { LongConverter result = new LongConverter(); - result.converters = cloneConverters(); + result.converters=cloneConverters(); return result; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/StringSplitConverter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/StringSplitConverter.java index 0dcbf20..f6a3093 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/StringSplitConverter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/StringSplitConverter.java @@ -49,77 +49,76 @@ public class StringSplitConverter extends AbstractStringObjectConverter { private String singleToMethod = null; private Boolean useNativeType = null; private List stringSplitConverterSteps = null; - + public StringSplitConverter() { stringSplitConverterSteps = new ArrayList(10); } - + /** * Returns the convert to class. - * * @see org.x4o.xml.conv.ObjectConverter#getObjectClassTo() * @return The class to convert to. */ public Class getObjectClassTo() { return classTo; } - + /** * Converts string into object. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringTo(java.lang.String, java.util.Locale) - * @param str The string to convert to object. + * @param str The string to convert to object. * @param locale The locale to convert the string from. * @return The object converted from the string. * @throws ObjectConverterException When conversion fails. */ @SuppressWarnings("rawtypes") public Object convertStringTo(String str, Locale locale) throws ObjectConverterException { - if (split == null) { - throw new ObjectConverterException(this, "split is not set."); + if (split==null) { + throw new ObjectConverterException(this,"split is not set."); } - if (splitSize == null) { - throw new ObjectConverterException(this, "splitSize is not set."); + if (splitSize==null) { + throw new ObjectConverterException(this,"splitSize is not set."); } - if (classTo == null) { - throw new ObjectConverterException(this, "classTo is not set."); + if (classTo==null) { + throw new ObjectConverterException(this,"classTo is not set."); } String[] strSplit = str.split(split); - if (strSplit.length != splitSize) { - throw new ObjectConverterException(this, "Split size is wrong; " + strSplit.length + " need: " + splitSize); + if(strSplit.length!=splitSize) { + throw new ObjectConverterException(this,"Split size is wrong; "+strSplit.length+" need: "+splitSize); } List steps = getOrderedSteps(true); - if (steps.size() != splitSize) { - throw new ObjectConverterException(this, "Step size is wrong; " + steps.size() + " need: " + splitSize); + if (steps.size()!=splitSize) { + throw new ObjectConverterException(this,"Step size is wrong; "+steps.size()+" need: "+splitSize); } try { Object[] singleMethodValues = new Object[splitSize]; Object object = X4OLanguageClassLoader.newInstance(classTo); - for (int i = 0; i < steps.size(); i++) { + for (int i=0;i arguClass = new ArrayList(singleMethodValues.length); - for (int i = 0; i < singleMethodValues.length; i++) { + for (int i=0;i arguValue = new ArrayList(singleMethodValues.length); - for (int i = 0; i < singleMethodValues.length; i++) { + for (int i=0;i steps = getOrderedSteps(false); - if (steps.size() != splitSize) { - throw new ObjectConverterException(this, "Step size is wrong; " + steps.size() + " need: " + splitSize); + if (steps.size()!=splitSize) { + throw new ObjectConverterException(this,"Step size is wrong; "+steps.size()+" need: "+splitSize); } try { StringBuilder buf = new StringBuilder(200); - for (int i = 0; i < steps.size(); i++) { + for (int i=0;i getOrderedSteps(boolean isTo) { List result = new ArrayList(stringSplitConverterSteps.size()); result.addAll(stringSplitConverterSteps); - Collections.sort(stringSplitConverterSteps, new StringSplitConverterStepComparator(isTo)); + Collections.sort(stringSplitConverterSteps,new StringSplitConverterStepComparator(isTo)); return result; } public class StringSplitConverterStepComparator implements Comparator { boolean isTo = true; - - public StringSplitConverterStepComparator(boolean isTo) { - this.isTo = isTo; - } - + public StringSplitConverterStepComparator(boolean isTo) { this.isTo=isTo; } public int compare(StringSplitConverterStep e1, StringSplitConverterStep e2) { if (isTo) { return e1.getToOrder().compareTo(e2.getToOrder()); @@ -197,11 +191,11 @@ public class StringSplitConverter extends AbstractStringObjectConverter { } } } - + @SuppressWarnings("rawtypes") private List convertToNative(List types) throws ObjectConverterException { List result = new ArrayList(types.size()); - for (int i = 0; i < types.size(); i++) { + for (int i=0;i clazz = types.get(i); if (clazz.isAssignableFrom(Integer.class)) { result.add(Integer.TYPE); @@ -214,12 +208,12 @@ public class StringSplitConverter extends AbstractStringObjectConverter { } else if (clazz.isAssignableFrom(Boolean.class)) { result.add(Boolean.TYPE); } else { - throw new ObjectConverterException(this, "Can't convert type to native; " + clazz); + throw new ObjectConverterException(this,"Can't convert type to native; "+clazz); } } return result; } - + /** * @return the classTo */ @@ -275,7 +269,7 @@ public class StringSplitConverter extends AbstractStringObjectConverter { public void setSingleToMethod(String singleToMethod) { this.singleToMethod = singleToMethod; } - + /** * @return the useNativeType */ @@ -293,11 +287,9 @@ public class StringSplitConverter extends AbstractStringObjectConverter { public void addStringSplitConverterStep(StringSplitConverterStep stringSplitConverterStep) { stringSplitConverterSteps.add(stringSplitConverterStep); } - public void removeStringSplitConverterStep(StringSplitConverterStep stringSplitConverterStep) { stringSplitConverterSteps.remove(stringSplitConverterStep); } - public List getStringSplitConverterSteps() { return stringSplitConverterSteps; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/StringSplitConverterStep.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/StringSplitConverterStep.java index a968411..d501866 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/StringSplitConverterStep.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/StringSplitConverterStep.java @@ -37,70 +37,70 @@ public class StringSplitConverterStep { private Integer fromOrder = null; private String toMethod = null; private Integer toOrder = null; - + /** * @return the objectConverter */ public ObjectConverter getObjectConverter() { return objectConverter; } - + /** * @param objectConverter the objectConverter to set */ public void setObjectConverter(ObjectConverter objectConverter) { this.objectConverter = objectConverter; } - + /** * @return the fromMethod */ public String getFromMethod() { return fromMethod; } - + /** * @param fromMethod the fromMethod to set */ public void setFromMethod(String fromMethod) { this.fromMethod = fromMethod; } - + /** * @return the fromOrder */ public Integer getFromOrder() { return fromOrder; } - + /** * @param fromOrder the fromOrder to set */ public void setFromOrder(Integer fromOrder) { this.fromOrder = fromOrder; } - + /** * @return the toMethod */ public String getToMethod() { return toMethod; } - + /** * @param toMethod the toMethod to set */ public void setToMethod(String toMethod) { this.toMethod = toMethod; } - + /** * @return the toOrder */ public Integer getToOrder() { return toOrder; } - + /** * @param toOrder the toOrder to set */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/URLConverter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/URLConverter.java index af04f92..45f38c1 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/URLConverter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/conv/text/URLConverter.java @@ -42,19 +42,18 @@ public class URLConverter extends AbstractStringObjectConverter { /** * Returns the convert to class. - * * @see org.x4o.xml.conv.ObjectConverter#getObjectClassTo() * @return The class to convert to. */ public Class getObjectClassTo() { return URL.class; } - + /** * Converts string into object. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringTo(java.lang.String, java.util.Locale) - * @param str The string to convert to object. + * @param str The string to convert to object. * @param locale The locale to convert the string from. * @return The object converted from the string. * @throws ObjectConverterException When conversion fails. @@ -63,26 +62,25 @@ public class URLConverter extends AbstractStringObjectConverter { try { return new URL(str); } catch (MalformedURLException e) { - throw new ObjectConverterException(this, e.getMessage(), e); + throw new ObjectConverterException(this,e.getMessage(),e); } } - + /** * Converts object into string. * * @see org.x4o.xml.conv.AbstractStringObjectConverter#convertStringBack(java.lang.Object, java.util.Locale) - * @param obj The object to convert to string. + * @param obj The object to convert to string. * @param locale The locale to convert the object from. * @return The string converted from the object. * @throws ObjectConverterException When conversion fails. */ - public String convertStringBack(Object obj, Locale locale) throws ObjectConverterException { - return ((URL) obj).toString(); + public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException { + return ((URL)obj).toString(); } - + /** * Clone this ObjectConverter. - * * @see org.x4o.xml.conv.AbstractObjectConverter#clone() * @return The cloned ObjectConverter. * @throws CloneNotSupportedException When cloning fails. @@ -90,7 +88,7 @@ public class URLConverter extends AbstractStringObjectConverter { @Override public ObjectConverter clone() throws CloneNotSupportedException { URLConverter result = new URLConverter(); - result.converters = cloneConverters(); + result.converters=cloneConverters(); return result; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELContext.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELContext.java index dda8fa5..3e2a365 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELContext.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELContext.java @@ -41,31 +41,30 @@ import javax.el.VariableMapper; * @version 1.0 Sep 14, 2010 */ public class X4OELContext extends ELContext { - + private ELResolver elResolver = null; private FunctionMapper functionMapper = null; private VariableMapper variableMapper = null; - + /** * Creates a X4OELContext. */ public X4OELContext() { - + CompositeELResolver compositeELResolver = new CompositeELResolver(); compositeELResolver.add(new X4OELResolver(new HashMap(100))); compositeELResolver.add(new ArrayELResolver()); compositeELResolver.add(new ListELResolver()); compositeELResolver.add(new BeanELResolver()); compositeELResolver.add(new MapELResolver()); - - elResolver = compositeELResolver; + + elResolver = compositeELResolver; functionMapper = new X4OELFunctionMapper(); variableMapper = new X4OELVariableMapper(); } /** * Returns the ELResolver. - * * @return The ELResolver. * @see javax.el.ELContext#getELResolver() */ @@ -76,7 +75,6 @@ public class X4OELContext extends ELContext { /** * Returns the FunctionMapper. - * * @return The FunctionMapper. * @see javax.el.ELContext#getFunctionMapper() */ @@ -87,7 +85,6 @@ public class X4OELContext extends ELContext { /** * Returns the VariableMapper. - * * @return The VariableMapper. * @see javax.el.ELContext#getVariableMapper() */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELFunctionMapper.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELFunctionMapper.java index 32e1662..8e6d779 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELFunctionMapper.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELFunctionMapper.java @@ -36,55 +36,53 @@ import javax.el.FunctionMapper; * @version 1.0 Sep 14, 2010 */ public class X4OELFunctionMapper extends FunctionMapper { - + /** * Stores the el to method function mapping. */ - private Map functionMap = null; - + private Map functionMap = null; + /** * Creates a X4OELFunctionMapper. */ public X4OELFunctionMapper() { - functionMap = new HashMap(50); + functionMap = new HashMap(50); } - + /** * Resolves method el functions. - * - * @param prefix The function prefix. - * @param localName The local name of function. - * @return The resolved function or null is not found. + * @param prefix The function prefix. + * @param localName The local name of function. + * @return The resolved function or null is not found. */ @Override public Method resolveFunction(String prefix, String localName) { String key = prefix + ":" + localName; return functionMap.get(key); } - + /** * Add an static method to the function mapper. - * - * @param prefix The function prefix. - * @param localName The local name of function. - * @param method The method to execute on. + * @param prefix The function prefix. + * @param localName The local name of function. + * @param method The method to execute on. */ public void addFunction(String prefix, String localName, Method method) { - if (prefix == null || localName == null || method == null) { + if(prefix==null || localName==null || method==null) { throw new NullPointerException(); } int modifiers = method.getModifiers(); - if (!Modifier.isPublic(modifiers)) { + if(!Modifier.isPublic(modifiers)) { throw new IllegalArgumentException("method not public"); } - if (!Modifier.isStatic(modifiers)) { + if(!Modifier.isStatic(modifiers)) { throw new IllegalArgumentException("method not static"); } Class retType = method.getReturnType(); - if (retType == Void.TYPE) { + if(retType == Void.TYPE) { throw new IllegalArgumentException("method returns void"); } - + String key = prefix + ":" + localName; functionMap.put(key, method); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELResolver.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELResolver.java index 03f9fc2..aca8808 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELResolver.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELResolver.java @@ -29,6 +29,7 @@ import javax.el.ELContext; import javax.el.ELResolver; import javax.el.MapELResolver; + /** * X4OELResolver simple EL resolver. * @@ -36,39 +37,37 @@ import javax.el.MapELResolver; * @version 1.0 Sep 14, 2010 */ public class X4OELResolver extends ELResolver { - + private ELResolver delegate = null; - private Map objectStore = null; - + private Map objectStore = null; + /** * Creates X4OELResolver which is backed by the objectStore. - * - * @param objectStore The objectStore. + * @param objectStore The objectStore. */ public X4OELResolver(Map objectStore) { this.objectStore = objectStore; delegate = new MapELResolver(); } - + /** * Checks if base object is null and else return objectStore. - * - * @param base The base object to check. - * @return Returns the base object or objectStore. + * @param base The base object to check. + * @return Returns the base object or objectStore. */ private Object checkBase(Object base) { - if (base == null) { + if (base==null) { return objectStore; } return base; } - + @Override public Object getValue(ELContext context, Object base, Object property) { base = checkBase(base); return delegate.getValue(context, base, property); } - + @Override public Class getCommonPropertyType(ELContext context, Object base) { base = checkBase(base); @@ -77,7 +76,7 @@ public class X4OELResolver extends ELResolver { @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - public Iterator getFeatureDescriptors(ELContext context, Object base) { + public Iterator getFeatureDescriptors(ELContext context,Object base) { base = checkBase(base); return delegate.getFeatureDescriptors(context, base); } @@ -87,7 +86,7 @@ public class X4OELResolver extends ELResolver { base = checkBase(base); return delegate.getType(context, base, property); } - + @Override public boolean isReadOnly(ELContext context, Object base, Object property) { base = checkBase(base); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELVariableMapper.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELVariableMapper.java index 9948e05..e1845bc 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELVariableMapper.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OELVariableMapper.java @@ -35,17 +35,17 @@ import javax.el.VariableMapper; * @version 1.0 Sep 14, 2010 */ public class X4OELVariableMapper extends VariableMapper { - + /** Map to hold all the expressions used. */ private Map expressions = null; - + /** * Creates the X4OELVariableMapper. */ public X4OELVariableMapper() { expressions = new HashMap(); } - + /** * @see javax.el.VariableMapper#resolveVariable(java.lang.String) * @param var Resolve this var to an ValueExpression. @@ -58,7 +58,7 @@ public class X4OELVariableMapper extends VariableMapper { /** * @see javax.el.VariableMapper#setVariable(java.lang.String, javax.el.ValueExpression) - * @param var Resolve this var to an ValueExpression. + * @param var Resolve this var to an ValueExpression. * @param expression The ValueExpression of the var. * @return The ValueExpression being set. */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OExpressionFactory.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OExpressionFactory.java index 9b7dba3..d7c0de0 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OExpressionFactory.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/el/X4OExpressionFactory.java @@ -28,7 +28,7 @@ import javax.el.ExpressionFactory; import org.x4o.xml.lang.X4OLanguageClassLoader; /** - * X4OExpressionFactory finds and loads the needed impl. + * X4OExpressionFactory finds and loads the needed impl. * * @author Willem Cazander * @version 1.0 Apr 7, 2013 @@ -37,7 +37,7 @@ public class X4OExpressionFactory { static public final String EL_FACTORY_IMPL_APACHE = "org.apache.el.ExpressionFactoryImpl"; static public final String EL_FACTORY_IMPL_ODYSSEUS = "de.odysseus.el.ExpressionFactoryImpl"; - + static public ExpressionFactory createExpressionFactory() { ExpressionFactory result = null; try { @@ -48,18 +48,17 @@ public class X4OExpressionFactory { Class expressionFactoryClass = X4OLanguageClassLoader.loadClass(EL_FACTORY_IMPL_ODYSSEUS); result = X4OLanguageClassLoader.newInstance(ExpressionFactory.class, expressionFactoryClass); } catch (ClassNotFoundException ee) { - throw new RuntimeException("Could not load ExpressionFactory tried: " + EL_FACTORY_IMPL_APACHE + " and " + EL_FACTORY_IMPL_ODYSSEUS - + " but could not load one of them."); + throw new RuntimeException("Could not load ExpressionFactory tried: "+EL_FACTORY_IMPL_APACHE+" and "+EL_FACTORY_IMPL_ODYSSEUS+" but could not load one of them."); } } return result; } - - static public ELContext createELContext(Class elContextClass) { + + static public ELContext createELContext(Class elContextClass) { try { return X4OLanguageClassLoader.newInstance(ELContext.class, elContextClass); } catch (ClassNotFoundException e) { - throw new RuntimeException("Could not create instance of ELContext: " + e.getMessage(), e); + throw new RuntimeException("Could not create instance of ELContext: "+e.getMessage(),e); } } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/CelDriver.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/CelDriver.java index c6cf9c1..ce98907 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/CelDriver.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/CelDriver.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld; +package org.x4o.xml.eld; import org.x4o.xml.X4ODriver; import org.x4o.xml.lang.X4OLanguageModule; @@ -35,9 +35,9 @@ public class CelDriver extends X4ODriver { /** Defines the identifier of the 'Core Element Language' language. */ public static final String LANGUAGE_NAME = "cel"; - + /** Defines the versions this langauge knowns. */ - public static final String[] LANGUAGE_VERSIONS = new String[] { X4ODriver.DEFAULT_LANGUAGE_VERSION }; + public static final String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION}; @Override public String getLanguageName() { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldDriver.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldDriver.java index 69d1751..7b4ebde 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldDriver.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldDriver.java @@ -20,13 +20,14 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld; +package org.x4o.xml.eld; import org.x4o.xml.X4ODriver; import org.x4o.xml.lang.X4OLanguageModule; /** - * An Element Language Definition X4O parser. This eld parser config parent x4o parser with the eld x4o parser. + * An Element Language Definition X4O parser. + * This eld parser config parent x4o parser with the eld x4o parser. * * @author Willem Cazander * @version 1.0 Aug 20, 2005 @@ -35,15 +36,15 @@ public class EldDriver extends X4ODriver { /** Defines the identifier of the 'Element Language Description' language. */ public static final String LANGUAGE_NAME = "eld"; - + /** Defines the identifier of the ELD x4o language. */ - public static final String[] LANGUAGE_VERSIONS = new String[] { X4ODriver.DEFAULT_LANGUAGE_VERSION }; - + public static final String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION}; + @Override public String getLanguageName() { return LANGUAGE_NAME; } - + @Override public String[] getLanguageVersions() { return LANGUAGE_VERSIONS; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoader.java index 856a467..7656783 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoader.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoader.java @@ -52,20 +52,19 @@ public class EldModuleLoader implements X4OLanguageModuleLoader { private final Logger logger; private final String eldResource; private final boolean isEldCore; - + /** The EL key to access the parent language module. */ public static final String EL_PARENT_LANGUAGE_MODULE = "parentLanguageModule"; - + /** The EL key to access the parent language element langauge. */ public static final String EL_PARENT_LANGUAGE = "parentLanguage"; - + /** - * Creates an ELD/CEL module loader. - * - * @param eldResource The resource to load. - * @param isEldCore If true then load CEL else load ELD. + * Creates an ELD/CEL module loader. + * @param eldResource The resource to load. + * @param isEldCore If true then load CEL else load ELD. */ - public EldModuleLoader(String eldResource, boolean isEldCore) { + public EldModuleLoader(String eldResource,boolean isEldCore) { if (eldResource == null) { throw new NullPointerException("Can't load null eld resource."); } @@ -76,15 +75,13 @@ public class EldModuleLoader implements X4OLanguageModuleLoader { /** * Loads the ELD language into the module. - * - * @param session The session we run in. + * @param session The session we run in. * @param language The local Language to load for. - * @param module The language module to load it into. + * @param module The language module to load it into. * @throws X4OLanguageModuleLoaderException When eld language could not be loaded. * @see org.x4o.xml.lang.X4OLanguageModuleLoader#loadLanguageModule(org.x4o.xml.lang.X4OLanguageLocal, org.x4o.xml.lang.X4OLanguageModuleLocal) */ - public void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal module) - throws X4OLanguageModuleLoaderException { + public void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal module) throws X4OLanguageModuleLoaderException { logger.fine("Loading name eld file from resource: " + eldResource); try { X4ODriver driver = null; @@ -101,23 +98,21 @@ public class EldModuleLoader implements X4OLanguageModuleLoader { } reader.readResource(eldResource); } catch (X4OConnectionException e) { - throw new X4OLanguageModuleLoaderException(this, e.getMessage() + " while parsing: " + eldResource, e); + throw new X4OLanguageModuleLoaderException(this,e.getMessage()+" while parsing: "+eldResource,e); } catch (SAXException e) { - throw new X4OLanguageModuleLoaderException(this, e.getMessage() + " while parsing: " + eldResource, e); + throw new X4OLanguageModuleLoaderException(this,e.getMessage()+" while parsing: "+eldResource,e); } catch (IOException e) { - throw new X4OLanguageModuleLoaderException(this, e.getMessage() + " while parsing: " + eldResource, e); + throw new X4OLanguageModuleLoaderException(this,e.getMessage()+" while parsing: "+eldResource,e); } } - + public static X4OLanguage getLanguage(X4OLanguageSession context) { - ValueExpression ee = context.getExpressionLanguageFactory().createValueExpression(context.getExpressionLanguageContext(), - "${" + EL_PARENT_LANGUAGE + "}", X4OLanguage.class); - return (X4OLanguage) ee.getValue(context.getExpressionLanguageContext()); + ValueExpression ee = context.getExpressionLanguageFactory().createValueExpression(context.getExpressionLanguageContext(),"${"+EL_PARENT_LANGUAGE+"}", X4OLanguage.class); + return (X4OLanguage)ee.getValue(context.getExpressionLanguageContext()); } - + public static X4OLanguageModule getLanguageModule(X4OLanguageSession context) { - ValueExpression ee = context.getExpressionLanguageFactory().createValueExpression(context.getExpressionLanguageContext(), - "${" + EL_PARENT_LANGUAGE_MODULE + "}", X4OLanguageModule.class); - return (X4OLanguageModule) ee.getValue(context.getExpressionLanguageContext()); + ValueExpression ee = context.getExpressionLanguageFactory().createValueExpression(context.getExpressionLanguageContext(),"${"+EL_PARENT_LANGUAGE_MODULE+"}", X4OLanguageModule.class); + return (X4OLanguageModule)ee.getValue(context.getExpressionLanguageContext()); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java index 27c4b31..b54488f 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java @@ -51,7 +51,8 @@ import org.x4o.xml.lang.X4OLanguageModuleLocal; import org.x4o.xml.lang.X4OLanguageSession; /** - * EldModuleLoaderCore provides a few basic elements for the core eld x4o language. + * EldModuleLoaderCore provides a few basic elements for the core eld x4o + * language. * * @author Willem Cazander * @version 1.0 Jan 11, 2009 @@ -88,11 +89,11 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader { * @param session The session to run in. * @param language The langauge to load for. * @param languageModule The module to load it in. - * @see org.x4o.xml.lang.X4OLanguageModuleLoader#loadLanguageModule(org.x4o.xml.lang.X4OLanguageLocal, org.x4o.xml.lang.X4OLanguageModuleLocald) + * @see org.x4o.xml.lang.X4OLanguageModuleLoader#loadLanguageModule(org.x4o.xml.lang.X4OLanguageLocal, + * org.x4o.xml.lang.X4OLanguageModuleLocald) */ @Override - public void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal languageModule) - throws X4OLanguageModuleLoaderException { + public void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal languageModule) throws X4OLanguageModuleLoaderException { // Config module meta data configLanguageModule(languageModule); @@ -112,8 +113,7 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader { // Create cel-root namespace in language for schema support ElementNamespace namespaceRoot = createNamespaceContext(language, CEL_ROOT, CEL_ROOT_URI, CEL_ROOT_XSD_URI, CEL_ROOT_XSD_FILE, CEL_ROOT); namespaceRoot.setLanguageRoot(true); // Only define single language root so xsd is (mostly) not cicle import. - ElementClass rootElement = createElementClass(language, "module", language.getLanguageConfiguration().getDefaultElementLanguageModule(), - ModuleElement.class, "The module tag is the root xml element for ELD language."); + ElementClass rootElement = createElementClass(language, "module", language.getLanguageConfiguration().getDefaultElementLanguageModule(), ModuleElement.class, "The module tag is the root xml element for ELD language."); rootElement.addElementClassAttribute(createElementClassAttribute(language, "id", true, null)); rootElement.addElementClassAttribute(createElementClassAttribute(language, "providerHost", true, null)); namespaceRoot.addElementClass(rootElement); @@ -130,16 +130,14 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader { private void configElementClasses(X4OLanguage language, ElementNamespace namespace) throws X4OLanguageModuleLoaderException { ElementClass ec = null; - namespace.addElementClass(createElementClass(language, "attribute", language.getLanguageConfiguration().getDefaultElementClassAttribute(), null, - "Defines xml element attribute.")); + namespace.addElementClass(createElementClass(language, "attribute", language.getLanguageConfiguration().getDefaultElementClassAttribute(), null, "Defines xml element attribute.")); ec = createElementClass(language, "attributeAlias", null, AttributeAliasElement.class, "Adds an attribute alias."); ec.addElementClassAttribute(createElementClassAttribute(language, "name", true, null)); ec.addElementParent(CEL_CORE_URI, "attribute"); namespace.addElementClass(ec); - namespace.addElementClass( - createElementClass(language, "classConverter", ClassConverter.class, null, "Converts string attribute to java class instance.")); + namespace.addElementClass(createElementClass(language, "classConverter", ClassConverter.class, null, "Converts string attribute to java class instance.")); ec = createElementClass(language, "namespace", language.getLanguageConfiguration().getDefaultElementNamespace(), null, "Defines an xml namespace."); ec.addElementClassAttribute(createElementClassAttribute(language, "uri", true, null)); @@ -150,8 +148,7 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader { ec.addElementClassAttribute(createElementClassAttribute(language, "elementClass", false, new ClassConverter())); namespace.addElementClass(ec); - ec = createElementClass(language, "elementInterface", language.getLanguageConfiguration().getDefaultElementInterface(), null, - "Defines element interface class."); + ec = createElementClass(language, "elementInterface", language.getLanguageConfiguration().getDefaultElementInterface(), null, "Defines element interface class."); ec.addElementClassAttribute(createElementClassAttribute(language, "interfaceClass", false, new ClassConverter())); namespace.addElementClass(ec); @@ -207,8 +204,7 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader { languageModule.setDescription("Core Element Language Module Loader"); } - private void startAndAddNamespace(X4OLanguageLocal language, X4OLanguageModuleLocal languageModule, ElementNamespace namespace) - throws X4OLanguageModuleLoaderException { + private void startAndAddNamespace(X4OLanguageLocal language, X4OLanguageModuleLocal languageModule, ElementNamespace namespace) throws X4OLanguageModuleLoaderException { try { namespace.getElementNamespaceInstanceProvider().start(language, namespace); } catch (ElementNamespaceInstanceProviderException e) { @@ -217,8 +213,7 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader { languageModule.addElementNamespace(namespace); } - private ElementNamespace createNamespaceContext(X4OLanguageLocal language, String id, String uri, String schemaUri, String schemaResource, - String schemaPrefix) throws X4OLanguageModuleLoaderException { + private ElementNamespace createNamespaceContext(X4OLanguageLocal language, String id, String uri, String schemaUri, String schemaResource, String schemaPrefix) throws X4OLanguageModuleLoaderException { logger.finer("Creating " + language.getLanguageName() + " namespace."); ElementNamespace namespace; try { @@ -227,8 +222,7 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader { throw new X4OLanguageModuleLoaderException(this, e.getMessage(), e); } try { - namespace.setElementNamespaceInstanceProvider(X4OLanguageClassLoader.newInstance(ElementNamespaceInstanceProvider.class, - language.getLanguageConfiguration().getDefaultElementNamespaceInstanceProvider())); + namespace.setElementNamespaceInstanceProvider(X4OLanguageClassLoader.newInstance(ElementNamespaceInstanceProvider.class, language.getLanguageConfiguration().getDefaultElementNamespaceInstanceProvider())); } catch (ClassNotFoundException e) { throw new X4OLanguageModuleLoaderException(this, e.getMessage(), e); } @@ -240,8 +234,7 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader { return namespace; } - private ElementClass createElementClass(X4OLanguage language, String tag, Class objectClass, Class elementClass, String description) - throws X4OLanguageModuleLoaderException { + private ElementClass createElementClass(X4OLanguage language, String tag, Class objectClass, Class elementClass, String description) throws X4OLanguageModuleLoaderException { try { ElementClass result = X4OLanguageClassLoader.newInstance(ElementClass.class, language.getLanguageConfiguration().getDefaultElementClass()); result.setId(tag); @@ -264,11 +257,9 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader { * @return The new ElementClassAttribute instance. * @throws X4OLanguageModuleLoaderException When class could not be created. */ - private ElementClassAttribute createElementClassAttribute(X4OLanguage language, String name, boolean required, ObjectConverter converter) - throws X4OLanguageModuleLoaderException { + private ElementClassAttribute createElementClassAttribute(X4OLanguage language, String name, boolean required, ObjectConverter converter) throws X4OLanguageModuleLoaderException { try { - ElementClassAttribute result = X4OLanguageClassLoader.newInstance(ElementClassAttribute.class, - language.getLanguageConfiguration().getDefaultElementClassAttribute()); + ElementClassAttribute result = X4OLanguageClassLoader.newInstance(ElementClassAttribute.class, language.getLanguageConfiguration().getDefaultElementClassAttribute()); result.setId(name); if (required) { result.setRequired(required); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java index de05a4f..dc7794a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java @@ -37,14 +37,14 @@ import org.x4o.xml.lang.task.X4OLanguageTaskExecutor; */ public class EldDocLanguageTask extends AbstractX4OLanguageTask { - public static final String TASK_ID = "eld-doc"; + public static final String TASK_ID = "eld-doc"; private static final String TASK_NAME = "ELD DOC Writer Task"; private static final String TASK_DESC = "Writes out the documentation of the language elements."; - + public EldDocLanguageTask() { - super(TASK_ID, TASK_NAME, TASK_DESC, EldDocWriter.DEFAULT_PROPERTY_CONFIG); + super(TASK_ID,TASK_NAME,TASK_DESC,EldDocWriter.DEFAULT_PROPERTY_CONFIG); } - + /** * Executes this language task. */ @@ -52,9 +52,9 @@ public class EldDocLanguageTask extends AbstractX4OLanguageTask { return new X4OLanguageTaskExecutor() { public void execute(X4OLanguage language) throws X4OLanguageTaskException { try { - new EldDocWriter(language, config).writeDocumentation(); + new EldDocWriter(language,config).writeDocumentation(); } catch (ElementException e) { - throw new X4OLanguageTaskException(config, e.getMessage(), e); + throw new X4OLanguageTaskException(config,e.getMessage(),e); } } }; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java index a46305d..b367c17 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java @@ -60,8 +60,7 @@ import org.x4o.xml.lang.X4OLanguageSession; * @version 1.0 Aug 26, 2010 */ public class EldDocWriter { - - //@formatter:off + private final static String DEFAULT_NAME = "X4O ELD DOC"; private final static String DEFAULT_DESCRIPTION = "X4O Meta Language Documentation."; @@ -117,29 +116,26 @@ public class EldDocWriter { new PropertyConfigItem(PAGE_PRINT_HELP,Boolean.class,true) ); } - //@formatter:on - + /** The config of this writer. */ private final SAX3PropertyConfig propertyConfig; - + /** The language to write doc over. */ private final X4OLanguage language; - + /** * Creates an EldDocGenerator for this langauge context. - * - * @param language The language to generate doc for. + * @param language The language to generate doc for. */ - public EldDocWriter(X4OLanguage language, SAX3PropertyConfig parentConfig) { - this.language = language; - this.propertyConfig = new SAX3PropertyConfig(DEFAULT_PROPERTY_CONFIG, PROPERTY_CONTEXT_PREFIX); + public EldDocWriter(X4OLanguage language,SAX3PropertyConfig parentConfig) { + this.language=language; + this.propertyConfig=new SAX3PropertyConfig(DEFAULT_PROPERTY_CONFIG,PROPERTY_CONTEXT_PREFIX); this.propertyConfig.copyParentProperties(parentConfig); } - + /** * Writes the language documentation to the base path. - * - * @throws ElementException Is thrown when error is done. + * @throws ElementException Is thrown when error is done. */ public void writeDocumentation() throws ElementException { try { @@ -151,163 +147,124 @@ public class EldDocWriter { throw new ElementException(e); } } - + /** * Creates a fully configured ApiDco object. - * - * @return The ApiDoc configured to write eld documentation. + * @return The ApiDoc configured to write eld documentation. */ private MaisDoc buildLanguageDoc() { - + // Generic config MaisDoc doc = new MaisDoc(); List javadocLinkList = propertyConfig.getPropertyList(JAVADOC_LINK); - Map javadocLinkOfflineMap = propertyConfig.getPropertyMap(JAVADOC_LINK_OFFLINE); - if (javadocLinkList != null) { - for (String javadocUrl : javadocLinkList) { + Map javadocLinkOfflineMap = propertyConfig.getPropertyMap(JAVADOC_LINK_OFFLINE); + if (javadocLinkList!=null) { + for (String javadocUrl:javadocLinkList) { doc.addRemoteClass(new MaisDocRemoteClass(javadocUrl)); } } - if (javadocLinkOfflineMap != null) { - for (Map.Entry offlineLink : javadocLinkOfflineMap.entrySet()) { - doc.addRemoteClass(new MaisDocRemoteClass(offlineLink.getKey(), offlineLink.getValue())); + if (javadocLinkOfflineMap!=null) { + for (Map.Entry offlineLink:javadocLinkOfflineMap.entrySet()) { + doc.addRemoteClass(new MaisDocRemoteClass(offlineLink.getKey(),offlineLink.getValue())); } } - doc.setName(propertyConfig.getPropertyString(DOC_NAME, DEFAULT_NAME)); - doc.setDescription(propertyConfig.getPropertyString(DOC_DESCRIPTION, DEFAULT_DESCRIPTION)); - doc.setDocAbout(propertyConfig.getPropertyString(DOC_ABOUT, createLanguageAbout())); - doc.setDocCopyright(propertyConfig.getPropertyString(DOC_COPYRIGHT, createLanguageCopyright())); - doc.setDocPageSubTitle(propertyConfig.getPropertyString(DOC_PAGE_SUB_TITLE, createPageSubTitle())); - doc.setMetaStyleSheetThema(propertyConfig.getPropertyString(META_STYLESHEET_THEMA)); - doc.setMetaStyleSheet(propertyConfig.getPropertyFile(META_STYLESHEET)); - List keywords = propertyConfig.getPropertyList(META_KEYWORDS); - if (keywords == null) { + doc.setName( propertyConfig.getPropertyString(DOC_NAME, DEFAULT_NAME)); + doc.setDescription( propertyConfig.getPropertyString(DOC_DESCRIPTION, DEFAULT_DESCRIPTION)); + doc.setDocAbout( propertyConfig.getPropertyString(DOC_ABOUT, createLanguageAbout())); + doc.setDocCopyright( propertyConfig.getPropertyString(DOC_COPYRIGHT, createLanguageCopyright())); + doc.setDocPageSubTitle( propertyConfig.getPropertyString(DOC_PAGE_SUB_TITLE, createPageSubTitle())); + doc.setMetaStyleSheetThema( propertyConfig.getPropertyString(META_STYLESHEET_THEMA)); + doc.setMetaStyleSheet( propertyConfig.getPropertyFile(META_STYLESHEET)); + List keywords = propertyConfig.getPropertyList(META_KEYWORDS); + if (keywords==null) { keywords = createLanguageKeywords(); } doc.addMetaKeywordAll(keywords); doc.setNoFrameAllName("All Elements"); doc.setFrameNavPrintParent(true); doc.setFrameNavPrintParentId(true); - doc.setGroupTypeName("summary", "Summary", 1); - doc.setGroupTypeName("overview", "Overview", 2); + doc.setGroupTypeName("summary", "Summary",1); + doc.setGroupTypeName("overview", "Overview",2); doc.setFrameNavConceptClass(ElementClass.class); - + doc.addTreeNodePageModeClass(X4OLanguageSession.class); doc.addTreeNodePageModeClass(X4OLanguageModule.class); doc.addTreeNodePageModeClass(ElementInterface.class); doc.addTreeNodePageModeClass(ElementNamespace.class); - + doc.addAnnotatedClasses(EldDocWriterLanguage.class); doc.addAnnotatedClasses(EldDocWriterLanguageModule.class); doc.addAnnotatedClasses(EldDocWriterElementClass.class); doc.addAnnotatedClasses(EldDocWriterElementNamespace.class); doc.addAnnotatedClasses(EldDocWriterElementInterface.class); - - MaisDocConcept adcRoot = doc.addConcept(new MaisDocConcept(null, C_CONTEXT, X4OLanguage.class)); - MaisDocConcept adcMod = doc.addConcept(new MaisDocConcept(adcRoot, C_MODULE, X4OLanguageModule.class)); - MaisDocConcept adcIface = doc.addConcept(new MaisDocConcept(adcMod, C_INTERFACE, ElementInterface.class)); - MaisDocConcept adcNs = doc.addConcept(new MaisDocConcept(adcMod, C_NAMESPACE, ElementNamespace.class)); - MaisDocConcept adcEc = doc.addConcept(new MaisDocConcept(adcNs, C_ELEMENT, ElementClass.class)); - + + MaisDocConcept adcRoot = doc.addConcept(new MaisDocConcept(null,C_CONTEXT,X4OLanguage.class)); + MaisDocConcept adcMod = doc.addConcept(new MaisDocConcept(adcRoot,C_MODULE,X4OLanguageModule.class)); + MaisDocConcept adcIface = doc.addConcept(new MaisDocConcept(adcMod,C_INTERFACE,ElementInterface.class)); + MaisDocConcept adcNs = doc.addConcept(new MaisDocConcept(adcMod,C_NAMESPACE,ElementNamespace.class)); + MaisDocConcept adcEc = doc.addConcept(new MaisDocConcept(adcNs,C_ELEMENT,ElementClass.class)); + // mm maybe redo something here - adcMod.addChildConcept(new MaisDocConcept(adcMod, CC_ATTRIBUTE_H, ElementNamespaceAttribute.class)); - adcMod.addChildConcept(new MaisDocConcept(adcMod, CC_CONFIGURATOR_G, ElementConfiguratorGlobal.class)); - adcMod.addChildConcept(new MaisDocConcept(adcMod, CC_BINDING, ElementBindingHandler.class)); - adcIface.addChildConcept(new MaisDocConcept(adcMod, CC_ATTRIBUTE, ElementClassAttribute.class)); - adcIface.addChildConcept(new MaisDocConcept(adcMod, CC_CONFIGURATOR, ElementConfigurator.class)); - adcEc.addChildConcept(new MaisDocConcept(adcEc, CC_CONFIGURATOR, ElementConfigurator.class)); - adcEc.addChildConcept(new MaisDocConcept(adcEc, CC_ATTRIBUTE, ElementClassAttribute.class)); - + adcMod.addChildConcept(new MaisDocConcept(adcMod,CC_ATTRIBUTE_H,ElementNamespaceAttribute.class)); + adcMod.addChildConcept(new MaisDocConcept(adcMod,CC_CONFIGURATOR_G,ElementConfiguratorGlobal.class)); + adcMod.addChildConcept(new MaisDocConcept(adcMod,CC_BINDING,ElementBindingHandler.class)); + adcIface.addChildConcept(new MaisDocConcept(adcMod,CC_ATTRIBUTE,ElementClassAttribute.class)); + adcIface.addChildConcept(new MaisDocConcept(adcMod,CC_CONFIGURATOR,ElementConfigurator.class)); + adcEc.addChildConcept(new MaisDocConcept(adcEc,CC_CONFIGURATOR,ElementConfigurator.class)); + adcEc.addChildConcept(new MaisDocConcept(adcEc,CC_ATTRIBUTE,ElementClassAttribute.class)); + // Non-tree pages config - if (propertyConfig.getPropertyBoolean(PAGE_PRINT_XTREE)) { - doc.addDocPage(EldDocXTreePageWriter.createDocPage()); - } - if (propertyConfig.getPropertyBoolean(PAGE_PRINT_TREE)) { - doc.addDocPage(DefaultPageWriterTree.createDocPage()); - } - if (propertyConfig.getPropertyBoolean(PAGE_PRINT_INDEX_ALL)) { - doc.addDocPage(DefaultPageWriterIndexAll.createDocPage()); - } - if (propertyConfig.getPropertyBoolean(PAGE_PRINT_HELP)) { - doc.addDocPage(DefaultPageWriterHelp.createDocPage()); - } - + if (propertyConfig.getPropertyBoolean(PAGE_PRINT_XTREE)) { doc.addDocPage(EldDocXTreePageWriter.createDocPage()); } + if (propertyConfig.getPropertyBoolean(PAGE_PRINT_TREE)) { doc.addDocPage(DefaultPageWriterTree.createDocPage()); } + if (propertyConfig.getPropertyBoolean(PAGE_PRINT_INDEX_ALL)) { doc.addDocPage(DefaultPageWriterIndexAll.createDocPage()); } + if (propertyConfig.getPropertyBoolean(PAGE_PRINT_HELP)) { doc.addDocPage(DefaultPageWriterHelp.createDocPage()); } + // Doc tree config - MaisDocNode rootNode = new MaisDocNode(language, "language", getLanguageNameUpperCase() + " Language", - "The X4O " + getLanguageNameUpperCase() + " Language"); + MaisDocNode rootNode = new MaisDocNode(language,"language",getLanguageNameUpperCase()+" Language","The X4O "+getLanguageNameUpperCase()+" Language"); doc.setRootNode(rootNode); - for (X4OLanguageModule mod : language.getLanguageModules()) { - MaisDocNode modNode = rootNode.addNode(createNodeLanguageModule(mod)); - for (ElementBindingHandler bind : mod.getElementBindingHandlers()) { - modNode.addNode(createNodeElementBindingHandler(bind)); - } - for (ElementConfiguratorGlobal conf : mod.getElementConfiguratorGlobals()) { - modNode.addNode(createNodeElementConfiguratorGlobal(conf)); - } - for (ElementInterface iface : mod.getElementInterfaces()) { - MaisDocNode ifaceNode = modNode.addNode(createNodeElementInterface(iface)); - for (ElementClassAttribute eca : iface.getElementClassAttributes()) { - ifaceNode.addNode(createNodeElementClassAttribute(eca)); - } - for (ElementConfigurator conf : iface.getElementConfigurators()) { - ifaceNode.addNode(createNodeElementConfigurator(conf)); - } - } - for (ElementNamespace ns : mod.getElementNamespaces()) { - MaisDocNode nsNode = modNode.addNode(createNodeElementNamespace(ns)); - for (ElementNamespaceAttribute attr : ns.getElementNamespaceAttributes()) { - nsNode.addNode(createNodeElementNamespaceAttribute(attr)); - } - for (ElementClass ec : ns.getElementClasses()) { - MaisDocNode ecNode = nsNode.addNode(createNodeElementClass(ec)); - for (ElementClassAttribute eca : ec.getElementClassAttributes()) { - ecNode.addNode(createNodeElementClassAttribute(eca)); - } - for (ElementConfigurator conf : ec.getElementConfigurators()) { - ecNode.addNode(createNodeElementConfigurator(conf)); - } - } - } + for (X4OLanguageModule mod:language.getLanguageModules()) { MaisDocNode modNode = rootNode.addNode(createNodeLanguageModule(mod)); + for (ElementBindingHandler bind:mod.getElementBindingHandlers()) { modNode.addNode(createNodeElementBindingHandler(bind)); } + for (ElementConfiguratorGlobal conf:mod.getElementConfiguratorGlobals()) { modNode.addNode(createNodeElementConfiguratorGlobal(conf)); } + for (ElementInterface iface:mod.getElementInterfaces()) { MaisDocNode ifaceNode = modNode.addNode(createNodeElementInterface(iface)); + for (ElementClassAttribute eca:iface.getElementClassAttributes()) { ifaceNode.addNode(createNodeElementClassAttribute(eca)); } + for (ElementConfigurator conf:iface.getElementConfigurators()) { ifaceNode.addNode(createNodeElementConfigurator(conf)); } } + for (ElementNamespace ns:mod.getElementNamespaces()) { MaisDocNode nsNode = modNode.addNode(createNodeElementNamespace(ns)); + for (ElementNamespaceAttribute attr:ns.getElementNamespaceAttributes()) { nsNode.addNode(createNodeElementNamespaceAttribute(attr)); } + for (ElementClass ec:ns.getElementClasses()) { MaisDocNode ecNode = nsNode.addNode(createNodeElementClass(ec)); + for (ElementClassAttribute eca:ec.getElementClassAttributes()) { ecNode.addNode(createNodeElementClassAttribute(eca)); } + for (ElementConfigurator conf:ec.getElementConfigurators()) { ecNode.addNode(createNodeElementConfigurator(conf)); } } } } return doc; } - + private MaisDocNode createNodeElementBindingHandler(ElementBindingHandler bind) { - return new MaisDocNode(bind, bind.getId(), bind.getId(), bind.getDescription()); + return new MaisDocNode(bind,bind.getId(),bind.getId(),bind.getDescription()); } - private MaisDocNode createNodeElementNamespaceAttribute(ElementNamespaceAttribute attr) { - return new MaisDocNode(attr, attr.getId(), attr.getId(), attr.getDescription()); + return new MaisDocNode(attr,attr.getId(),attr.getId(),attr.getDescription()); } - private MaisDocNode createNodeElementConfiguratorGlobal(ElementConfiguratorGlobal conf) { - return new MaisDocNode(conf, conf.getId(), conf.getId(), conf.getDescription()); + return new MaisDocNode(conf,conf.getId(),conf.getId(),conf.getDescription()); } - private MaisDocNode createNodeElementConfigurator(ElementConfigurator conf) { - return new MaisDocNode(conf, conf.getId(), conf.getId(), conf.getDescription()); + return new MaisDocNode(conf,conf.getId(),conf.getId(),conf.getDescription()); } - private MaisDocNode createNodeLanguageModule(X4OLanguageModule mod) { - return new MaisDocNode(mod, mod.getId(), mod.getId(), mod.getDescription()); + return new MaisDocNode(mod,mod.getId(),mod.getId(),mod.getDescription()); } - private MaisDocNode createNodeElementInterface(ElementInterface iface) { - return new MaisDocNode(iface, iface.getId(), iface.getId(), iface.getDescription()); + return new MaisDocNode(iface,iface.getId(),iface.getId(),iface.getDescription()); } - private MaisDocNode createNodeElementNamespace(ElementNamespace ns) { - return new MaisDocNode(ns, ns.getId(), ns.getUri(), ns.getDescription()); + return new MaisDocNode(ns,ns.getId(),ns.getUri(),ns.getDescription()); } - private MaisDocNode createNodeElementClass(ElementClass ec) { - return new MaisDocNode(ec, ec.getId(), ec.getId(), ec.getDescription()); + return new MaisDocNode(ec,ec.getId(),ec.getId(),ec.getDescription()); } - private MaisDocNode createNodeElementClassAttribute(ElementClassAttribute eca) { - return new MaisDocNode(eca, eca.getId(), eca.getId(), eca.getDescription()); + return new MaisDocNode(eca,eca.getId(),eca.getId(),eca.getDescription()); } - + private String createPageSubTitle() { StringBuilder buf = new StringBuilder(100); buf.append(language.getLanguageName()); @@ -316,7 +273,7 @@ public class EldDocWriter { buf.append(" API"); return buf.toString(); } - + private String createLanguageAbout() { StringBuilder buf = new StringBuilder(100); buf.append("XML X4O Language\n"); @@ -325,7 +282,7 @@ public class EldDocWriter { buf.append(language.getLanguageVersion()); return buf.toString(); } - + private String createLanguageCopyright() { Calendar calendar = Calendar.getInstance(); StringBuilder buf = new StringBuilder(100); @@ -337,7 +294,7 @@ public class EldDocWriter { buf.append("All Rights Reserved."); return buf.toString(); } - + private List createLanguageKeywords() { List keywords = new ArrayList(10); keywords.add(language.getLanguageName()); @@ -350,7 +307,7 @@ public class EldDocWriter { keywords.add("documentation"); return keywords; } - + private String getLanguageNameUpperCase() { return language.getLanguageName().toUpperCase(); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java index ecb045a..591a51e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java @@ -50,17 +50,15 @@ import org.x4o.xml.lang.X4OLanguageModule; * @version 1.0 May 29, 2013 */ public class EldDocWriterElementClass implements MaisDocContentPrinter { - - @MaisDocNodeDataConfiguratorMethod(targetClasses = { ElementClass.class }) - public void configNavBar(MaisDoc doc, MaisDocNode node, MaisDocNodeData data) { + + @MaisDocNodeDataConfiguratorMethod(targetClasses={ElementClass.class}) + public void configNavBar(MaisDoc doc,MaisDocNode node,MaisDocNodeData data) { /* - //@formatter:off ElementClass ec = (ElementClass)node.getUserData(); Collection list = ec.getElementClassAttributes(); if (list.isEmpty()) { clearHrefContentGroupAlways(doc,"summary","attribute"); } - //@formatter:om */ clearHrefContentGroup(doc,node,"summary","attribute",ElementClassAttribute.class); clearHrefContentGroup(doc,node,"summary","configurator",ElementConfigurator.class); @@ -82,7 +80,6 @@ public class EldDocWriterElementClass implements MaisDocContentPrinter { } /* - //@formatter:off @ApiDocNodeWriterMethod(nodeBody=ApiDocNodeBody.SUMMARY,targetClasses={ElementClass.class},nodeBodyOrders={2},contentGroup="attribute",contentGroupType="summary") public void writeElementX4OAttributeSummary(ApiDocWriteEvent event) throws SAXException { ElementClass ec = (ElementClass)event.getEventObject().getUserData(); @@ -98,79 +95,77 @@ public class EldDocWriterElementClass implements MaisDocContentPrinter { } writer.docTableEnd(); } - //@formatter:on */ - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { ElementClass.class }, nodeBodyOrders = { - 10 }, contentGroup = "bean", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={ElementClass.class},nodeBodyOrders={10},contentGroup="bean",contentGroupType="summary") public void writeElementObjectPropertiesSummary(MaisDocWriteEvent event) throws IOException { - ElementClass ec = (ElementClass) event.getEventObject().getUserData(); + ElementClass ec = (ElementClass)event.getEventObject().getUserData(); Class beanClass = ec.getObjectClass(); - if (beanClass == null) { + if (beanClass==null) { return; } printApiTableBeanClass(event, beanClass, "Object"); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.DESCRIPTION_LINKS, targetClasses = { ElementClass.class }) + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.DESCRIPTION_LINKS,targetClasses={ElementClass.class}) public void writeElementRelationLinks(MaisDocWriteEvent event) throws IOException { MaisDocContentWriter writer = event.getWriter(); - ElementClass ec = (ElementClass) event.getEventObject().getUserData(); - ElementNamespace ns = (ElementNamespace) event.getEventObject().getParent().getUserData(); - X4OLanguageModule mod = (X4OLanguageModule) event.getEventObject().getParent().getParent().getUserData(); - X4OLanguage language = (X4OLanguage) event.getEventObject().getParent().getParent().getParent().getUserData(); - + ElementClass ec = (ElementClass)event.getEventObject().getUserData(); + ElementNamespace ns = (ElementNamespace)event.getEventObject().getParent().getUserData(); + X4OLanguageModule mod = (X4OLanguageModule)event.getEventObject().getParent().getParent().getUserData(); + X4OLanguage language = (X4OLanguage)event.getEventObject().getParent().getParent().getParent().getUserData(); + // TODO: this is hacky - EldDocXTreePageWriter xtree = (EldDocXTreePageWriter) event.getDoc().findDocPageById("overview-xtree").getPageWriters().get(0); - + EldDocXTreePageWriter xtree = (EldDocXTreePageWriter)event.getDoc().findDocPageById("overview-xtree").getPageWriters().get(0); + TreeNode node = xtree.new TreeNode(); - node.language = language; - node.module = mod; - node.namespace = ns; - node.elementClass = ec; - + node.language=language; + node.module=mod; + node.namespace=ns; + node.elementClass=ec; + String pathPrefix = "../../../../language/"; - + List parents = xtree.findParents(node); writer.printTagStart(Tag.dl); - writer.printTagCharacters(Tag.dt, "All Element Parents:"); - writer.printTagStart(Tag.dd); - if (parents.isEmpty()) { - writer.printCharacters("No parent."); - } - for (int i = 0; i < parents.size(); i++) { - TreeNode n = parents.get(i); - String uri = toElementUri(pathPrefix, n.module, n.namespace, n.elementClass); - writer.printHref(uri, n.namespace.getId() + ":" + n.elementClass.getId()); - if (i < parents.size() - 1) { - writer.printCharacters(", "); - } - } - writer.printTagEnd(Tag.dd); + writer.printTagCharacters(Tag.dt,"All Element Parents:"); + writer.printTagStart(Tag.dd); + if (parents.isEmpty()) { + writer.printCharacters("No parent."); + } + for (int i=0;i childs = xtree.findChilderen(node); writer.printTagStart(Tag.dl); - writer.printTagCharacters(Tag.dt, "All Element Childeren:"); - writer.printTagStart(Tag.dd); - if (childs.isEmpty()) { - writer.printCharacters("No childeren."); - } - for (int i = 0; i < childs.size(); i++) { - TreeNode n = childs.get(i); - String uri = toElementUri(pathPrefix, n.module, n.namespace, n.elementClass); - writer.printHref(uri, n.namespace.getId() + ":" + n.elementClass.getId()); - if (i < childs.size() - 1) { - writer.printCharacters(", "); - } - } - writer.printTagEnd(Tag.dd); + writer.printTagCharacters(Tag.dt,"All Element Childeren:"); + writer.printTagStart(Tag.dd); + if (childs.isEmpty()) { + writer.printCharacters("No childeren."); + } + for (int i=0;i event) throws SAXException, IOException { - printApiTableBean(event, "Interface", "description"); + printApiTableBean(event,"Interface","description"); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { ElementInterface.class }, nodeBodyOrders = { - 2 }, contentGroup = "attribute", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={ElementInterface.class},nodeBodyOrders={2},contentGroup="attribute",contentGroupType="summary") public void writeElementClassAttribute(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Element Class Attribute Summary", ElementClassAttribute.class); + printApiTable(event,"Element Class Attribute Summary",ElementClassAttribute.class); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { ElementInterface.class }, nodeBodyOrders = { - 3 }, contentGroup = "binding", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={ElementInterface.class},nodeBodyOrders={3},contentGroup="binding",contentGroupType="summary") public void writeElementBindingHandler(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Element Binding Handler Summary", ElementBindingHandler.class); + printApiTable(event,"Element Binding Handler Summary",ElementBindingHandler.class); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { ElementInterface.class }, nodeBodyOrders = { - 4 }, contentGroup = "configurator", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={ElementInterface.class},nodeBodyOrders={4},contentGroup="configurator",contentGroupType="summary") public void writeElementConfigurator(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Element Configurator Summary", ElementConfigurator.class); + printApiTable(event,"Element Configurator Summary",ElementConfigurator.class); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java index bfbf9ef..ff0ad7f 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java @@ -43,26 +43,24 @@ import org.xml.sax.SAXException; * @version 1.0 Aug 14, 2013 */ public class EldDocWriterElementNamespace implements MaisDocContentPrinter { - - @MaisDocNodeDataConfiguratorMethod(targetClasses = { ElementNamespace.class }) - public void configNavBar(MaisDoc doc, MaisDocNode node, MaisDocNodeData data) { - clearHrefContentGroup(doc, node, "summary", "element", ElementClass.class); + + @MaisDocNodeDataConfiguratorMethod(targetClasses={ElementNamespace.class}) + public void configNavBar(MaisDoc doc,MaisDocNode node,MaisDocNodeData data) { + clearHrefContentGroup(doc,node,"summary","element",ElementClass.class); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { ElementNamespace.class }, nodeBodyOrders = { - 1 }, contentGroup = "namespace", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={ElementNamespace.class},nodeBodyOrders={1},contentGroup="namespace",contentGroupType="summary") public void writeElementNamespaceBeanProperties(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTableBean(event, "Namespace", "description", "elementClasses", "elementNamespaceInstanceProvider", "prefixMapping"); + printApiTableBean(event,"Namespace","description","elementClasses","elementNamespaceInstanceProvider","prefixMapping"); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { ElementNamespace.class }, nodeBodyOrders = { - 2 }, contentGroup = "element", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={ElementNamespace.class},nodeBodyOrders={2},contentGroup="element",contentGroupType="summary") public void writeElementNamespaceElements(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Element Summary", ElementClass.class); + printApiTable(event,"Element Summary",ElementClass.class); } - - // @ApiDocNodeWriterMethod(nodeBody=ApiDocNodeBody.SUMMARY_PAGE,targetClasses={ElementNamespace.class},nodeBodyOrders={2}) - // public void writeElementNamespaceAttributes(ApiDocWriteEvent event) throws SAXException { - // printApiTable(event,"Element Summary",ElementClass.class); - // } + + //@ApiDocNodeWriterMethod(nodeBody=ApiDocNodeBody.SUMMARY_PAGE,targetClasses={ElementNamespace.class},nodeBodyOrders={2}) + //public void writeElementNamespaceAttributes(ApiDocWriteEvent event) throws SAXException { + // printApiTable(event,"Element Summary",ElementClass.class); + //} } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java index 1a91faa..d0ac9d2 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java @@ -47,47 +47,47 @@ import org.xml.sax.SAXException; */ public class EldDocWriterLanguage implements MaisDocContentPrinter { - // TODO move - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { ElementBindingHandler.class }) + // TODO move + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={ElementBindingHandler.class}) public void writeElementBindingHandlerBean(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTableBean(event, "BindingHandler", "description"); + printApiTableBean(event,"BindingHandler","description"); } - // TODO move - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { ElementConfigurator.class }) + // TODO move + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={ElementConfigurator.class}) public void writeElementConfiguratorBean(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTableBean(event, "Configurator", "description"); + printApiTableBean(event,"Configurator","description"); } - - // TODO move - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { ElementClassAttribute.class }) + + // TODO move + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={ElementClassAttribute.class}) public void writeElementClassAttributeBean(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTableBean(event, "Element Class Attribute", "description"); + printApiTableBean(event,"Element Class Attribute","description"); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { X4OLanguage.class }, nodeBodyOrders = { 1 }) + + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={X4OLanguage.class},nodeBodyOrders={1}) public void writeLanguageSummary(MaisDocWriteEvent event) throws SAXException, IOException { MaisDocContentWriter writer = event.getWriter(); MaisDocNode node = event.getEventObject(); - X4OLanguage language = (X4OLanguage) node.getUserData(); + X4OLanguage language = (X4OLanguage)node.getUserData(); int attrHandlers = 0; int bindHandlers = 0; int interFaces = 0; int eleConfigs = 0; int elements = 0; int namespaces = 0; - for (X4OLanguageModule mod : language.getLanguageModules()) { + for (X4OLanguageModule mod:language.getLanguageModules()) { bindHandlers += mod.getElementBindingHandlers().size(); interFaces += mod.getElementInterfaces().size(); eleConfigs += mod.getElementConfiguratorGlobals().size(); - for (ElementNamespace ns : mod.getElementNamespaces()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { namespaces++; elements += ns.getElementClasses().size(); attrHandlers += ns.getElementNamespaceAttributes().size(); } } - writer.docTableStart("Language Summary", "Language Stats Summary.", MaisDocContentCss.overviewSummary); - //@formatter:off + writer.docTableStart("Language Summary", "Language Stats Summary.",MaisDocContentCss.overviewSummary); writer.docTableHeader("Name", "Value"); writer.docTableRow("LanguageName:", ""+language.getLanguageName(), null); writer.docTableRow("LanguageVersion:",""+language.getLanguageVersion(),null); @@ -99,26 +99,23 @@ public class EldDocWriterLanguage implements MaisDocContentPrinter { writer.docTableRow("ElementBindingHandlers:",""+bindHandlers,null); writer.docTableRow("ElementConfigurators:",""+eleConfigs,null); writer.docTableEnd(); - //@formatter:on } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { X4OLanguage.class }, nodeBodyOrders = { 2 }) + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={X4OLanguage.class},nodeBodyOrders={2}) public void writeModulesSummary(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Module Summary", X4OLanguageModule.class); + printApiTable(event,"Module Summary",X4OLanguageModule.class); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { X4OLanguage.class }, nodeBodyOrders = { 3 }) + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={X4OLanguage.class},nodeBodyOrders={3}) public void writeNamespaceSummary(MaisDocWriteEvent event) throws SAXException, IOException { MaisDocContentWriter writer = event.getWriter(); MaisDocNode node = event.getEventObject(); - X4OLanguage language = (X4OLanguage) node.getUserData(); - writer.docTableStart("Namespace Summary", "All Language Namespaces Overview", MaisDocContentCss.overviewSummary); + X4OLanguage language = (X4OLanguage)node.getUserData(); + writer.docTableStart("Namespace Summary", "All Language Namespaces Overview",MaisDocContentCss.overviewSummary); writer.docTableHeader("ID", "URI"); - for (X4OLanguageModule mod : language.getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { - writer.docTableRowLink( - "language/" + MaisDocContentWriter.toSafeUri(mod.getId()) + "/" + MaisDocContentWriter.toSafeUri(ns.getId()) + "/index.html", - ns.getId(), ns.getUri()); + for (X4OLanguageModule mod:language.getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { + writer.docTableRowLink("language/"+MaisDocContentWriter.toSafeUri(mod.getId())+"/"+MaisDocContentWriter.toSafeUri(ns.getId())+"/index.html",ns.getId(),ns.getUri()); } } writer.docTableEnd(); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java index c79d74f..2ea01f5 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java @@ -48,43 +48,38 @@ import org.xml.sax.SAXException; * @version 1.0 Aug 10, 2013 */ public class EldDocWriterLanguageModule implements MaisDocContentPrinter { - - @MaisDocNodeDataConfiguratorMethod(targetClasses = { X4OLanguageModule.class }) - public void configNavBar(MaisDoc doc, MaisDocNode node, MaisDocNodeData data) { - clearHrefContentGroup(doc, node, "summary", "interface", ElementInterface.class); - clearHrefContentGroup(doc, node, "summary", "binding", ElementBindingHandler.class); - clearHrefContentGroup(doc, node, "summary", "attribute", ElementNamespaceAttribute.class); - clearHrefContentGroup(doc, node, "summary", "configurator", ElementConfigurator.class); - clearHrefContentGroup(doc, node, "summary", "namespace", ElementNamespace.class); + + @MaisDocNodeDataConfiguratorMethod(targetClasses={X4OLanguageModule.class}) + public void configNavBar(MaisDoc doc,MaisDocNode node,MaisDocNodeData data) { + clearHrefContentGroup(doc,node,"summary","interface",ElementInterface.class); + clearHrefContentGroup(doc,node,"summary","binding",ElementBindingHandler.class); + clearHrefContentGroup(doc,node,"summary","attribute",ElementNamespaceAttribute.class); + clearHrefContentGroup(doc,node,"summary","configurator",ElementConfigurator.class); + clearHrefContentGroup(doc,node,"summary","namespace",ElementNamespace.class); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { X4OLanguageModule.class }, nodeBodyOrders = { - 1 }, contentGroup = "interface", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={X4OLanguageModule.class},nodeBodyOrders={1},contentGroup="interface",contentGroupType="summary") public void writeInterfaceSummary(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Interface Summary", ElementInterface.class); + printApiTable(event,"Interface Summary",ElementInterface.class); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { X4OLanguageModule.class }, nodeBodyOrders = { - 2 }, contentGroup = "binding", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={X4OLanguageModule.class},nodeBodyOrders={2},contentGroup="binding",contentGroupType="summary") public void writeBindingSummary(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Binding Summary", ElementBindingHandler.class); + printApiTable(event,"Binding Summary",ElementBindingHandler.class); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { X4OLanguageModule.class }, nodeBodyOrders = { - 3 }, contentGroup = "attribute", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={X4OLanguageModule.class},nodeBodyOrders={3},contentGroup="attribute",contentGroupType="summary") public void writeAttributeSummary(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Attribute Summary", ElementNamespaceAttribute.class); + printApiTable(event,"Attribute Summary",ElementNamespaceAttribute.class); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { X4OLanguageModule.class }, nodeBodyOrders = { - 4 }, contentGroup = "configurator", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={X4OLanguageModule.class},nodeBodyOrders={4},contentGroup="configurator",contentGroupType="summary") public void writeConfigutorSummary(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Configurator Summary", ElementConfigurator.class); + printApiTable(event,"Configurator Summary",ElementConfigurator.class); } - - @MaisDocNodeWriterMethod(nodeBody = MaisDocNodeBody.SUMMARY, targetClasses = { X4OLanguageModule.class }, nodeBodyOrders = { - 5 }, contentGroup = "namespace", contentGroupType = "summary") + + @MaisDocNodeWriterMethod(nodeBody=MaisDocNodeBody.SUMMARY,targetClasses={X4OLanguageModule.class},nodeBodyOrders={5},contentGroup="namespace",contentGroupType="summary") public void writeNamespaceSummary(MaisDocWriteEvent event) throws SAXException, IOException { - printApiTable(event, "Namespace Summary", ElementNamespace.class); + printApiTable(event,"Namespace Summary",ElementNamespace.class); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java index a12ad66..1013d63 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java @@ -50,68 +50,66 @@ import org.x4o.xml.lang.X4OLanguageModule; * @version 1.0 May 29, 2013 */ public class EldDocXTreePageWriter extends DefaultPageWriterTree implements MaisDocPageWriter { - + public static MaisDocPage createDocPage() { - return new MaisDocPage("overview-xtree", "XTree", "XTree of dom elements.", new EldDocXTreePageWriter()); + return new MaisDocPage("overview-xtree","XTree","XTree of dom elements.",new EldDocXTreePageWriter()); } - + // TODO: rm this old tree code; - private void walkTree(TreeNode node, MaisDocContentWriter writer, String pathPrefix) throws IOException { - String href = toElementUri(pathPrefix, node.module, node.namespace, node.elementClass); - + private void walkTree(TreeNode node,MaisDocContentWriter writer,String pathPrefix) throws IOException { + String href = toElementUri(pathPrefix,node.module,node.namespace,node.elementClass); + writer.printTagStart(Tag.ul); - writer.printTagStart(Tag.li, "", null, "circle"); + writer.printTagStart(Tag.li,"",null,"circle"); writer.printCharacters(node.namespace.getId()); writer.printCharacters(":"); writer.printHref(href, node.elementClass.getId(), node.elementClass.getId(), "strong"); writer.printTagEnd(Tag.li); - + List childs = findChilderen(node); - for (TreeNode child : childs) { - walkTree(child, writer, pathPrefix); + for (TreeNode child:childs) { + walkTree(child,writer,pathPrefix); } writer.printTagEnd(Tag.ul); } - + /** * TODO: remove this - * * @see org.x4o.maisdoc.flake.DefaultPageWriterTree#writePageContent(org.x4o.maisdoc.model.MaisDocWriteEvent) */ @Override public void writePageContent(MaisDocWriteEvent e) throws IOException { - // selectRootNode(e.getDoc()); // create + //selectRootNode(e.getDoc()); // create MaisDoc doc = e.getDoc(); - X4OLanguage language = (X4OLanguage) doc.getRootNode().getUserData(); - + X4OLanguage language = (X4OLanguage)doc.getRootNode().getUserData(); + String pathPrefix = "language/"; - + // temp print old way List rootNodes = new ArrayList(3); - for (X4OLanguageModule mod : language.getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { - if (ns.getLanguageRoot() != null && ns.getLanguageRoot()) { + for (X4OLanguageModule mod:language.getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { + if (ns.getLanguageRoot()!=null && ns.getLanguageRoot()) { // found language root elements. - for (ElementClass ec : ns.getElementClasses()) { + for (ElementClass ec:ns.getElementClasses()) { TreeNode node = new TreeNode(); - node.language = language; - node.module = mod; - node.namespace = ns; - node.elementClass = ec; + node.language=language; + node.module=mod; + node.namespace=ns; + node.elementClass=ec; rootNodes.add(node); } } } } - Collections.sort(rootNodes, new TreeNodeComparator()); - for (TreeNode rootNode : rootNodes) { - walkTree(rootNode, e.getWriter(), pathPrefix); + Collections.sort(rootNodes,new TreeNodeComparator()); + for (TreeNode rootNode:rootNodes) { + walkTree(rootNode,e.getWriter(),pathPrefix); } } - - private String toElementUri(String pathPrefix, X4OLanguageModule mod, ElementNamespace namespace, ElementClass ec) { + private String toElementUri(String pathPrefix,X4OLanguageModule mod,ElementNamespace namespace,ElementClass ec) { StringBuilder buf = new StringBuilder(100); - if (pathPrefix != null) { + if (pathPrefix!=null) { buf.append(pathPrefix); } buf.append(MaisDocContentWriter.toSafeUri(mod.getId())); @@ -123,9 +121,9 @@ public class EldDocXTreePageWriter extends DefaultPageWriterTree implements Mais return buf.toString(); } + /** * Overrided to select the dom view of the tree. - * * @see org.x4o.maisdoc.flake.DefaultPageWriterTree#selectRootNode(org.x4o.maisdoc.model.MaisDoc) */ @Override @@ -133,47 +131,49 @@ public class EldDocXTreePageWriter extends DefaultPageWriterTree implements Mais try { return createXTree(doc); } catch (IOException e) { - throw new IllegalStateException("Could not create XTree for: " + doc.getName() + " error: " + e.getMessage(), e); + throw new IllegalStateException("Could not create XTree for: "+doc.getName()+" error: "+e.getMessage(),e); } } - + private MaisDocNode createXTree(MaisDoc doc) throws IOException { - - X4OLanguage language = (X4OLanguage) doc.getRootNode().getUserData(); - MaisDocNode root = new MaisDocNode(language, "root", "Root", "Language root"); - + + X4OLanguage language = (X4OLanguage)doc.getRootNode().getUserData(); + MaisDocNode root = new MaisDocNode(language,"root","Root","Language root"); + List rootNodes = new ArrayList(3); - for (X4OLanguageModule mod : language.getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { - if (ns.getLanguageRoot() != null && ns.getLanguageRoot()) { + for (X4OLanguageModule mod:language.getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { + if (ns.getLanguageRoot()!=null && ns.getLanguageRoot()) { // found language root elements. - for (ElementClass ec : ns.getElementClasses()) { + for (ElementClass ec:ns.getElementClasses()) { TreeNode node = new TreeNode(); - node.language = language; - node.module = mod; - node.namespace = ns; - node.elementClass = ec; + node.language=language; + node.module=mod; + node.namespace=ns; + node.elementClass=ec; rootNodes.add(node); } } } } - Collections.sort(rootNodes, new TreeNodeComparator()); - for (TreeNode rootNode : rootNodes) { - walkTree(rootNode, "../"); + Collections.sort(rootNodes,new TreeNodeComparator()); + for (TreeNode rootNode:rootNodes) { + walkTree(rootNode,"../"); } - + + return root; } - - private void walkTree(TreeNode node, String pathPrefix) throws IOException { - // String href = toElementUri(pathPrefix,node.module,node.namespace,node.elementClass); + + private void walkTree(TreeNode node,String pathPrefix) throws IOException { + //String href = toElementUri(pathPrefix,node.module,node.namespace,node.elementClass); List childs = findChilderen(node); - for (TreeNode child : childs) { - walkTree(child, pathPrefix); + for (TreeNode child:childs) { + walkTree(child,pathPrefix); } } - + + class TreeNode { X4OLanguage language; X4OLanguageModule module; @@ -182,148 +182,150 @@ public class EldDocXTreePageWriter extends DefaultPageWriterTree implements Mais TreeNode parent; int indent = 0; } - + public List findChilderen(TreeNode node) { List result = new ArrayList(10); - - if (node.indent > 20) { + + if (node.indent>20) { return result; // hard fail limit } - for (X4OLanguageModule mod : node.language.getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { - for (ElementClass ec : ns.getElementClasses()) { - TreeNode n = null; + for (X4OLanguageModule mod:node.language.getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { + for (ElementClass ec:ns.getElementClasses()) { + TreeNode n=null; List tags = ec.getElementParents(node.namespace.getUri()); - if (tags != null && tags.contains(node.elementClass.getId())) { + if (tags!=null && tags.contains(node.elementClass.getId())) { n = new TreeNode(); - n.language = node.language; - n.module = mod; - n.namespace = ns; - n.elementClass = ec; - n.indent = node.indent + 1; - n.parent = node; + n.language=node.language; + n.module=mod; + n.namespace=ns; + n.elementClass=ec; + n.indent=node.indent+1; + n.parent=node; } else { - if (ec.getObjectClass() == null) { + if (ec.getObjectClass()==null) { continue; } // Check interfaces of parent , and see if child tag is there. - for (ElementInterface ei : node.language.findElementInterfaces(ec.getObjectClass())) { + for (ElementInterface ei:node.language.findElementInterfaces(ec.getObjectClass())) { List eiTags = ei.getElementParents(node.namespace.getUri()); - if (eiTags != null && eiTags.contains(node.elementClass.getId())) { + if (eiTags!=null && eiTags.contains(node.elementClass.getId())) { n = new TreeNode(); - n.language = node.language; - n.module = mod; - n.namespace = ns; - n.elementClass = ec; - n.indent = node.indent + 1; - n.parent = node; + n.language=node.language; + n.module=mod; + n.namespace=ns; + n.elementClass=ec; + n.indent=node.indent+1; + n.parent=node; break; } } - - if (node.elementClass.getObjectClass() == null) { + + if (node.elementClass.getObjectClass()==null) { continue; } List binds = node.language.findElementBindingHandlers(node.elementClass.getObjectClass(), ec.getObjectClass()); - if (binds.isEmpty() == false) { + if (binds.isEmpty()==false) { n = new TreeNode(); - n.language = node.language; - n.module = mod; - n.namespace = ns; - n.elementClass = ec; - n.indent = node.indent + 1; - n.parent = node; + n.language=node.language; + n.module=mod; + n.namespace=ns; + n.elementClass=ec; + n.indent=node.indent+1; + n.parent=node; } } - if (n != null && isInTree(node, n) == false) { + if (n!=null && isInTree(node,n)==false) { result.add(n); } } } } - Collections.sort(result, new TreeNodeComparator()); + Collections.sort(result,new TreeNodeComparator()); return result; } - - private boolean isInTree(TreeNode node, TreeNode checkNode) { - - if (node.namespace.getUri().equals(checkNode.namespace.getUri()) && node.elementClass.getId().equals(checkNode.elementClass.getId())) { + + private boolean isInTree(TreeNode node,TreeNode checkNode) { + + if ( node.namespace.getUri().equals(checkNode.namespace.getUri()) && + node.elementClass.getId().equals(checkNode.elementClass.getId()) + ) { return true; } - if (node.parent != null) { - return isInTree(node.parent, checkNode); + if (node.parent!=null) { + return isInTree(node.parent,checkNode); } return false; } - + public List findParents(TreeNode node) { List result = new ArrayList(10); - TreeNode n = null; - for (X4OLanguageModule mod : node.language.getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { - + TreeNode n=null; + for (X4OLanguageModule mod:node.language.getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { + List tags = node.elementClass.getElementParents(ns.getUri()); - if (tags != null) { - for (ElementClass ec : ns.getElementClasses()) { + if (tags!=null) { + for (ElementClass ec:ns.getElementClasses()) { if (tags.contains(ec.getId())) { n = new TreeNode(); - n.language = node.language; - n.module = mod; - n.namespace = ns; - n.elementClass = ec; - n.indent = node.indent + 1; - n.parent = node; + n.language=node.language; + n.module=mod; + n.namespace=ns; + n.elementClass=ec; + n.indent=node.indent+1; + n.parent=node; result.add(n); } } } - for (ElementClass ec : ns.getElementClasses()) { + for (ElementClass ec:ns.getElementClasses()) { // Check interfaces of parent , and see if child tag is there. - if (node.elementClass.getObjectClass() != null) { - for (ElementInterface ei : node.language.findElementInterfaces(node.elementClass.getObjectClass())) { + if (node.elementClass.getObjectClass()!=null) { + for (ElementInterface ei:node.language.findElementInterfaces(node.elementClass.getObjectClass())) { List eiTags = ei.getElementParents(ns.getUri()); - if (eiTags != null && eiTags.contains(ec.getId())) { + if (eiTags!=null && eiTags.contains(ec.getId())) { n = new TreeNode(); - n.language = node.language; - n.module = mod; - n.namespace = ns; - n.elementClass = ec; - n.indent = node.indent + 1; - n.parent = node; + n.language=node.language; + n.module=mod; + n.namespace=ns; + n.elementClass=ec; + n.indent=node.indent+1; + n.parent=node; result.add(n); break; } } } - if (ec.getObjectClass() == null) { + if (ec.getObjectClass()==null) { continue; } - if (node.elementClass.getObjectClass() == null) { + if (node.elementClass.getObjectClass()==null) { continue; } - List binds = node.language.findElementBindingHandlers(ec.getObjectClass(), node.elementClass.getObjectClass()); - if (binds.isEmpty() == false) { + List binds = node.language.findElementBindingHandlers(ec.getObjectClass(),node.elementClass.getObjectClass()); + if (binds.isEmpty()==false) { n = new TreeNode(); - n.language = node.language; - n.module = mod; - n.namespace = ns; - n.elementClass = ec; - n.indent = node.indent + 1; - n.parent = node; - if (isInTree(node, n) == false) { + n.language=node.language; + n.module=mod; + n.namespace=ns; + n.elementClass=ec; + n.indent=node.indent+1; + n.parent=node; + if (isInTree(node,n)==false) { result.add(n); } } } } } - Collections.sort(result, new TreeNodeComparator()); + Collections.sort(result,new TreeNodeComparator()); return result; } - + class TreeNodeComparator implements Comparator { - public int compare(TreeNode o1, TreeNode o2) { + public int compare(TreeNode o1,TreeNode o2) { return o1.elementClass.getId().compareTo(o2.elementClass.getId()); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/AttributeAliasElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/AttributeAliasElement.java index 88aae96..75d235e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/AttributeAliasElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/AttributeAliasElement.java @@ -36,20 +36,19 @@ public class AttributeAliasElement extends AbstractElement { /** * Add the xml attribute 'name' to ElementClassAttribute as attribute alias. - * * @see org.x4o.xml.element.AbstractElement#doElementEnd() * @throws ElementException When name attribute is not set or when parent element object is not ElementClassAttribute interface. */ @Override public void doElementEnd() throws ElementException { String alias = getAttributes().get("name"); - if (alias == null) { - throw new ElementException("'name' attribute is not set on: " + getElementClass().getId()); + if (alias==null) { + throw new ElementException("'name' attribute is not set on: "+getElementClass().getId()); } if (getParent().getElementObject() instanceof ElementClassAttribute) { - ((ElementClassAttribute) getParent().getElementObject()).addAttributeAlias(alias); + ((ElementClassAttribute)getParent().getElementObject()).addAttributeAlias(alias); } else { - throw new ElementException("Wrong parent class is not ElementClassAttribute but: " + getParent().getElementObject()); + throw new ElementException("Wrong parent class is not ElementClassAttribute but: "+getParent().getElementObject()); } } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/BeanElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/BeanElement.java index d94c124..dd2c486 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/BeanElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/BeanElement.java @@ -38,36 +38,33 @@ import org.x4o.xml.lang.X4OLanguageClassLoader; * @version 1.0 Jan 21, 2007 */ public class BeanElement extends AbstractElement { - + private List constructorArguments = null; - + /** * Creates a BeanElement. */ public BeanElement() { constructorArguments = new ArrayList(3); } - + /** * On start of element create the element object, filled from the bean.class attribute. - * * @throws ElementException When bean could not be created. */ @Override public void doElementStart() throws ElementException { String className = getAttributes().get("bean.class"); - if ("".equals(className) | className == null) { - throw new ElementException("Set the bean.class attribute"); - } + if("".equals(className) | className==null) { throw new ElementException("Set the bean.class attribute"); } try { - Class beanClass = X4OLanguageClassLoader.loadClass(className); + Class beanClass = X4OLanguageClassLoader.loadClass(className); if (constructorArguments.isEmpty()) { setElementObject(X4OLanguageClassLoader.newInstance(beanClass)); } else { Class[] arguClass = new Class[constructorArguments.size()]; constructorArguments.toArray(arguClass); Constructor c = beanClass.getConstructor(arguClass); - setElementObject(c.newInstance(constructorArguments)); + setElementObject(c.newInstance(constructorArguments)); } } catch (ClassNotFoundException e) { throw new ElementException(e); @@ -82,15 +79,14 @@ public class BeanElement extends AbstractElement { } catch (InvocationTargetException e) { throw new ElementException(e); } - } - + } + /** * Add bean constructor arguments. - * - * @param argu The argument to add to constructor. + * @param argu The argument to add to constructor. */ public void addConstuctorArgument(Object argu) { - if (argu == null) { + if (argu==null) { throw new NullPointerException("Can't add null argument for constructor."); } constructorArguments.add(argu); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/DescriptionElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/DescriptionElement.java index 74f898f..24704ab 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/DescriptionElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/DescriptionElement.java @@ -33,16 +33,15 @@ import org.x4o.xml.element.ElementException; * @version 1.0 Jan 13, 2009 */ public class DescriptionElement extends AbstractElement { - + /** * Starts the description element and validates that it is not root and parent is meta base. - * - * @throws ElementException When parent element object is not meta base object. + * @throws ElementException When parent element object is not meta base object. * @see org.x4o.xml.element.AbstractElement#doElementStart() */ @Override public void doElementStart() throws ElementException { - if (getParent() == null) { + if (getParent()==null) { throw new ElementException("can't be a root tag"); } if (getParent().getElementObject() instanceof ElementMetaBase == false) { @@ -52,9 +51,8 @@ public class DescriptionElement extends AbstractElement { /** * The description elememt body characters are stored as element object. - * - * @param characters The text of the description. - * @throws ElementException When super has error. + * @param characters The text of the description. + * @throws ElementException When super has error. * @see org.x4o.xml.element.AbstractElement#doCharacters(java.lang.String) */ @Override @@ -65,17 +63,16 @@ public class DescriptionElement extends AbstractElement { /** * Ends the description element and sets the description on the parent. - * - * @throws ElementException When parent element object is not meta base object. + * @throws ElementException When parent element object is not meta base object. * @see org.x4o.xml.element.AbstractElement#doElementEnd() */ @Override public void doElementEnd() throws ElementException { - if (getElementObject() == null) { + if (getElementObject()==null) { throw new ElementException("description is not set."); } if (getParent().getElementObject() instanceof ElementMetaBase) { - ((ElementMetaBase) getParent().getElementObject()).setDescription(getElementObject().toString()); + ((ElementMetaBase)getParent().getElementObject()).setDescription(getElementObject().toString()); } else { throw new ElementException("Wrong parent class is not ElementClass"); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassAddParentElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassAddParentElement.java index d4fda27..b497ba5 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassAddParentElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassAddParentElement.java @@ -41,17 +41,17 @@ public class ElementClassAddParentElement extends AbstractElement { @Override public void doElementEnd() throws ElementException { String tag = getAttributes().get("tag"); - if (tag == null) { - throw new ElementException("'tag' attribute is not set on: " + getElementClass().getId()); + if (tag==null) { + throw new ElementException("'tag' attribute is not set on: "+getElementClass().getId()); } String namespaceUri = getAttributes().get("uri"); - if (namespaceUri == null) { + if (namespaceUri==null) { namespaceUri = getParent().getParent().getAttributes().get("uri"); // copy uri from namespace element. } if (getParent().getElementObject() instanceof ElementClassBase) { - ((ElementClassBase) getParent().getElementObject()).addElementParent(namespaceUri, tag); + ((ElementClassBase)getParent().getElementObject()).addElementParent(namespaceUri,tag); } else { - throw new ElementException("Wrong parent class is not ElementClassBase but: " + getParent().getElementObject()); + throw new ElementException("Wrong parent class is not ElementClassBase but: "+getParent().getElementObject()); } } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassAttributeBindingHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassAttributeBindingHandler.java index db90794..c79e1fb 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassAttributeBindingHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassAttributeBindingHandler.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.lang; +package org.x4o.xml.eld.lang; import org.x4o.xml.conv.ObjectConverter; import org.x4o.xml.element.AbstractElementBindingHandler; @@ -36,8 +36,11 @@ import org.x4o.xml.element.ElementClassAttribute; */ public class ElementClassAttributeBindingHandler extends AbstractElementBindingHandler { - private final static Class[] CLASSES_CHILD = new Class[] { ObjectConverter.class }; - + + private final static Class[] CLASSES_CHILD = new Class[] { + ObjectConverter.class + }; + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ @@ -55,16 +58,16 @@ public class ElementClassAttributeBindingHandler extends AbstractElementBindingH /** * @see org.x4o.xml.element.AbstractElementBindingHandler#bindChild(org.x4o.xml.element.Element, java.lang.Object, java.lang.Object) */ - public void bindChild(Element childElement, ElementClassAttribute parentObject, Object childObject) throws ElementBindingHandlerException { - if (childObject instanceof ObjectConverter) { - parentObject.setObjectConverter((ObjectConverter) childObject); + public void bindChild(Element childElement,ElementClassAttribute parentObject,Object childObject) throws ElementBindingHandlerException { + if (childObject instanceof ObjectConverter) { + parentObject.setObjectConverter((ObjectConverter)childObject); } } - + /** * @see org.x4o.xml.element.AbstractElementBindingHandler#createChilderen(org.x4o.xml.element.Element, java.lang.Object) */ - public void createChilderen(Element parentElement, ElementClassAttribute parentObject) throws ElementBindingHandlerException { + public void createChilderen(Element parentElement,ElementClassAttribute parentObject) throws ElementBindingHandlerException { createChild(parentElement, parentObject.getObjectConverter()); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassBindingHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassBindingHandler.java index 8b98c34..9edac32 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassBindingHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementClassBindingHandler.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.lang; +package org.x4o.xml.eld.lang; import org.x4o.xml.element.AbstractElementBindingHandler; import org.x4o.xml.element.Element; @@ -30,15 +30,19 @@ import org.x4o.xml.element.ElementClassAttribute; import org.x4o.xml.element.ElementConfigurator; /** - * This ElementBindingHandler adds the ElementClassAttributeConverter and the ElementConfigurator to the ElementClass. + * This ElementBindingHandler adds the ElementClassAttributeConverter and the + * ElementConfigurator to the ElementClass. * * @author Willem Cazander * @version 1.0 Jan 31, 2007 */ public class ElementClassBindingHandler extends AbstractElementBindingHandler { - private final static Class[] CLASSES_CHILD = new Class[] { ElementClassAttribute.class, ElementConfigurator.class }; - + private final static Class[] CLASSES_CHILD = new Class[] { + ElementClassAttribute.class, + ElementConfigurator.class + }; + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ @@ -56,23 +60,23 @@ public class ElementClassBindingHandler extends AbstractElementBindingHandler { - - private final static Class[] CLASSES_CHILD = new Class[] { ElementClassAttribute.class, ElementConfigurator.class }; - + + private final static Class[] CLASSES_CHILD = new Class[] { + ElementClassAttribute.class, + ElementConfigurator.class + }; + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ @@ -56,23 +59,23 @@ public class ElementInterfaceBindingHandler extends AbstractElementBindingHandle /** * @see org.x4o.xml.element.AbstractElementBindingHandler#bindChild(org.x4o.xml.element.Element, java.lang.Object, java.lang.Object) */ - public void bindChild(Element childElement, ElementInterface parent, Object childObject) throws ElementBindingHandlerException { + public void bindChild(Element childElement,ElementInterface parent, Object childObject) throws ElementBindingHandlerException { if (childObject instanceof ElementClassAttribute) { - parent.addElementClassAttribute((ElementClassAttribute) childObject); + parent.addElementClassAttribute((ElementClassAttribute)childObject); } - if (childObject instanceof ElementConfigurator) { - parent.addElementConfigurators((ElementConfigurator) childObject); + if (childObject instanceof ElementConfigurator) { + parent.addElementConfigurators((ElementConfigurator)childObject); } } - + /** * @see org.x4o.xml.element.AbstractElementBindingHandler#createChilderen(org.x4o.xml.element.Element, java.lang.Object) */ - public void createChilderen(Element parentElement, ElementInterface parent) throws ElementBindingHandlerException { - for (ElementClassAttribute child : parent.getElementClassAttributes()) { + public void createChilderen(Element parentElement,ElementInterface parent) throws ElementBindingHandlerException { + for (ElementClassAttribute child:parent.getElementClassAttributes()) { createChild(parentElement, child); } - for (ElementConfigurator child : parent.getElementConfigurators()) { + for (ElementConfigurator child:parent.getElementConfigurators()) { createChild(parentElement, child); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementModuleBindingHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementModuleBindingHandler.java index 481e279..9f2953f 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementModuleBindingHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementModuleBindingHandler.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.lang; +package org.x4o.xml.eld.lang; import org.x4o.xml.eld.EldModuleLoader; import org.x4o.xml.element.AbstractElementBindingHandler; @@ -44,11 +44,16 @@ import org.x4o.xml.lang.X4OLanguageModuleLocal; * @author Willem Cazander * @version 1.0 Jan 19, 2007 */ -public class ElementModuleBindingHandler extends AbstractElementBindingHandler { - - private final static Class[] CLASSES_CHILD = new Class[] { ElementInterface.class, ElementNamespace.class, ElementBindingHandler.class, - ElementConfiguratorGlobal.class, }; - +public class ElementModuleBindingHandler extends AbstractElementBindingHandler { + + private final static Class[] CLASSES_CHILD = new Class[] { + ElementInterface.class, + ElementNamespace.class, + ElementBindingHandler.class, + ElementConfiguratorGlobal.class, + }; + + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ @@ -66,101 +71,105 @@ public class ElementModuleBindingHandler extends AbstractElementBindingHandler { - private final static Class[] CLASSES_CHILD = new Class[] { ElementClass.class, ElementNamespaceAttribute.class }; - + private final static Class[] CLASSES_CHILD = new Class[] { + ElementClass.class, + ElementNamespaceAttribute.class + }; + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ @@ -56,29 +59,29 @@ public class ElementNamespaceBindingHandler extends AbstractElementBindingHandle /** * @see org.x4o.xml.element.AbstractElementBindingHandler#bindChild(org.x4o.xml.element.Element, java.lang.Object, java.lang.Object) */ - public void bindChild(Element childElement, ElementNamespace parent, Object childObject) throws ElementBindingHandlerException { + public void bindChild(Element childElement,ElementNamespace parent, Object childObject) throws ElementBindingHandlerException { if (childObject instanceof ElementClass) { - ElementClass elementClass = (ElementClass) childObject; - if (elementClass.getId() == null && elementClass.getObjectClass() != null) { + ElementClass elementClass = (ElementClass)childObject; + if (elementClass.getId()==null && elementClass.getObjectClass()!=null) { elementClass.setId(elementClass.getObjectClass().getSimpleName()); // TODO: move to defaults layer } parent.addElementClass(elementClass); } if (childObject instanceof ElementNamespaceAttribute) { - ElementNamespaceAttribute elementNamespaceAttribute = (ElementNamespaceAttribute) childObject; + ElementNamespaceAttribute elementNamespaceAttribute = (ElementNamespaceAttribute)childObject; parent.addElementNamespaceAttribute(elementNamespaceAttribute); return; } } - + /** * @see org.x4o.xml.element.AbstractElementBindingHandler#createChilderen(org.x4o.xml.element.Element, java.lang.Object) */ - public void createChilderen(Element parentElement, ElementNamespace parent) throws ElementBindingHandlerException { - for (ElementClass child : parent.getElementClasses()) { + public void createChilderen(Element parentElement,ElementNamespace parent) throws ElementBindingHandlerException { + for (ElementClass child:parent.getElementClasses()) { createChild(parentElement, child); } - for (ElementNamespaceAttribute child : parent.getElementNamespaceAttributes()) { + for (ElementNamespaceAttribute child:parent.getElementNamespaceAttributes()) { createChild(parentElement, child); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementRefectionBindingHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementRefectionBindingHandler.java index 49b01a2..bb25577 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementRefectionBindingHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementRefectionBindingHandler.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.lang; +package org.x4o.xml.eld.lang; import java.lang.reflect.Method; import java.util.ArrayList; @@ -46,32 +46,32 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle private String addMethod = null; private String getMethod = null; private String skipChilderenClassRegex = null; - + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ public Class getBindParentClass() { return parentClass; } - + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindChildClasses() */ public Class[] getBindChildClasses() { - return new Class[] { childClass }; + return new Class[] {childClass}; } - + /** * @see org.x4o.xml.element.AbstractElementBindingHandler#bindChild(org.x4o.xml.element.Element, java.lang.Object, java.lang.Object) */ - @SuppressWarnings(value = { "unchecked", "rawtypes" }) + @SuppressWarnings(value = {"unchecked", "rawtypes"}) public void bindChild(Element childElement, Object parentObject, Object childObject) throws ElementBindingHandlerException { - if (parentClass == null | childClass == null) { - throw new IllegalStateException("Missing property: parentClass=" + parentClass + " childClass=" + childClass + " addMethod=" + addMethod + "."); + if (parentClass==null | childClass==null) { + throw new IllegalStateException("Missing property: parentClass="+parentClass+" childClass="+childClass+" addMethod="+addMethod+"."); } if (property != null) { // Tmp hanky code here... try { - String pop = property.substring(0, 1).toUpperCase() + property.substring(1); + String pop = property.substring(0,1).toUpperCase() + property.substring(1); Method propType = parentObject.getClass().getMethod("get" + pop); if (List.class.isAssignableFrom(propType.getReturnType())) { Object data = childElement.getLanguageSession().getElementObjectPropertyValue().getProperty(parentObject, property); @@ -81,23 +81,22 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle data = childElement.getLanguageSession().getElementObjectPropertyValue().getProperty(parentObject, property); } if (data instanceof Collection) { - Collection dataCollection = (Collection) data; + Collection dataCollection = (Collection)data; dataCollection.add(childObject); return; } - throw new ElementBindingHandlerException( - "Unhandled property collection type: " + data.getClass() + " on: " + parentObject.getClass() + " id:" + getId()); + throw new ElementBindingHandlerException("Unhandled property collection type: "+data.getClass()+" on: "+parentObject.getClass()+" id:"+getId()); } - + childElement.getLanguageSession().getElementObjectPropertyValue().setProperty(parentObject, property, childObject); return; - } catch (/* ElementObjectPropertyValueException | */ Exception e) { + } catch (/*ElementObjectPropertyValueException |*/ Exception e) { throw new ElementBindingHandlerException(getId() + " error " + e.getMessage(), e); } } // TODO: remove old... Method[] ms = parentObject.getClass().getMethods(); - for (Method m : ms) { + for (Method m:ms) { Class[] types = m.getParameterTypes(); if (types.length == 0) { continue; @@ -105,28 +104,28 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle if (types.length > 1) { continue; } - if (addMethod.equalsIgnoreCase(m.getName()) == false) { + if (addMethod.equalsIgnoreCase(m.getName())==false) { continue; } if (types[0].isAssignableFrom(childClass)) { try { m.invoke(parentObject, childObject); } catch (Exception e) { - throw new ElementBindingHandlerException("Error invoke binding method of: " + getId() + " error: " + e.getMessage(), e); + throw new ElementBindingHandlerException("Error invoke binding method of: "+getId()+" error: "+e.getMessage(),e); } return; } } - throw new ElementBindingHandlerException("Could not find method: " + addMethod + " on: " + parentObject.getClass() + " id:" + getId()); + throw new ElementBindingHandlerException("Could not find method: "+addMethod+" on: "+parentObject.getClass()+" id:"+getId()); } - + /** * @see org.x4o.xml.element.AbstractElementBindingHandler#createChilderen(org.x4o.xml.element.Element, java.lang.Object) */ - - public void createChilderen(Element parentElement, Object parentObject) throws ElementBindingHandlerException { - if (parentClass == null | childClass == null) { - throw new IllegalStateException("Missing property: parentClass=" + parentClass + " childClass=" + childClass + " getMethod=" + getMethod + "."); + + public void createChilderen(Element parentElement,Object parentObject) throws ElementBindingHandlerException { + if (parentClass==null | childClass==null) { + throw new IllegalStateException("Missing property: parentClass="+parentClass+" childClass="+childClass+" getMethod="+getMethod+"."); } if (property != null) { try { @@ -138,44 +137,43 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle return; } Method[] ms = parentObject.getClass().getMethods(); - for (Method m : ms) { + for (Method m:ms) { Class[] types = m.getParameterTypes(); if (types.length != 0) { continue; } - if (getMethod.equalsIgnoreCase(m.getName()) == false) { + if (getMethod.equalsIgnoreCase(m.getName())==false) { continue; } Object result; try { - result = m.invoke(parentObject, new Object[] {}); + result = m.invoke(parentObject, new Object[]{}); } catch (Exception e) { - throw new ElementBindingHandlerException("Invoke error: " + e.getMessage() + " from: " + getMethod + " on: " + parentObject + " id:" + getId(), - e); - } + throw new ElementBindingHandlerException("Invoke error: "+e.getMessage()+" from: "+getMethod+" on: "+parentObject+" id:"+getId(),e); + } createSafeChildLoop(parentElement, result); return; } - throw new ElementBindingHandlerException("Could not find method: " + getMethod + " on: " + parentObject.getClass() + " id:" + getId()); + throw new ElementBindingHandlerException("Could not find method: "+getMethod+" on: "+parentObject.getClass()+" id:"+getId()); } - + @SuppressWarnings("rawtypes") - protected void createSafeChildLoop(Element parentElement, Object result) throws ElementBindingHandlerException { - if (result == null) { + protected void createSafeChildLoop(Element parentElement,Object result) throws ElementBindingHandlerException { + if (result==null) { return; // null is no childeren } if (result instanceof List) { - for (Object o : (List) result) { + for (Object o:(List)result) { createSafeChild(parentElement, o); } return; } else if (result instanceof Collection) { - for (Object o : (Collection) result) { + for (Object o:(Collection)result) { createSafeChild(parentElement, o); } return; } else if (result.getClass().isArray()) { - for (Object o : (Object[]) result) { + for (Object o:(Object[])result) { createSafeChild(parentElement, o); } return; @@ -183,104 +181,102 @@ public class ElementRefectionBindingHandler extends AbstractElementBindingHandle createSafeChild(parentElement, result); return; } else { - throw new ElementBindingHandlerException("Unsupported return type: " + result.getClass() + " need: " + childClass + " from: " + getMethod + " on: " - + parentElement.getElementObject().getClass() + " id:" + getId()); + throw new ElementBindingHandlerException("Unsupported return type: "+result.getClass()+" need: "+childClass+" from: "+getMethod+" on: "+parentElement.getElementObject().getClass()+" id:"+getId()); } } - + /** * Only create child when class matches and regex doesn't exclude it. - * - * @param parentElement The element to create childeren for. - * @param childObject The childObject. + * @param parentElement The element to create childeren for. + * @param childObject The childObject. */ - protected void createSafeChild(Element parentElement, Object childObject) { - if (childClass.isAssignableFrom(childObject.getClass()) == false) { + protected void createSafeChild(Element parentElement,Object childObject) { + if (childClass.isAssignableFrom(childObject.getClass())==false) { return; } - if (skipChilderenClassRegex != null && childObject.getClass().getName().matches(skipChilderenClassRegex)) { + if (skipChilderenClassRegex!=null && childObject.getClass().getName().matches(skipChilderenClassRegex)) { return; // skip } - createChild(parentElement, childObject); + createChild(parentElement,childObject); } - + /** * @return the parentClass */ public Class getParentClass() { return parentClass; } - + /** * @param parentClass the parentClass to set */ public void setParentClass(Class parentClass) { this.parentClass = parentClass; } - + /** * @return the childClass */ public Class getChildClass() { return childClass; } - + /** * @param childClass the childClass to set */ public void setChildClass(Class childClass) { this.childClass = childClass; } - + /** * @return the addMethod */ public String getAddMethod() { return addMethod; } - + /** * @param addMethod the addMethod to set */ public void setAddMethod(String addMethod) { this.addMethod = addMethod; } - + /** * @return the getMethod */ public String getGetMethod() { return getMethod; } - + /** * @param getMethod the getMethod to set */ public void setGetMethod(String getMethod) { this.getMethod = getMethod; } - + /** * @return the property */ public String getProperty() { return property; } - + /** * @param property the property to set */ public void setProperty(String property) { this.property = property; } - + /** * @return the skipChilderenClassRegex */ public String getSkipChilderenClassRegex() { return skipChilderenClassRegex; } - + /** * @param skipChilderenClassRegex the skipChilderenClassRegex to set */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ModuleElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ModuleElement.java index 1803ddb..89df957 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ModuleElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/ModuleElement.java @@ -35,14 +35,14 @@ import org.x4o.xml.lang.X4OLanguageModule; * @version 1.0 Aug 20, 2012 */ public class ModuleElement extends AbstractElement { - + /** * @see org.x4o.xml.element.AbstractElement#doElementStart() * @throws ElementException When module element is used and non-root element. */ @Override public void doElementStart() throws ElementException { - if (getParent() != null) { + if (getParent()!=null) { throw new ElementException("Need to be root tag"); } X4OLanguageModule elementLanguageModule = EldModuleLoader.getLanguageModule(getLanguageSession()); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/NextAttributeElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/NextAttributeElement.java index a95473e..ba8f151 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/NextAttributeElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/NextAttributeElement.java @@ -38,14 +38,14 @@ public class NextAttributeElement extends AbstractElement { @Override public void doElementRun() throws ElementException { String param = getAttributes().get("attributeName"); - if (param == null) { + if (param==null) { throw new ElementException("attributeName may not be null"); } - if (getParent() == null) { + if (getParent()==null) { throw new ElementException("can't be a root tag"); } if (getParent().getElementObject() instanceof ElementNamespaceAttribute) { - ((ElementNamespaceAttribute) getParent().getElementObject()).addNextAttribute(param); + ((ElementNamespaceAttribute)getParent().getElementObject()).addNextAttribute(param); } else { throw new ElementException("Wrong parent class"); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/SkipPhaseElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/SkipPhaseElement.java index 5f2ae1c..d0d47a4 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/SkipPhaseElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/SkipPhaseElement.java @@ -41,13 +41,13 @@ public class SkipPhaseElement extends AbstractElement { @Override public void doElementEnd() throws ElementException { String phase = getAttributes().get("name"); - if (phase == null) { - throw new ElementException("'name' attribute is not set on: " + getElementClass().getId()); + if (phase==null) { + throw new ElementException("'name' attribute is not set on: "+getElementClass().getId()); } if (getParent().getElementObject() instanceof ElementClass) { - ((ElementClass) getParent().getElementObject()).addSkipPhase(phase); + ((ElementClass)getParent().getElementObject()).addSkipPhase(phase); } else { - throw new ElementException("Wrong parent class is not ElementClassAttribute but: " + getParent().getElementObject()); + throw new ElementException("Wrong parent class is not ElementClassAttribute but: "+getParent().getElementObject()); } } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/StringSplitConverterBindingHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/StringSplitConverterBindingHandler.java index 50c3fa7..41ae524 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/StringSplitConverterBindingHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/StringSplitConverterBindingHandler.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.lang; +package org.x4o.xml.eld.lang; import org.x4o.xml.conv.text.StringSplitConverter; import org.x4o.xml.conv.text.StringSplitConverterStep; @@ -36,8 +36,11 @@ import org.x4o.xml.element.ElementBindingHandlerException; */ public class StringSplitConverterBindingHandler extends AbstractElementBindingHandler { - private final static Class[] CLASSES_CHILD = new Class[] { StringSplitConverterStep.class }; - + + private final static Class[] CLASSES_CHILD = new Class[] { + StringSplitConverterStep.class + }; + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ @@ -55,9 +58,9 @@ public class StringSplitConverterBindingHandler extends AbstractElementBindingHa /** * @see org.x4o.xml.element.AbstractElementBindingHandler#bindChild(org.x4o.xml.element.Element, java.lang.Object, java.lang.Object) */ - public void bindChild(Element childElement, StringSplitConverter parent, Object childObject) throws ElementBindingHandlerException { - if (childObject instanceof StringSplitConverterStep) { - parent.addStringSplitConverterStep((StringSplitConverterStep) childObject); + public void bindChild(Element childElement,StringSplitConverter parent, Object childObject) throws ElementBindingHandlerException { + if (childObject instanceof StringSplitConverterStep) { + parent.addStringSplitConverterStep((StringSplitConverterStep)childObject); } } @@ -65,8 +68,8 @@ public class StringSplitConverterBindingHandler extends AbstractElementBindingHa * @see org.x4o.xml.element.AbstractElementBindingHandler#createChilderen(org.x4o.xml.element.Element, java.lang.Object) */ @Override - public void createChilderen(Element parentElement, StringSplitConverter parentObject) throws ElementBindingHandlerException { - for (StringSplitConverterStep child : parentObject.getStringSplitConverterSteps()) { + public void createChilderen(Element parentElement,StringSplitConverter parentObject) throws ElementBindingHandlerException { + for (StringSplitConverterStep child:parentObject.getStringSplitConverterSteps()) { createChild(parentElement, child); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/StringSplitConverterStepBindingHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/StringSplitConverterStepBindingHandler.java index 2e00e28..373aebb 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/StringSplitConverterStepBindingHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/lang/StringSplitConverterStepBindingHandler.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.lang; +package org.x4o.xml.eld.lang; import org.x4o.xml.conv.ObjectConverter; import org.x4o.xml.conv.text.StringSplitConverterStep; @@ -36,8 +36,11 @@ import org.x4o.xml.element.ElementBindingHandlerException; */ public class StringSplitConverterStepBindingHandler extends AbstractElementBindingHandler { - private final static Class[] CLASSES_CHILD = new Class[] { ObjectConverter.class }; - + + private final static Class[] CLASSES_CHILD = new Class[] { + ObjectConverter.class + }; + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ @@ -55,17 +58,17 @@ public class StringSplitConverterStepBindingHandler extends AbstractElementBindi /** * @see org.x4o.xml.element.AbstractElementBindingHandler#bindChild(org.x4o.xml.element.Element, java.lang.Object, java.lang.Object) */ - public void bindChild(Element childElement, StringSplitConverterStep parent, Object childObject) throws ElementBindingHandlerException { - if (childObject instanceof ObjectConverter) { - parent.setObjectConverter((ObjectConverter) childObject); + public void bindChild(Element childElement,StringSplitConverterStep parent, Object childObject) throws ElementBindingHandlerException { + if (childObject instanceof ObjectConverter) { + parent.setObjectConverter((ObjectConverter)childObject); } } - + /** * @see org.x4o.xml.element.AbstractElementBindingHandler#createChilderen(org.x4o.xml.element.Element, java.lang.Object) */ @Override - public void createChilderen(Element parentElement, StringSplitConverterStep parentObject) throws ElementBindingHandlerException { + public void createChilderen(Element parentElement,StringSplitConverterStep parentObject) throws ElementBindingHandlerException { createChild(parentElement, parentObject.getObjectConverter()); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java index 1ac733d..2179d50 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java @@ -38,15 +38,15 @@ import org.xml.sax.SAXException; * @version 1.0 Aug 22, 2012 */ public class EldXsdLanguageTask extends AbstractX4OLanguageTask { - - public static final String TASK_ID = "eld-xsd"; + + public static final String TASK_ID = "eld-xsd"; private static final String TASK_NAME = "ELD XSD Writer Task"; private static final String TASK_DESC = "Writes out the schema of the language elements."; - + public EldXsdLanguageTask() { - super(TASK_ID, TASK_NAME, TASK_DESC, EldXsdWriter.DEFAULT_PROPERTY_CONFIG); + super(TASK_ID,TASK_NAME,TASK_DESC,EldXsdWriter.DEFAULT_PROPERTY_CONFIG); } - + /** * Executes this language task. */ @@ -54,11 +54,11 @@ public class EldXsdLanguageTask extends AbstractX4OLanguageTask { return new X4OLanguageTaskExecutor() { public void execute(X4OLanguage language) throws X4OLanguageTaskException { try { - new EldXsdWriter(language, config).writeSchema(); + new EldXsdWriter(language,config).writeSchema(); } catch (SAXException e) { - throw new X4OLanguageTaskException(config, e.getMessage(), e); + throw new X4OLanguageTaskException(config,e.getMessage(),e); } catch (IOException e) { - throw new X4OLanguageTaskException(config, e.getMessage(), e); + throw new X4OLanguageTaskException(config,e.getMessage(),e); } } }; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java index 7141ff7..d62d25d 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java @@ -39,17 +39,16 @@ import org.x4o.xml.lang.X4OLanguage; import org.xml.sax.SAXException; /** - * EldXsdWriter creates XML Schema files from a x4o language. + * EldXsdWriter creates XML Schema files from a x4o language. * * @author Willem Cazander * @version 1.0 Aug 8, 2012 */ public class EldXsdWriter { - - private final static String PROPERTY_CONTEXT_PREFIX = SAX3PropertyConfig.X4O_PROPERTIES_PREFIX + "eld-xsd/"; + + private final static String PROPERTY_CONTEXT_PREFIX = SAX3PropertyConfig.X4O_PROPERTIES_PREFIX+"eld-xsd/"; public final static SAX3PropertyConfig DEFAULT_PROPERTY_CONFIG; - - //@formatter:off + public final static String OUTPUT_PATH = PROPERTY_CONTEXT_PREFIX+"output/path"; public final static String OUTPUT_DOCUMENTATION = PROPERTY_CONTEXT_PREFIX+"output/documentation"; public final static String FILTER_NAMESPACE = PROPERTY_CONTEXT_PREFIX+"filter/namespace"; @@ -79,60 +78,59 @@ public class EldXsdWriter { new PropertyConfigItem(PROLOG_XMLNS_DESC_ENABLE, Boolean.class, true) ); } - //@formatter:on - + private final X4OLanguage language; private final SAX3PropertyConfig propertyConfig; - - public EldXsdWriter(X4OLanguage language, SAX3PropertyConfig parentConfig) { - this.language = language; - this.propertyConfig = new SAX3PropertyConfig(DEFAULT_PROPERTY_CONFIG, PROPERTY_CONTEXT_PREFIX); + + public EldXsdWriter(X4OLanguage language,SAX3PropertyConfig parentConfig) { + this.language=language; + this.propertyConfig=new SAX3PropertyConfig(DEFAULT_PROPERTY_CONFIG,PROPERTY_CONTEXT_PREFIX); this.propertyConfig.copyParentProperties(parentConfig); } - + private void checkNamespace(ElementNamespace ns) { - if (ns.getSchemaResource() == null) { - throw new NullPointerException("Can't generate xsd for namespace without schemaResource uri: " + ns.getUri()); + if (ns.getSchemaResource()==null) { + throw new NullPointerException("Can't generate xsd for namespace without schemaResource uri: "+ns.getUri()); } - if (ns.getSchemaResource().length() == 0) { - throw new NullPointerException("Can't generate xsd for namespace with empty schemaResource uri: " + ns.getUri()); + if (ns.getSchemaResource().length()==0) { + throw new NullPointerException("Can't generate xsd for namespace with empty schemaResource uri: "+ns.getUri()); } } - + public void writeSchema() throws SAXException, IOException { File basePath = propertyConfig.getPropertyFile(OUTPUT_PATH); String encoding = propertyConfig.getPropertyString(SAX3WriterXml.OUTPUT_ENCODING); String namespace = propertyConfig.getPropertyString(FILTER_NAMESPACE); - if (basePath == null) { + if (basePath==null) { throw new NullPointerException("Can't write schema to null output path."); } if (!basePath.exists()) { basePath.mkdirs(); } - if (namespace != null) { + if (namespace!=null) { ElementNamespace ns = language.findElementNamespace(namespace); - if (ns == null) { - throw new NullPointerException("Could not find namespace: " + namespace); + if (ns==null) { + throw new NullPointerException("Could not find namespace: "+namespace); } checkNamespace(ns); - File outputFile = new File(basePath.getAbsolutePath() + File.separatorChar + ns.getSchemaResource()); + File outputFile = new File(basePath.getAbsolutePath()+File.separatorChar+ns.getSchemaResource()); Writer wr = new OutputStreamWriter(new FileOutputStream(outputFile), encoding); try { - SAX3WriterXsd xsdWriter = new SAX3WriterXsd(wr, encoding); + SAX3WriterXsd xsdWriter = new SAX3WriterXsd(wr,encoding); xsdWriter.getPropertyConfig().copyParentProperties(propertyConfig); generateSchema(ns.getUri(), xsdWriter); } finally { wr.close(); - } + } return; } - for (X4OLanguageModule mod : language.getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { + for (X4OLanguageModule mod:language.getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { checkNamespace(ns); - File outputFile = new File(basePath.getAbsolutePath() + File.separatorChar + ns.getSchemaResource()); + File outputFile = new File(basePath.getAbsolutePath()+File.separatorChar+ns.getSchemaResource()); Writer wr = new OutputStreamWriter(new FileOutputStream(outputFile), encoding); try { - SAX3WriterXsd xsdWriter = new SAX3WriterXsd(wr, encoding); + SAX3WriterXsd xsdWriter = new SAX3WriterXsd(wr,encoding); xsdWriter.getPropertyConfig().copyParentProperties(propertyConfig); generateSchema(ns.getUri(), xsdWriter); } finally { @@ -141,27 +139,27 @@ public class EldXsdWriter { } } } - - private void generateSchema(String namespaceUri, SAX3WriterXsd xsdWriter) throws IOException { + + private void generateSchema(String namespaceUri,SAX3WriterXsd xsdWriter) throws IOException { ElementNamespace ns = language.findElementNamespace(namespaceUri); - if (ns == null) { - throw new NullPointerException("Could not find namespace: " + namespaceUri); + if (ns==null) { + throw new NullPointerException("Could not find namespace: "+namespaceUri); } String filterElement = propertyConfig.getPropertyString(FILTER_ELEMENT); - EldXsdWriterElement xsdWriterElement = new EldXsdWriterElement(xsdWriter, language, propertyConfig); + EldXsdWriterElement xsdWriterElement = new EldXsdWriterElement(xsdWriter,language,propertyConfig); xsdWriterElement.startNamespaces(namespaceUri); xsdWriterElement.startSchema(ns); - for (ElementClass ec : ns.getElementClasses()) { - if (filterElement != null && !ec.getId().equals(filterElement)) { + for (ElementClass ec:ns.getElementClasses()) { + if (filterElement!=null && !ec.getId().equals(filterElement)) { continue; } - xsdWriterElement.writeElementClass(ec, ns); + xsdWriterElement.writeElementClass(ec,ns); } - for (ElementClass ec : ns.getElementClasses()) { - if (filterElement != null && !ec.getId().equals(filterElement)) { + for (ElementClass ec:ns.getElementClasses()) { + if (filterElement!=null && !ec.getId().equals(filterElement)) { continue; } - xsdWriterElement.writeElement(ec, ns); + xsdWriterElement.writeElement(ec,ns); } xsdWriterElement.endSchema(); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java index d7214ba..87b00e0 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.xsd; +package org.x4o.xml.eld.xsd; import java.io.IOException; import java.lang.reflect.Method; @@ -59,35 +59,35 @@ import org.xml.sax.helpers.AttributesImpl; * @version 1.0 Aug 8, 2012 */ public class EldXsdWriterElement { - + private SAX3PropertyConfig propertyConfig; protected X4OLanguage language = null; protected SAX3WriterXsd xsdWriter = null; protected String writeNamespace = null; protected Map namespaces = null; - - public EldXsdWriterElement(SAX3WriterXsd xsdWriter, X4OLanguage language, SAX3PropertyConfig propertyConfig) { - this.xsdWriter = xsdWriter; - this.language = language; - this.propertyConfig = propertyConfig; - this.namespaces = new HashMap(10); + + public EldXsdWriterElement(SAX3WriterXsd xsdWriter,X4OLanguage language,SAX3PropertyConfig propertyConfig) { + this.xsdWriter=xsdWriter; + this.language=language; + this.propertyConfig=propertyConfig; + this.namespaces=new HashMap(10); } - - private void startNamespace(String uri, String prefixNamespace) { + + private void startNamespace(String uri,String prefixNamespace) { String prefix = namespaces.get(uri); - if (prefix != null) { + if (prefix!=null) { return; } if (uri.equals(writeNamespace)) { namespaces.put(uri, "this"); return; } - if (prefixNamespace != null) { + if (prefixNamespace!=null) { namespaces.put(uri, prefixNamespace); // let user define it return; } StringBuilder buf = new StringBuilder(20); - for (char c : uri.toLowerCase().toCharArray()) { + for (char c:uri.toLowerCase().toCharArray()) { if (Character.isLetter(c)) { buf.append(c); } @@ -107,37 +107,37 @@ public class EldXsdWriterElement { } namespaces.put(uri, prefix); } - + public void startNamespaces(String namespaceUri) { - - this.writeNamespace = namespaceUri; + + this.writeNamespace=namespaceUri; this.namespaces.clear(); - + // redo this mess, add nice find for binding handlers - for (X4OLanguageModule modContext : language.getLanguageModules()) { - for (ElementNamespace nsContext : modContext.getElementNamespaces()) { - for (ElementClass ec : nsContext.getElementClasses()) { + for (X4OLanguageModule modContext:language.getLanguageModules()) { + for (ElementNamespace nsContext:modContext.getElementNamespaces()) { + for (ElementClass ec:nsContext.getElementClasses()) { Class objectClass = null; - if (ec.getObjectClass() != null) { + if (ec.getObjectClass()!=null) { objectClass = ec.getObjectClass(); - for (X4OLanguageModule mod : language.getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { - for (ElementClass checkClass : ns.getElementClasses()) { - if (checkClass.getObjectClass() == null) { + for (X4OLanguageModule mod:language.getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { + for (ElementClass checkClass:ns.getElementClasses()) { + if (checkClass.getObjectClass()==null) { continue; } Class checkObjectClass = checkClass.getObjectClass(); - List b = language.findElementBindingHandlers(objectClass, checkObjectClass); - if (b.isEmpty() == false) { - startNamespace(ns.getUri(), ns.getSchemaPrefix()); + List b = language.findElementBindingHandlers(objectClass,checkObjectClass); + if (b.isEmpty()==false) { + startNamespace(ns.getUri(),ns.getSchemaPrefix()); } } } } - for (ElementInterface ei : language.findElementInterfaces(objectClass)) { + for (ElementInterface ei:language.findElementInterfaces(objectClass)) { List eiTags = ei.getElementParents(namespaceUri); - if (eiTags != null) { - startNamespace(nsContext.getUri(), nsContext.getSchemaPrefix()); + if (eiTags!=null) { + startNamespace(nsContext.getUri(),nsContext.getSchemaPrefix()); } } } @@ -145,9 +145,10 @@ public class EldXsdWriterElement { } } } - + + private static final String COMMENT_FORMAT = "%1$-20s %2$s"; - + private void prologWriteGenerator() throws IOException { if (propertyConfig.getPropertyBoolean(EldXsdWriter.PROLOG_SEPERATOR_ENABLE)) { xsdWriter.printComment(propertyConfig.getPropertyString(EldXsdWriter.PROLOG_SEPERATOR_LINE)); @@ -160,26 +161,26 @@ public class EldXsdWriterElement { String generatedBy = propertyConfig.getPropertyString(EldXsdWriter.PROLOG_GENERATED_BY, EldXsdWriter.class.getSimpleName()); String generatedVersion = propertyConfig.getPropertyString(EldXsdWriter.PROLOG_GENERATED_VERSION); StringBuilder b = new StringBuilder(); - b.append(chEnter + chTab + String.format(COMMENT_FORMAT, "GeneratedBy:", generatedBy)); - b.append(chEnter + chTab + String.format(COMMENT_FORMAT, "GeneratedDate:", new Date())); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"GeneratedBy:",generatedBy)); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"GeneratedDate:",new Date())); if (generatedVersion != null && !generatedVersion.isEmpty()) { - b.append(chEnter + chTab + String.format(COMMENT_FORMAT, "GeneratedVersion:", generatedVersion)); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"GeneratedVersion:",generatedVersion)); } - b.append(chEnter + chTab + String.format(COMMENT_FORMAT, "LanguageName:", language.getLanguageName())); - b.append(chEnter + chTab + String.format(COMMENT_FORMAT, "LanguageVersion:", language.getLanguageVersion())); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"LanguageName:",language.getLanguageName())); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"LanguageVersion:",language.getLanguageVersion())); b.append(chEnter); xsdWriter.printComment(b.toString()); } - + private void prologWriteNSMeta(ElementNamespace ns) throws IOException { String chEnter = propertyConfig.getPropertyString(SAX3WriterXml.OUTPUT_CHAR_NEWLINE); String chTab = propertyConfig.getPropertyString(SAX3WriterXml.OUTPUT_CHAR_TAB); if (propertyConfig.getPropertyBoolean(EldXsdWriter.PROLOG_XMLNS_INFO_ENABLE)) { StringBuilder b = new StringBuilder(); - b.append(chEnter + chTab + String.format(COMMENT_FORMAT, "NSId:", ns.getId())); - b.append(chEnter + chTab + String.format(COMMENT_FORMAT, "NSName:", ns.getName())); - b.append(chEnter + chTab + String.format(COMMENT_FORMAT, "NSUri:", ns.getUri())); - b.append(chEnter + chTab + String.format(COMMENT_FORMAT, "NSUriSchema:", ns.getSchemaUri())); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"NSId:",ns.getId())); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"NSName:",ns.getName())); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"NSUri:",ns.getUri())); + b.append(chEnter + chTab + String.format(COMMENT_FORMAT,"NSUriSchema:",ns.getSchemaUri())); b.append(chEnter); xsdWriter.printComment(b.toString()); } @@ -203,15 +204,15 @@ public class EldXsdWriterElement { xsdWriter.printComment(buf.toString()); } } - + public void startSchema(ElementNamespace ns) throws IOException { - + xsdWriter.startDocument(); - + prologWriteGenerator(); prologWriteNSMeta(ns); - - for (String uri : namespaces.keySet()) { + + for (String uri:namespaces.keySet()) { String prefix = namespaces.get(uri); try { xsdWriter.getContentWriterWrapped().startPrefixMapping(prefix, uri); @@ -219,25 +220,25 @@ public class EldXsdWriterElement { throw new IOException(e); } } - + AttributesImpl atts = new AttributesImpl(); - atts.addAttribute("", "version", "", "", "1.0"); - atts.addAttribute("", "elementFormDefault", "", "", "qualified"); - atts.addAttribute("", "attributeFormDefault", "", "", "unqualified"); - atts.addAttribute("", "targetNamespace", "", "", ns.getUri()); + atts.addAttribute ("", "version", "", "", "1.0"); + atts.addAttribute ("", "elementFormDefault", "", "", "qualified"); + atts.addAttribute ("", "attributeFormDefault", "", "", "unqualified"); + atts.addAttribute ("", "targetNamespace", "", "", ns.getUri()); xsdWriter.printTagStart(Tag.schema, atts); - - for (String uri : namespaces.keySet()) { + + for (String uri:namespaces.keySet()) { if (ns.getUri().equals(uri)) { continue; } ElementNamespace nsContext = language.findElementNamespace(uri); xsdWriter.printXsdImport(nsContext.getUri(), nsContext.getSchemaResource()); } - + writeNamespaceAttributes(ns); } - + public void endSchema() throws IOException { xsdWriter.printTagEnd(Tag.schema); try { @@ -247,122 +248,122 @@ public class EldXsdWriterElement { } xsdWriter.endDocument(); } - + private void writeNamespaceAttributes(ElementNamespace ns) throws IOException { - for (ElementNamespaceAttribute eah : ns.getElementNamespaceAttributes()) { + for (ElementNamespaceAttribute eah:ns.getElementNamespaceAttributes()) { AttributesImpl atts = new AttributesImpl(); - atts.addAttribute("", "name", "", "", eah.getAttributeName()); - atts.addAttribute("", "type", "", "", "string"); - writeElementAttribute(eah, atts); + atts.addAttribute ("", "name", "", "", eah.getAttributeName()); + atts.addAttribute ("", "type", "", "", "string"); + writeElementAttribute(eah,atts); } } - - public void writeElementClass(ElementClass ec, ElementNamespace nsWrite) throws IOException { - + + public void writeElementClass(ElementClass ec,ElementNamespace nsWrite) throws IOException { + AttributesImpl atts = new AttributesImpl(); - if (nsWrite.getLanguageRoot() != null && nsWrite.getLanguageRoot()) { - atts.addAttribute("", "name", "", "", ec.getId()); + if (nsWrite.getLanguageRoot()!=null && nsWrite.getLanguageRoot()) { + atts.addAttribute ("", "name", "", "", ec.getId()); xsdWriter.printTagStart(Tag.element, atts);// Only in the language root xsd there is an element. - + atts = new AttributesImpl(); xsdWriter.printTagStart(Tag.complexType, atts); } else { - atts.addAttribute("", "name", "", "", ec.getId() + "Type"); + atts.addAttribute ("", "name", "", "", ec.getId()+"Type"); xsdWriter.printTagStart(Tag.complexType, atts); } - - if (ec.getSchemaContentBase() != null) { + + if (ec.getSchemaContentBase()!=null) { atts = new AttributesImpl(); - if (ec.getSchemaContentComplex() != null && ec.getSchemaContentComplex()) { - if (ec.getSchemaContentMixed() != null && ec.getSchemaContentMixed()) { - atts.addAttribute("", "mixed", "", "", "true"); + if (ec.getSchemaContentComplex()!=null && ec.getSchemaContentComplex()) { + if (ec.getSchemaContentMixed()!=null && ec.getSchemaContentMixed()) { + atts.addAttribute ("", "mixed", "", "", "true"); } xsdWriter.printTagStart(Tag.complexContent, atts); } else { xsdWriter.printTagStart(Tag.simpleContent, atts); } atts = new AttributesImpl(); - atts.addAttribute("", "base", "", "", ec.getSchemaContentBase()); + atts.addAttribute ("", "base", "", "", ec.getSchemaContentBase()); xsdWriter.printTagStart(Tag.extension, atts); } - - if (ec.getSchemaContentBase() == null) { + + if (ec.getSchemaContentBase()==null) { atts = new AttributesImpl(); - atts.addAttribute("", "minOccurs", "", "", "0"); // TODO: make unordered elements - atts.addAttribute("", "maxOccurs", "", "", "unbounded"); + atts.addAttribute ("", "minOccurs", "", "", "0"); // TODO: make unordered elements + atts.addAttribute ("", "maxOccurs", "", "", "unbounded"); xsdWriter.printTagStart(Tag.choice, atts); - - for (X4OLanguageModule mod : language.getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { - writeElementClassNamespaces(ec, nsWrite, ns); + + for (X4OLanguageModule mod:language.getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { + writeElementClassNamespaces(ec,nsWrite,ns); } } xsdWriter.printTagEnd(Tag.choice); } - + List attrNames = new ArrayList(30); - for (ElementClassAttribute eca : ec.getElementClassAttributes()) { + for (ElementClassAttribute eca:ec.getElementClassAttributes()) { attrNames.add(eca.getId()); atts = new AttributesImpl(); - atts.addAttribute("", "name", "", "", eca.getId()); - atts.addAttribute("", "type", "", "", "string"); - if (eca.getRequired() != null && eca.getRequired()) { - atts.addAttribute("", "use", "", "", "required"); + atts.addAttribute ("", "name", "", "", eca.getId()); + atts.addAttribute ("", "type", "", "", "string"); + if (eca.getRequired()!=null && eca.getRequired()) { + atts.addAttribute ("", "use", "", "", "required"); } - writeElementAttribute(eca, atts); - - for (String alias : eca.getAttributeAliases()) { + writeElementAttribute(eca,atts); + + for (String alias:eca.getAttributeAliases()) { attrNames.add(alias); atts = new AttributesImpl(); - atts.addAttribute("", "name", "", "", alias); - atts.addAttribute("", "type", "", "", "string"); - writeElementAttribute(null, atts); + atts.addAttribute ("", "name", "", "", alias); + atts.addAttribute ("", "type", "", "", "string"); + writeElementAttribute(null,atts); } } - - if (ec.getAutoAttributes() != null && ec.getAutoAttributes() == false) { + + if (ec.getAutoAttributes()!=null && ec.getAutoAttributes()==false) { // oke, reverse this if and rm whitespace. try { xsdWriter.getContentWriterWrapped().ignorableWhitespace(' '); } catch (SAXException e) { throw new IOException(e); } - + } else { - - if (ec.getObjectClass() != null) { - for (Method m : ec.getObjectClass().getMethods()) { + + if (ec.getObjectClass()!=null) { + for (Method m:ec.getObjectClass().getMethods()) { if (m.getName().startsWith("set")) { String n = m.getName().substring(3); - if (m.getParameterTypes().length == 0) { + if (m.getParameterTypes().length==0) { continue; // set without parameters } - if (n.length() < 2) { + if (n.length()<2) { continue; } - n = n.substring(0, 1).toLowerCase() + n.substring(1, n.length()); + n = n.substring(0,1).toLowerCase()+n.substring(1,n.length()); if (attrNames.contains(n)) { continue; } attrNames.add(n); atts = new AttributesImpl(); - atts.addAttribute("", "name", "", "", n); - + atts.addAttribute ("", "name", "", "", n); + Class type = m.getParameterTypes()[0]; // TODO make full list for auto attribute type resolving. if (type.equals(Object.class)) { - atts.addAttribute("", "type", "", "", "string");// object is always string because is always assignable + atts.addAttribute ("", "type", "", "", "string");// object is always string because is always assignable } else if (type.isAssignableFrom(Boolean.class) | type.isAssignableFrom(Boolean.TYPE)) { - atts.addAttribute("", "type", "", "", "boolean"); + atts.addAttribute ("", "type", "", "", "boolean"); } else if (type.isAssignableFrom(Integer.class) | type.isAssignableFrom(Integer.TYPE)) { - atts.addAttribute("", "type", "", "", "integer"); + atts.addAttribute ("", "type", "", "", "integer"); } else if (type.isAssignableFrom(Long.class) | type.isAssignableFrom(Long.TYPE)) { - atts.addAttribute("", "type", "", "", "long"); + atts.addAttribute ("", "type", "", "", "long"); } else if (type.isAssignableFrom(Float.class) | type.isAssignableFrom(Float.TYPE)) { - atts.addAttribute("", "type", "", "", "float"); + atts.addAttribute ("", "type", "", "", "float"); } else if (type.isAssignableFrom(Double.class) | type.isAssignableFrom(Double.TYPE)) { - atts.addAttribute("", "type", "", "", "double"); + atts.addAttribute ("", "type", "", "", "double"); } else { - atts.addAttribute("", "type", "", "", "string"); + atts.addAttribute ("", "type", "", "", "string"); } xsdWriter.printTagStartEnd(Tag.attribute, atts); } @@ -372,96 +373,97 @@ public class EldXsdWriterElement { xsdWriter.printTagStartEnd(Tag.anyAttribute, atts); } } - if (ec.getSchemaContentBase() != null) { + if (ec.getSchemaContentBase()!=null) { xsdWriter.printTagEnd(Tag.extension); - if (ec.getSchemaContentComplex() != null && ec.getSchemaContentComplex()) { + if (ec.getSchemaContentComplex()!=null && ec.getSchemaContentComplex()) { xsdWriter.printTagEnd(Tag.complexContent); } else { xsdWriter.printTagEnd(Tag.simpleContent); } } xsdWriter.printTagEnd(Tag.complexType); - if (nsWrite.getLanguageRoot() != null && nsWrite.getLanguageRoot()) { + if (nsWrite.getLanguageRoot()!=null && nsWrite.getLanguageRoot()) { xsdWriter.printTagEnd(Tag.element); } } - - private void writeElementClassNamespaces(ElementClass ecWrite, ElementNamespace nsWrite, ElementNamespace ns) throws IOException { + + private void writeElementClassNamespaces(ElementClass ecWrite,ElementNamespace nsWrite,ElementNamespace ns) throws IOException { AttributesImpl atts = new AttributesImpl(); List refElements = new ArrayList(20); - for (ElementClass checkClass : ns.getElementClasses()) { + for (ElementClass checkClass:ns.getElementClasses()) { List parents = checkClass.getElementParents(nsWrite.getUri()); - if (parents != null && parents.contains(ecWrite.getId())) { + if (parents!=null && parents.contains(ecWrite.getId())) { refElements.add(checkClass.getId()); continue; } - if (checkClass.getObjectClass() == null) { + if (checkClass.getObjectClass()==null) { continue; } - for (ElementInterface ei : language.findElementInterfaces(checkClass.getObjectClass())) { + for (ElementInterface ei:language.findElementInterfaces(checkClass.getObjectClass())) { parents = ei.getElementParents(nsWrite.getUri()); - if (parents != null && parents.contains(ecWrite.getId())) { + if (parents!=null && parents.contains(ecWrite.getId())) { refElements.add(checkClass.getId()); break; } } - if (ecWrite.getObjectClass() == null) { + if (ecWrite.getObjectClass()==null) { continue; } Class objectClass = ecWrite.getObjectClass(); Class checkObjectClass = checkClass.getObjectClass(); - List b = language.findElementBindingHandlers(objectClass, checkObjectClass); - if (b.isEmpty() == false) { + List b = language.findElementBindingHandlers(objectClass,checkObjectClass); + if (b.isEmpty()==false) { refElements.add(checkClass.getId()); } } - - if (refElements.isEmpty() == false) { + + if (refElements.isEmpty()==false) { Set s = new HashSet(refElements.size()); s.addAll(refElements); List r = new ArrayList(s.size()); r.addAll(s); Collections.sort(r); - + String prefix = namespaces.get(ns.getUri()); - for (String refElement : r) { + for (String refElement:r) { atts = new AttributesImpl(); - if (nsWrite.getLanguageRoot() != null && nsWrite.getLanguageRoot()) { - atts.addAttribute("", "ref", "", "", prefix + ":" + refElement); - } else if (nsWrite.getUri().equals(ns.getUri()) == false) { - atts.addAttribute("", "ref", "", "", prefix + ":" + refElement); + if (nsWrite.getLanguageRoot()!=null && nsWrite.getLanguageRoot()) { + atts.addAttribute ("", "ref", "", "", prefix+":"+refElement); + } else if (nsWrite.getUri().equals(ns.getUri())==false) { + atts.addAttribute ("", "ref", "", "", prefix+":"+refElement); } else { - atts.addAttribute("", "name", "", "", refElement); - atts.addAttribute("", "type", "", "", prefix + ":" + refElement + "Type"); + atts.addAttribute ("", "name", "", "", refElement); + atts.addAttribute ("", "type", "", "", prefix+":"+refElement+"Type"); } - xsdWriter.printTagStartEnd(Tag.element, atts); + xsdWriter.printTagStartEnd(Tag.element,atts); } } } - - public void writeElement(ElementClass ec, ElementNamespace nsWrite) throws IOException { - if (nsWrite.getLanguageRoot() != null && nsWrite.getLanguageRoot()) { + + + public void writeElement(ElementClass ec,ElementNamespace nsWrite) throws IOException { + if (nsWrite.getLanguageRoot()!=null && nsWrite.getLanguageRoot()) { return; // is done in writeElementClass } AttributesImpl atts = new AttributesImpl(); - atts.addAttribute("", "name", "", "", ec.getId()); - atts.addAttribute("", "type", "", "", "this:" + ec.getId() + "Type"); - xsdWriter.printTagStart(Tag.element, atts); + atts.addAttribute ("", "name", "", "", ec.getId()); + atts.addAttribute ("", "type", "", "", "this:"+ec.getId()+"Type"); + xsdWriter.printTagStart(Tag.element,atts); writeElementMetaBase(ec); xsdWriter.printTagEnd(Tag.element); } - - private void writeElementAttribute(ElementMetaBase base, AttributesImpl atts) throws IOException { - xsdWriter.printTagStart(Tag.attribute, atts); + + private void writeElementAttribute(ElementMetaBase base,AttributesImpl atts) throws IOException { + xsdWriter.printTagStart(Tag.attribute,atts); writeElementMetaBase(base); xsdWriter.printTagEnd(Tag.attribute); } - - private void writeElementMetaBase(ElementMetaBase base) throws IOException { - if (base == null) { + + private void writeElementMetaBase(ElementMetaBase base) throws IOException { + if (base==null) { return; } - if (base.getDescription() == null) { + if (base.getDescription()==null) { return; } if (!propertyConfig.getPropertyBoolean(EldXsdWriter.OUTPUT_DOCUMENTATION)) { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElement.java index b4844b4..994291a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElement.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.ArrayList; import java.util.HashMap; @@ -47,47 +47,46 @@ public abstract class AbstractElement implements Element { /** The ElementClass */ private ElementClass elementClass = null; /** The attributes */ - private Map attributes = new HashMap(10); + private Map attributes = new HashMap(10); /** The Childeren */ private List childeren = new ArrayList(10); /** All Childeren */ private List allChilderen = new ArrayList(10); - + /** * @see Element#doElementStart() */ public void doElementStart() throws ElementException { } - + /** * @see Element#doElementEnd() */ public void doElementEnd() throws ElementException { } - + /** * @see Element#doElementRun() */ public void doElementRun() throws ElementException { } - + /** * @see Element#setParent(Element) */ public void setParent(Element element) { parent = element; } - + /** * @see Element#getParent() */ public Element getParent() { return parent; } - + /** * Cleans the attributes and elements(class) and context. - * * @see Element#release() */ public void release() throws ElementException { @@ -99,28 +98,28 @@ public abstract class AbstractElement implements Element { childeren.clear(); // we do not release childeren, x4o does that allChilderen.clear(); } - + /** * @see Element#getElementObject() */ public Object getElementObject() { return elementObject; } - + /** * @see Element#setElementObject(Object) */ public void setElementObject(Object object) { - elementObject = object; + elementObject=object; } - + /** * @see Element#setLanguageSession(X4OLanguageSession) */ public void setLanguageSession(X4OLanguageSession languageSession) { - this.languageSession = languageSession; + this.languageSession=languageSession; } - + /** * @see Element#getLanguageSession() */ @@ -133,8 +132,7 @@ public abstract class AbstractElement implements Element { */ public void doCharacters(String characters) throws ElementException { try { - Element e = X4OLanguageClassLoader.newInstance(Element.class, - getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementBodyCharacters()); + Element e = X4OLanguageClassLoader.newInstance(Element.class, getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementBodyCharacters()); e.setElementObject(characters); addChild(e); } catch (ClassNotFoundException exception) { @@ -147,8 +145,7 @@ public abstract class AbstractElement implements Element { */ public void doComment(String comment) throws ElementException { try { - Element e = X4OLanguageClassLoader.newInstance(Element.class, - getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementBodyComment()); + Element e = X4OLanguageClassLoader.newInstance(Element.class, getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementBodyComment()); e.setElementObject(comment); addChild(e); } catch (ClassNotFoundException exception) { @@ -161,8 +158,7 @@ public abstract class AbstractElement implements Element { */ public void doIgnorableWhitespace(String space) throws ElementException { try { - Element e = X4OLanguageClassLoader.newInstance(Element.class, - getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementBodyWhitespace()); + Element e = X4OLanguageClassLoader.newInstance(Element.class, getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementBodyWhitespace()); e.setElementObject(space); addChild(e); } catch (ClassNotFoundException exception) { @@ -174,9 +170,9 @@ public abstract class AbstractElement implements Element { * @see org.x4o.xml.element.Element#setElementClass(ElementClass) */ public void setElementClass(ElementClass elementClass) { - this.elementClass = elementClass; + this.elementClass=elementClass; } - + /** * @see org.x4o.xml.element.Element#getElementClass() */ @@ -192,9 +188,9 @@ public abstract class AbstractElement implements Element { } /** - * @see org.x4o.xml.element.Element#setAttribute(java.lang.String, java.lang.String) + * @see org.x4o.xml.element.Element#setAttribute(java.lang.String, java.lang.String) */ - public void setAttribute(String name, String value) { + public void setAttribute(String name,String value) { attributes.put(name, value); } @@ -204,7 +200,7 @@ public abstract class AbstractElement implements Element { public List getChilderen() { return childeren; } - + /** * @see org.x4o.xml.element.Element#addChild(Element) */ @@ -214,7 +210,7 @@ public abstract class AbstractElement implements Element { childeren.add(element); } } - + /** * @see org.x4o.xml.element.Element#removeChild(Element) */ @@ -239,7 +235,6 @@ public abstract class AbstractElement implements Element { /** * Defaults to false. - * * @see org.x4o.xml.element.Element#isTransformingTree() */ public boolean isTransformingTree() { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementBindingHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementBindingHandler.java index 29fca1b..4ae6b7b 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementBindingHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementBindingHandler.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * An AbstractElementBindingHandler.
@@ -32,31 +33,30 @@ package org.x4o.xml.element; */ public abstract class AbstractElementBindingHandler extends AbstractElementMetaBase implements ElementBindingHandler { - abstract public void bindChild(Element childElement, T parentObject, Object childObject) throws ElementBindingHandlerException; - - abstract public void createChilderen(Element parentElement, T parentObject) throws ElementBindingHandlerException; - + abstract public void bindChild(Element childElement,T parentObject,Object childObject) throws ElementBindingHandlerException; + + abstract public void createChilderen(Element parentElement,T parentObject) throws ElementBindingHandlerException; + @SuppressWarnings("unchecked") public void bindChild(Element childElement) throws ElementBindingHandlerException { - bindChild(childElement, (T) childElement.getParent().getElementObject(), childElement.getElementObject()); + bindChild(childElement,(T)childElement.getParent().getElementObject(), childElement.getElementObject()); } - + @SuppressWarnings("unchecked") public void createChilderen(Element parentElement) throws ElementBindingHandlerException { - createChilderen(parentElement, (T) parentElement.getElementObject()); + createChilderen(parentElement,(T)parentElement.getElementObject()); } - - protected void createChild(Element parentElement, Object childObject) { - if (childObject == null) { + + protected void createChild(Element parentElement,Object childObject) { + if (childObject==null) { return; } - if (parentElement == null) { + if (parentElement==null) { throw new NullPointerException("Can't create child with null parent."); } - Element childElement = parentElement.getLanguageSession().getLanguage().createElementInstance(parentElement.getLanguageSession(), - childObject.getClass()); - if (childElement == null) { - throw new NullPointerException("Could not find Element for child: " + childObject.getClass()); + Element childElement = parentElement.getLanguageSession().getLanguage().createElementInstance(parentElement.getLanguageSession(), childObject.getClass()); + if (childElement==null) { + throw new NullPointerException("Could not find Element for child: "+childObject.getClass()); } childElement.setElementObject(childObject); childElement.setParent(parentElement); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClass.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClass.java index 1239e83..94402ea 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClass.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClass.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.ArrayList; import java.util.List; @@ -40,11 +40,11 @@ public abstract class AbstractElementClass extends AbstractElementClassBase impl private Boolean schemaContentComplex = null; private Boolean schemaContentMixed = null; private List skipPhases = null; - + public AbstractElementClass() { skipPhases = new ArrayList(3); } - + /** * @see ElementClass#getElementClass() */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClassAttribute.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClassAttribute.java index 34a861d..6cf38d3 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClassAttribute.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClassAttribute.java @@ -40,11 +40,11 @@ public abstract class AbstractElementClassAttribute extends AbstractElementMetaB private List attributeAliases = null; private Boolean required = null; private Boolean runResolveEL = null; - // private Boolean runInterfaces = null; + //private Boolean runInterfaces = null; private Boolean runConverters = null; private Boolean runBeanValue = null; private Integer writeOrder = null; - + /** * Creates a AbstractElementClassAttribute. */ @@ -54,7 +54,6 @@ public abstract class AbstractElementClassAttribute extends AbstractElementMetaB /** * Returns the objectConverter. - * * @return The objectConverter. */ public ObjectConverter getObjectConverter() { @@ -63,7 +62,6 @@ public abstract class AbstractElementClassAttribute extends AbstractElementMetaB /** * Sets the objectConverter. - * * @param objectConverter The objectConverter to set. */ public void setObjectConverter(ObjectConverter objectConverter) { @@ -72,17 +70,15 @@ public abstract class AbstractElementClassAttribute extends AbstractElementMetaB /** * Sets the default value. - * - * @param defaultValue The defaultValue to set. + * @param defaultValue The defaultValue to set. * @see org.x4o.xml.element.ElementClassAttribute#setDefaultValue(java.lang.Object) */ public void setDefaultValue(Object defaultValue) { - this.defaultValue = defaultValue; + this.defaultValue=defaultValue; } /** * Returns the default value. - * * @return The default value. * @see org.x4o.xml.element.ElementClassAttribute#getDefaultValue() */ @@ -92,8 +88,7 @@ public abstract class AbstractElementClassAttribute extends AbstractElementMetaB /** * Adds an alias of this attribute. - * - * @param alias The alias to add. + * @param alias The alias to add. * @see org.x4o.xml.element.ElementClassAttribute#addAttributeAlias(java.lang.String) */ public void addAttributeAlias(String alias) { @@ -102,8 +97,7 @@ public abstract class AbstractElementClassAttribute extends AbstractElementMetaB /** * Removes an alias of this attribute. - * - * @param alias The alias to remove. + * @param alias The alias to remove. * @see org.x4o.xml.element.ElementClassAttribute#removeAttributeAlias(java.lang.String) */ public void removeAttributeAlias(String alias) { @@ -112,8 +106,7 @@ public abstract class AbstractElementClassAttribute extends AbstractElementMetaB /** * Returns all aliases of this attribute. - * - * @return An list of aliases. + * @return An list of aliases. * @see org.x4o.xml.element.ElementClassAttribute#getAttributeAliases() */ public List getAttributeAliases() { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClassBase.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClassBase.java index b581225..42ecede 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClassBase.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementClassBase.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.ArrayList; import java.util.Collection; @@ -36,23 +36,22 @@ import java.util.Map; */ public abstract class AbstractElementClassBase extends AbstractElementMetaBase implements ElementClassBase { - private Map elementClassAttributes = null; + private Map elementClassAttributes = null; private List elementConfigurators = null; - private Map> elementParents = null; - + private Map> elementParents = null; + /** * Creates a AbstractElementClassBase. */ public AbstractElementClassBase() { elementConfigurators = new ArrayList(5); - elementClassAttributes = new HashMap(15); - elementParents = new HashMap>(5); + elementClassAttributes = new HashMap(15); + elementParents = new HashMap>(5); } - + /** * Returns a list of ElementConfigurators. - * - * @return List of ElementConfigurators. + * @return List of ElementConfigurators. * @see ElementClass#getElementConfigurators() */ public List getElementConfigurators() { @@ -71,42 +70,40 @@ public abstract class AbstractElementClassBase extends AbstractElementMetaBase i * @param elementClassAttribute The ElementClassAttribute to add. */ public void addElementClassAttribute(ElementClassAttribute elementClassAttribute) { - elementClassAttributes.put(elementClassAttribute.getId(), elementClassAttribute); + elementClassAttributes.put(elementClassAttribute.getId(),elementClassAttribute); } - + /** * @return All the element attributes. */ public Collection getElementClassAttributes() { return elementClassAttributes.values(); } - + /** - * Get the ElementClassAttribute from its name. - * + * Get the ElementClassAttribute from its name. * @param attributeName The attribute name. * @return The element class attribute for the name. */ public ElementClassAttribute getElementClassAttributeByName(String attributeName) { return elementClassAttributes.get(attributeName); } - + /** * Adds parent tag. - * * @see org.x4o.xml.element.ElementClassBase#addElementParent(java.lang.String,java.lang.String) * @param namespaceUri The namespace uri of the parent tag. - * @param tag The tag of the parent of this tag. + * @param tag The tag of the parent of this tag. */ - public void addElementParent(String namespaceUri, String tag) { - if (namespaceUri == null) { + public void addElementParent(String namespaceUri,String tag) { + if (namespaceUri==null) { throw new NullPointerException("Can't add parent tag with null namespace uri."); } - if (namespaceUri.length() == 0) { + if (namespaceUri.length()==0) { throw new IllegalArgumentException("Can't add parent tag with empty namespace uri."); } List tags = elementParents.get(namespaceUri); - if (tags == null) { + if (tags==null) { tags = new ArrayList(5); elementParents.put(namespaceUri, tags); } @@ -115,14 +112,13 @@ public abstract class AbstractElementClassBase extends AbstractElementMetaBase i /** * Removes parent tag. - * * @see org.x4o.xml.element.ElementClassBase#removeElementParent(java.lang.String,java.lang.String) * @param namespaceUri The namespace uri of the parent tag. - * @param tag The tag of the parent of this tag. + * @param tag The tag of the parent of this tag. */ - public void removeElementParent(String namespaceUri, String tag) { + public void removeElementParent(String namespaceUri,String tag) { List tags = elementParents.get(namespaceUri); - if (tags == null) { + if (tags==null) { return; } tags.remove(tag); @@ -130,7 +126,6 @@ public abstract class AbstractElementClassBase extends AbstractElementMetaBase i /** * Returns the parent per namespace uri. - * * @see org.x4o.xml.element.ElementClassBase#getElementParents(java.lang.String) * @param namespaceUri The namespace uri to gets the parents of. * @return List of parent tags of requested parent namespace uri. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementConfigurator.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementConfigurator.java index 8df2d1a..0be256f 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementConfigurator.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementConfigurator.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; /** * An AbstractElementConfigurator.
@@ -33,23 +33,21 @@ public abstract class AbstractElementConfigurator extends AbstractElementMetaBas /** Flag indicating that this is an config action and should run in runPhase */ private boolean configAction = false; - + /** * Defaults to false. - * * @see org.x4o.xml.element.ElementConfigurator#isConfigAction() * @return True if set to configAction */ public boolean isConfigAction() { return configAction; } - + /** * Sets the configAction. - * - * @param configAction The configAction to set. + * @param configAction The configAction to set. */ public void setConfigAction(boolean configAction) { - this.configAction = configAction; + this.configAction=configAction; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementInterface.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementInterface.java index 6f10877..26f6a3d 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementInterface.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementInterface.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; /** * AbstractElementInterface extends base support with element interface support. @@ -31,13 +31,13 @@ package org.x4o.xml.element; public abstract class AbstractElementInterface extends AbstractElementClassBase implements ElementInterface { private Class interfaceClass = null; - + /** * Creates AbstractElementInterface. */ public AbstractElementInterface() { } - + /** * @see org.x4o.xml.element.ElementInterface#getInterfaceClass() * @return The interface class @@ -45,12 +45,12 @@ public abstract class AbstractElementInterface extends AbstractElementClassBase public Class getInterfaceClass() { return interfaceClass; } - + /** * @see org.x4o.xml.element.ElementInterface#setInterfaceClass(java.lang.Class) * @param interfaceClass The interface class to set. */ public void setInterfaceClass(Class interfaceClass) { - this.interfaceClass = interfaceClass; + this.interfaceClass=interfaceClass; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementMetaBase.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementMetaBase.java index 2926ce9..5d49b83 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementMetaBase.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementMetaBase.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; /** * AbstractElementMetaBase stores the id and description. @@ -30,50 +30,46 @@ package org.x4o.xml.element; * @version 1.0 Jan 18, 2009 */ public abstract class AbstractElementMetaBase implements ElementMetaBase { - + /** The id */ private String id = null; - + /** The description */ private String description = null; - + /** * Gets the id. - * * @see org.x4o.xml.element.ElementMetaBase#getId() * @return The id. */ public String getId() { return id; } - + /** * Sets the id. - * * @see org.x4o.xml.element.ElementMetaBase#setId(java.lang.String) * @param id The id to set. */ public void setId(String id) { - this.id = id; + this.id=id; } - + /** * Gets the description. - * * @see org.x4o.xml.element.ElementConfigurator#getDescription() * @return The description. */ public String getDescription() { return description; } - + /** * Sets the description. - * * @see org.x4o.xml.element.ElementConfigurator#setDescription(java.lang.String) * @param description The description to set. */ public void setDescription(String description) { - this.description = description; + this.description=description; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespace.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespace.java index 361e6c2..014d6de 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespace.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespace.java @@ -37,7 +37,7 @@ public abstract class AbstractElementNamespace extends AbstractElementMetaBase i private ElementNamespaceInstanceProvider elementNamespaceInstanceProvider = null; private String prefixMapping = null; - private Map elementClasses = null; + private Map elementClasses = null; private String uri = null; private String name = null; private String schemaUri = null; @@ -45,9 +45,9 @@ public abstract class AbstractElementNamespace extends AbstractElementMetaBase i private String schemaPrefix = null; private Boolean languageRoot = null; private List elementNamespaceAttributes = null; - + public AbstractElementNamespace() { - elementClasses = new HashMap(60); + elementClasses = new HashMap(60); elementNamespaceAttributes = new ArrayList(5); } @@ -76,14 +76,14 @@ public abstract class AbstractElementNamespace extends AbstractElementMetaBase i * @see org.x4o.xml.element.ElementNamespace#setPrefixMapping(java.lang.String) */ public void setPrefixMapping(String prefixMapping) { - this.prefixMapping = prefixMapping; + this.prefixMapping=prefixMapping; } /** * @see org.x4o.xml.element.ElementNamespace#addElementClass(org.x4o.xml.element.ElementClass) */ public void addElementClass(ElementClass elementClass) { - if (elementClass.getId() == null) { + if (elementClass.getId()==null) { throw new NullPointerException("ElementClass not correctly configured getId is null."); } elementClasses.put(elementClass.getId(), elementClass); @@ -186,15 +186,16 @@ public abstract class AbstractElementNamespace extends AbstractElementMetaBase i public void setSchemaPrefix(String schemaPrefix) { this.schemaPrefix = schemaPrefix; } - + + public void addElementNamespaceAttribute(ElementNamespaceAttribute elementNamespaceAttribute) { - if (elementNamespaceAttribute == null) { + if (elementNamespaceAttribute==null) { throw new NullPointerException("Can't add null object"); } - if (elementNamespaceAttribute.getId() == null) { + if (elementNamespaceAttribute.getId()==null) { throw new NullPointerException("Can't add with null id property."); } - // logger.finer("Adding elementNamespaceAttribute: "+elementNamespaceAttribute.getAttributeName()); + //logger.finer("Adding elementNamespaceAttribute: "+elementNamespaceAttribute.getAttributeName()); elementNamespaceAttributes.add(elementNamespaceAttribute); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespaceAttribute.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespaceAttribute.java index c322198..cd6e8a1 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespaceAttribute.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespaceAttribute.java @@ -32,15 +32,15 @@ import java.util.List; * @version 1.0 Aug 10, 2006 */ public abstract class AbstractElementNamespaceAttribute extends AbstractElementConfigurator implements ElementNamespaceAttribute { - + private String attributeName = null; private List nextAttributes = new ArrayList(2); - + /** * @see org.x4o.xml.element.ElementNamespaceAttribute#addNextAttribute(java.lang.String) */ public void addNextAttribute(String attribute) { - if (attribute == null) { + if (attribute==null) { throw new NullPointerException("Can add null attribute for loading."); } nextAttributes.add(attribute); @@ -48,9 +48,9 @@ public abstract class AbstractElementNamespaceAttribute extends AbstractElementC /** * @see org.x4o.xml.element.ElementNamespaceAttribute#removeNextAttribute(java.lang.String) - */ + */ public void removeNextAttribute(String attribute) { - if (attribute == null) { + if (attribute==null) { throw new NullPointerException("Can remove null attribute for loading."); } nextAttributes.remove(attribute); @@ -74,6 +74,6 @@ public abstract class AbstractElementNamespaceAttribute extends AbstractElementC * @see org.x4o.xml.element.ElementNamespaceAttribute#setAttributeName(java.lang.String) */ public void setAttributeName(String attributeName) { - this.attributeName = attributeName; + this.attributeName=attributeName; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElement.java index 0b7c3c8..021075e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElement.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * The default element to handle the xml events. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementAttributeValueParser.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementAttributeValueParser.java index 91319a8..3804e27 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementAttributeValueParser.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementAttributeValueParser.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.Locale; import java.util.logging.Logger; @@ -29,6 +29,7 @@ import javax.el.ValueExpression; import org.x4o.xml.conv.ObjectConverterException; + /** * An DefaultElementAttributeValueParser. * @@ -37,16 +38,18 @@ import org.x4o.xml.conv.ObjectConverterException; */ public class DefaultElementAttributeValueParser implements ElementAttributeValueParser { - private Logger logger = null; + private Logger logger = null; + public DefaultElementAttributeValueParser() { logger = Logger.getLogger(DefaultElementAttributeValueParser.class.getName()); } - + + /** * @see org.x4o.xml.element.ElementAttributeValueParser#getParameterValue(java.lang.String, java.lang.String, org.x4o.xml.element.Element) */ - public Object getParameterValue(String name, String valueString, Element element) throws ElementAttributeValueParserException, ObjectConverterException { + public Object getParameterValue(String name, String valueString, Element element) throws ElementAttributeValueParserException,ObjectConverterException { Object value = valueString; if (isELParameter(name, valueString, element)) { @@ -55,53 +58,55 @@ public class DefaultElementAttributeValueParser implements ElementAttributeValue return getConvertedParameterValue(name, value, element); } + + + /** - * @throws ObjectConverterException + * @throws ObjectConverterException * @see org.x4o.xml.element.ElementAttributeValueParser#getConvertedParameterValue(java.lang.String, java.lang.Object, org.x4o.xml.element.Element) */ - public Object getConvertedParameterValue(String name, Object value, Element element) throws ElementAttributeValueParserException, ObjectConverterException { - // bit slow here - if (value == null) { + public Object getConvertedParameterValue(String name,Object value, Element element) throws ElementAttributeValueParserException, ObjectConverterException { + //bit slow here + if (value==null) { return null; // TODO: make setting for null } - + // do converts for ElementClass ElementClassAttribute attr = element.getElementClass().getElementClassAttributeByName(name); - if (attr != null && attr.getObjectConverter() != null && value.getClass().isAssignableFrom(attr.getObjectConverter().getObjectClassTo()) == false) { - logger.finer("attr conv: " + attr.getObjectConverter() + " for name: " + name); + if (attr!=null && attr.getObjectConverter()!=null && value.getClass().isAssignableFrom(attr.getObjectConverter().getObjectClassTo())==false) { + logger.finer("attr conv: "+attr.getObjectConverter()+" for name: "+name); Object result = attr.getObjectConverter().convertTo(value.toString(), Locale.getDefault()); return result; } // check interfaces - if (element.getElementObject() == null) { + if (element.getElementObject()==null) { return value; } - for (ElementInterface ei : element.getLanguageSession().getLanguage().findElementInterfaces(element.getElementObject())) { + for (ElementInterface ei:element.getLanguageSession().getLanguage().findElementInterfaces(element.getElementObject())) { logger.finer("Found interface match executing converter."); - for (ElementClassAttribute attrClass : ei.getElementClassAttributes()) { - if (name.equals(attrClass.getId()) == false) { + for (ElementClassAttribute attrClass:ei.getElementClassAttributes()) { + if (name.equals(attrClass.getId())==false) { continue; } - if (attrClass.getObjectConverter() == null) { + if (attrClass.getObjectConverter()==null) { continue; } if (value.getClass().isAssignableFrom(attrClass.getObjectConverter().getObjectClassTo())) { continue; // make flag ? } - logger.finest("attr conv interface: " + attrClass.getObjectConverter() + " for name: " + name); + logger.finest("attr conv interface: "+attrClass.getObjectConverter()+" for name: "+name); Object result = attrClass.getObjectConverter().convertTo(value.toString(), Locale.getDefault()); return result; // ?? } } return value; } - + /** * @see org.x4o.xml.element.ElementAttributeValueParser#getELParameterValue(java.lang.String, org.x4o.xml.element.Element) */ public Object getELParameterValue(String value, Element element) throws ElementAttributeValueParserException { - ValueExpression e = element.getLanguageSession().getExpressionLanguageFactory() - .createValueExpression(element.getLanguageSession().getExpressionLanguageContext(), (String) value, Object.class); + ValueExpression e = element.getLanguageSession().getExpressionLanguageFactory().createValueExpression(element.getLanguageSession().getExpressionLanguageContext(), (String)value,Object.class); return e.getValue(element.getLanguageSession().getExpressionLanguageContext()); } @@ -109,27 +114,27 @@ public class DefaultElementAttributeValueParser implements ElementAttributeValue * @see org.x4o.xml.element.ElementAttributeValueParser#isELParameter(java.lang.String, java.lang.String, org.x4o.xml.element.Element) */ public boolean isELParameter(String name, String value, Element element) { - if (value == null) { + if (value==null) { return false; } - if (value.startsWith("${") == false) { + if (value.startsWith("${")==false) { return false; } - if (element == null) { - return true; // null element disables checks + if (element==null) { + return true; // null element disables checks } ElementClassAttribute attr = element.getElementClass().getElementClassAttributeByName(name); - if (attr != null && attr.getRunResolveEL() != null && attr.getRunResolveEL() == false) { - logger.finest("Skipping EL parsing for: " + name); + if (attr!=null && attr.getRunResolveEL()!=null && attr.getRunResolveEL()==false) { + logger.finest("Skipping EL parsing for: "+name); return false; } - - for (ElementInterface ei : element.getLanguageSession().getLanguage().findElementInterfaces(element.getElementObject())) { + + for (ElementInterface ei:element.getLanguageSession().getLanguage().findElementInterfaces(element.getElementObject())) { logger.finest("Found interface match checking disables el parameters."); - + attr = ei.getElementClassAttributeByName(name); - if (attr != null && attr.getRunResolveEL() != null && attr.getRunResolveEL() == false) { - logger.finest("Skipping EL parsing for: " + name + " in interface element."); + if (attr!=null && attr.getRunResolveEL()!=null && attr.getRunResolveEL()==false) { + logger.finest("Skipping EL parsing for: "+name+" in interface element."); return false; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyCharacters.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyCharacters.java index 8b07d5f..1a12de4 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyCharacters.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyCharacters.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.ArrayList; import java.util.HashMap; @@ -29,6 +29,7 @@ import java.util.Map; import org.x4o.xml.lang.X4OLanguageSession; + /** * DefaultElementBodyCharacters the default characters element. * @@ -41,9 +42,9 @@ public class DefaultElementBodyCharacters implements Element { private Element parent = null; /** The config object */ private Object elementObject = null; - + /** - * @return The ElementType for characters. + * @return The ElementType for characters. * @see org.x4o.xml.element.Element#getElementType() */ public ElementType getElementType() { @@ -105,7 +106,7 @@ public class DefaultElementBodyCharacters implements Element { * @see org.x4o.xml.element.Element#getAttributes() */ public Map getAttributes() { - return new HashMap(0); + return new HashMap(0); } /** @@ -159,7 +160,7 @@ public class DefaultElementBodyCharacters implements Element { /** * @see org.x4o.xml.element.Element#removeChild(org.x4o.xml.element.Element) */ - public void removeChild(Element element) { + public void removeChild(Element element) { } /** @@ -184,13 +185,13 @@ public class DefaultElementBodyCharacters implements Element { * @see org.x4o.xml.element.Element#setElementObject(java.lang.Object) */ public void setElementObject(Object elementObject) { - this.elementObject = elementObject; + this.elementObject=elementObject; } /** * @see org.x4o.xml.element.Element#setParent(org.x4o.xml.element.Element) */ public void setParent(Element parent) { - this.parent = parent; + this.parent=parent; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyComment.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyComment.java index ee7865c..c6b0ba3 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyComment.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyComment.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * DefaultElementBodyComment the default comment element. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyWhitespace.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyWhitespace.java index 961c526..c57f56c 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyWhitespace.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementBodyWhitespace.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * DefaultElementBodyWhitespace the default white space element. @@ -31,7 +32,7 @@ package org.x4o.xml.element; public class DefaultElementBodyWhitespace extends AbstractElement { /** - * @return Returns the whitespace element type. + * @return Returns the whitespace element type. * @see org.x4o.xml.element.AbstractElement#getElementType() */ @Override diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementClass.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementClass.java index 19120fe..5176e3d 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementClass.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementClass.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * DefaultElementClass stores the XML Element information. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementClassAttribute.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementClassAttribute.java index cf8700c..c766f0b 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementClassAttribute.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementClassAttribute.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * The default ElementClassAttribute. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementInterface.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementInterface.java index 4bcdbaf..2f9b98e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementInterface.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementInterface.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * The default ElementInterface to store config based on class interface. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespace.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespace.java index e607807..25aeddd 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespace.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespace.java @@ -22,6 +22,7 @@ */ package org.x4o.xml.element; + /** * DefaultElementNamespace is the default element namespace implementation. * diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespaceAttributeComparator.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespaceAttributeComparator.java index f74ec9b..45ee464 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespaceAttributeComparator.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespaceAttributeComparator.java @@ -24,6 +24,8 @@ package org.x4o.xml.element; import java.util.Comparator; + + /** * The DefaultElementNamespaceAttributeComparator.
* This Comparator compares the NextAttribute names with the attributeName of the ElementNamespaceAttribute.
@@ -34,20 +36,20 @@ import java.util.Comparator; public class DefaultElementNamespaceAttributeComparator implements Comparator { /** - * @param e1 The first ElementNamespaceAttribute to compare. - * @param e2 The second ElementNamespaceAttribute to compare. - * @return 0 is same. + * @param e1 The first ElementNamespaceAttribute to compare. + * @param e2 The second ElementNamespaceAttribute to compare. + * @return 0 is same. * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(ElementNamespaceAttribute e1, ElementNamespaceAttribute e2) { - for (String param : e1.getNextAttributes()) { - if (param.equals(e2.getAttributeName())) { + for (String param:e1.getNextAttributes()) { + if(param.equals(e2.getAttributeName())) { return -1; } } - for (String param : e2.getNextAttributes()) { - if (param.equals(e1.getAttributeName())) { + for (String param:e2.getNextAttributes()) { + if(param.equals(e1.getAttributeName())) { return 1; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespaceInstanceProvider.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespaceInstanceProvider.java index 9a6a37f..83296e4 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespaceInstanceProvider.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespaceInstanceProvider.java @@ -38,7 +38,7 @@ public class DefaultElementNamespaceInstanceProvider implements ElementNamespace private Logger logger = null; private ElementNamespace elementNamespace = null; - + /** * Creates new DefaultElementNamespaceInstanceProvider. */ @@ -47,47 +47,47 @@ public class DefaultElementNamespaceInstanceProvider implements ElementNamespace } /** - * @param language The elementLanguage of this provider. - * @param elementNamespace The elementNamespace for this provider. + * @param language The elementLanguage of this provider. + * @param elementNamespace The elementNamespace for this provider. * @see org.x4o.xml.element.ElementNamespaceInstanceProvider#start(org.x4o.xml.lang.X4OLanguage, org.x4o.xml.element.ElementNamespace) */ - public void start(X4OLanguage language, ElementNamespace elementNamespace) { - this.elementNamespace = elementNamespace; - logger.finer("Starting DefaultElementNamespaceInstanceProvider for: " + elementNamespace.getUri()); + public void start(X4OLanguage language,ElementNamespace elementNamespace) { + this.elementNamespace=elementNamespace; + logger.finer("Starting DefaultElementNamespaceInstanceProvider for: "+elementNamespace.getUri()); } /** - * @param languageSession The language context for which we create the Element instance. - * @param tag The xml tag to create an Element instance for. - * @return The Element to handle the given tag. - * @throws ElementNamespaceInstanceProviderException + * @param languageSession The language context for which we create the Element instance. + * @param tag The xml tag to create an Element instance for. + * @return The Element to handle the given tag. + * @throws ElementNamespaceInstanceProviderException * @see org.x4o.xml.element.ElementNamespaceInstanceProvider#createElementInstance(org.x4o.xml.lang.X4OLanguageSession,java.lang.String) */ - public Element createElementInstance(X4OLanguageSession languageSession, String tag) throws ElementNamespaceInstanceProviderException { - ElementClass elementClass = elementNamespace.getElementClass(tag); - Element element = null; - - if (elementClass == null) { - throw new ElementNamespaceInstanceProviderException(this, "Tag: " + tag + " unknown in: " + elementNamespace.getUri()); + public Element createElementInstance(X4OLanguageSession languageSession,String tag) throws ElementNamespaceInstanceProviderException { + ElementClass elementClass = elementNamespace.getElementClass(tag); + Element element = null; + + if (elementClass==null) { + throw new ElementNamespaceInstanceProviderException(this,"Tag: " + tag + " unknown in: " + elementNamespace.getUri()); } - + try { - if (elementClass.getElementClass() != null) { + if (elementClass.getElementClass()!=null) { Object obj = X4OLanguageClassLoader.newInstance(elementClass.getElementClass()); if (obj instanceof Element) { element = (Element) obj; } else { - throw new ElementNamespaceInstanceProviderException(this, "Provided elementClassName is not an Element: " + obj.getClass()); + throw new ElementNamespaceInstanceProviderException(this,"Provided elementClassName is not an Element: "+obj.getClass()); } } else { - element = (Element) X4OLanguageClassLoader.newInstance((languageSession.getLanguage().getLanguageConfiguration().getDefaultElement())); + element = (Element)X4OLanguageClassLoader.newInstance((languageSession.getLanguage().getLanguageConfiguration().getDefaultElement())); } - - if (elementClass.getObjectClass() != null) { + + if (elementClass.getObjectClass()!=null) { element.setElementObject(X4OLanguageClassLoader.newInstance(elementClass.getObjectClass())); } } catch (ClassNotFoundException e) { - throw new ElementNamespaceInstanceProviderException(this, "Error while providing Element: " + e.getMessage(), e); + throw new ElementNamespaceInstanceProviderException(this,"Error while providing Element: "+e.getMessage(),e); } element.setElementClass(elementClass); element.setLanguageSession(languageSession); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementObjectPropertyValue.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementObjectPropertyValue.java index 33e67e8..5c9bf16 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementObjectPropertyValue.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementObjectPropertyValue.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.io.Serializable; import java.lang.reflect.Method; @@ -39,24 +39,24 @@ import org.x4o.xml.conv.ObjectConverterException; * @author Willem Cazander * @version 1.0 Feb 16, 2007 */ -public class DefaultElementObjectPropertyValue implements ElementObjectPropertyValue, Serializable { +public class DefaultElementObjectPropertyValue implements ElementObjectPropertyValue,Serializable { private static final long serialVersionUID = 1L; - + private Logger logger = Logger.getLogger(DefaultElementObjectPropertyValue.class.getName()); - - private Method findMethod(Object object, String parameterName, Object parameter) { - + + private Method findMethod(Object object,String parameterName,Object parameter) { + // Get class but can be null. Class parameterClass = null; - if (parameter != null) { - parameterClass = parameter.getClass(); + if(parameter!=null) { + parameterClass=parameter.getClass(); } - logger.finer("Trying value: pn=" + parameterName + " o=" + object + " p=" + parameter + "(" + parameterClass + ")"); - String parameterNameSet = "set" + parameterName; + logger.finer("Trying value: pn="+parameterName+" o="+object+" p="+parameter+"("+parameterClass+")"); + String parameterNameSet = "set"+parameterName; Method[] methodes = object.getClass().getMethods(); Method lastMethodFall = null; - for (int i = 0; i < methodes.length; i++) { + for (int i=0;i[] types = method.getParameterTypes(); if (types.length == 0) { @@ -67,32 +67,32 @@ public class DefaultElementObjectPropertyValue implements ElementObjectPropertyV } if (method.getName().equalsIgnoreCase(parameterNameSet)) { lastMethodFall = method; - if (parameterClass != null) { + if (parameterClass!=null) { // Check for class based parameters. if (types[0].isAssignableFrom(parameterClass)) { - logger.finest("Found method type: " + method.getParameterTypes()[0] + " for parameter: " + parameterName); + logger.finest("Found method type: "+method.getParameterTypes()[0]+" for parameter: "+parameterName); return method; } // Check the native parameter types. - if (parameterClass.isAssignableFrom(Boolean.class) && types[0].isAssignableFrom(Boolean.TYPE)) { + if (parameterClass.isAssignableFrom(Boolean.class) && types[0].isAssignableFrom(Boolean.TYPE) ) { return method; } - if (parameterClass.isAssignableFrom(Integer.class) && types[0].isAssignableFrom(Integer.TYPE)) { + if (parameterClass.isAssignableFrom(Integer.class) && types[0].isAssignableFrom(Integer.TYPE) ) { return method; } - if (parameterClass.isAssignableFrom(Long.class) && types[0].isAssignableFrom(Long.TYPE)) { + if (parameterClass.isAssignableFrom(Long.class) && types[0].isAssignableFrom(Long.TYPE) ) { return method; } - if (parameterClass.isAssignableFrom(Double.class) && types[0].isAssignableFrom(Double.TYPE)) { + if (parameterClass.isAssignableFrom(Double.class) && types[0].isAssignableFrom(Double.TYPE) ) { return method; } - if (parameterClass.isAssignableFrom(Float.class) && types[0].isAssignableFrom(Float.TYPE)) { + if (parameterClass.isAssignableFrom(Float.class) && types[0].isAssignableFrom(Float.TYPE) ) { return method; } - if (parameterClass.isAssignableFrom(Byte.class) && types[0].isAssignableFrom(Byte.TYPE)) { + if (parameterClass.isAssignableFrom(Byte.class) && types[0].isAssignableFrom(Byte.TYPE) ) { return method; } - if (parameterClass.isAssignableFrom(Character.class) && types[0].isAssignableFrom(Character.TYPE)) { + if (parameterClass.isAssignableFrom(Character.class) && types[0].isAssignableFrom(Character.TYPE) ) { return method; } } @@ -100,7 +100,7 @@ public class DefaultElementObjectPropertyValue implements ElementObjectPropertyV } return lastMethodFall; } - + /** * TODO: this function is not completed !! * @@ -111,212 +111,222 @@ public class DefaultElementObjectPropertyValue implements ElementObjectPropertyV * @param parameter * @throws ElementObjectPropertyValueException */ - public void setProperty(Object object, String parameterName, Object parameter) throws ElementObjectPropertyValueException { - + public void setProperty(Object object,String parameterName,Object parameter) throws ElementObjectPropertyValueException { + // find the method for the parameter - Method lastMethod = findMethod(object, parameterName, parameter); - if (lastMethod == null) { - logger.finest("No method found, aborting parameter: " + parameterName); + Method lastMethod = findMethod(object,parameterName,parameter); + if (lastMethod==null) { + logger.finest("No method found, aborting parameter: "+parameterName); return; } - + // Special case for null value. - if (parameter == null) { - logger.finest("Found parameter is null Setting method: " + lastMethod.getParameterTypes()[0] + " for parameter: " + parameterName); + if (parameter==null) { + logger.finest("Found parameter is null Setting method: "+lastMethod.getParameterTypes()[0]+" for parameter: "+parameterName); try { - lastMethod.invoke(object, new Object[] { parameter }); + lastMethod.invoke(object,new Object[]{parameter}); return; } catch (Exception e) { - throw new ElementObjectPropertyValueException(e.getMessage(), e); + throw new ElementObjectPropertyValueException(e.getMessage(),e); } } - + // Invoke for class based parameters if (lastMethod.getParameterTypes()[0].isAssignableFrom(parameter.getClass())) { - logger.finest("Found parameter type: " + lastMethod.getParameterTypes()[0] + " for parameter: " + parameterName + " setting value: " + parameter); + logger.finest("Found parameter type: "+lastMethod.getParameterTypes()[0]+" for parameter: "+parameterName+" setting value: "+parameter); try { - lastMethod.invoke(object, new Object[] { parameter }); + lastMethod.invoke(object,new Object[]{parameter}); return; } catch (Exception e) { - throw new ElementObjectPropertyValueException(e.getMessage(), e); + throw new ElementObjectPropertyValueException(e.getMessage(),e); } } - + // Invoke for native based types - + + // not found 2sec try logger.finest("No corresoning class is found, trying convert manualy"); - + // special case for object. - if (lastMethod.getParameterTypes()[0].equals(Object.class)) { - logger.finest("Set Special object value: " + parameterName + " parm2: " + parameter + " on2=" + lastMethod.getName() + " with=" + object); + if (lastMethod.getParameterTypes()[0].equals(Object.class) ) { + logger.finest("Set Special object value: "+parameterName+" parm2: "+parameter+" on2="+lastMethod.getName()+" with="+object); try { - lastMethod.invoke(object, new Object[] { parameter }); + lastMethod.invoke(object,new Object[]{parameter}); } catch (Exception e) { - throw new ElementObjectPropertyValueException(e.getMessage(), e); + throw new ElementObjectPropertyValueException(e.getMessage(),e); } return; } - + // all below creates from string - if (parameter.toString().length() == 0) { + if (parameter.toString().length()==0) { return; // can't set value from string with empty size. } - + // // JAVA OBJECT TYPES: // Object parameter2 = null; - + try { DefaultObjectConverterProvider convProvider = new DefaultObjectConverterProvider(); convProvider.addDefaults(); ObjectConverter conv = convProvider.getObjectConverterForClass(lastMethod.getParameterTypes()[0]); - if (conv != null) { + if (conv!=null) { parameter2 = conv.convertTo(parameter.toString(), Locale.getDefault()); } - + /* * JAVA NATIVE TYPES: * - * TYPE: Size in bits: boolean 8, unsigned byte 8 char 16, unsigned short 16 int 32 long 64 float 32 double 64 void n/a + * TYPE: Size in bits: + * boolean 8, unsigned + * byte 8 + * char 16, unsigned + * short 16 + * int 32 + * long 64 + * float 32 + * double 64 + * void n/a */ - if (lastMethod.getParameterTypes()[0].isAssignableFrom(Boolean.TYPE)) { + if (lastMethod.getParameterTypes()[0].isAssignableFrom(Boolean.TYPE) ) { conv = convProvider.getObjectConverterForClass(Boolean.class); parameter2 = conv.convertTo(parameter.toString(), Locale.getDefault()); } - if (lastMethod.getParameterTypes()[0].isAssignableFrom(Integer.TYPE)) { + if (lastMethod.getParameterTypes()[0].isAssignableFrom(Integer.TYPE) ) { conv = convProvider.getObjectConverterForClass(Integer.class); parameter2 = conv.convertTo(parameter.toString(), Locale.getDefault()); } - if (lastMethod.getParameterTypes()[0].isAssignableFrom(Long.TYPE)) { + if (lastMethod.getParameterTypes()[0].isAssignableFrom(Long.TYPE) ) { conv = convProvider.getObjectConverterForClass(Long.class); parameter2 = conv.convertTo(parameter.toString(), Locale.getDefault()); } - if (lastMethod.getParameterTypes()[0].isAssignableFrom(Double.TYPE)) { + if (lastMethod.getParameterTypes()[0].isAssignableFrom(Double.TYPE) ) { conv = convProvider.getObjectConverterForClass(Double.class); parameter2 = conv.convertTo(parameter.toString(), Locale.getDefault()); } - if (lastMethod.getParameterTypes()[0].isAssignableFrom(Float.TYPE)) { + if (lastMethod.getParameterTypes()[0].isAssignableFrom(Float.TYPE) ) { conv = convProvider.getObjectConverterForClass(Float.class); parameter2 = conv.convertTo(parameter.toString(), Locale.getDefault()); } - if (lastMethod.getParameterTypes()[0].isAssignableFrom(Byte.TYPE)) { + if (lastMethod.getParameterTypes()[0].isAssignableFrom(Byte.TYPE) ) { conv = convProvider.getObjectConverterForClass(Byte.class); parameter2 = conv.convertTo(parameter.toString(), Locale.getDefault()); } - if (lastMethod.getParameterTypes()[0].isAssignableFrom(Character.TYPE)) { + if (lastMethod.getParameterTypes()[0].isAssignableFrom(Character.TYPE) ) { conv = convProvider.getObjectConverterForClass(Character.class); parameter2 = conv.convertTo(parameter.toString(), Locale.getDefault()); } - + } catch (ObjectConverterException oce) { - throw new ElementObjectPropertyValueException(oce.getMessage(), oce); + throw new ElementObjectPropertyValueException(oce.getMessage(),oce); } - - if (parameter2 == null) { - throw new ElementObjectPropertyValueException("Could not convert to type for parameter: '" + parameterName + "' value: '" + parameter + "'"); + + if (parameter2==null) { + throw new ElementObjectPropertyValueException("Could not convert to type for parameter: '"+parameterName+"' value: '"+parameter+"'"); } - - logger.finest("Set value: " + parameterName + " parm2: " + parameter2 + " on2=" + lastMethod.getName() + " with=" + object); + + logger.finest("Set value: "+parameterName+" parm2: "+parameter2+" on2="+lastMethod.getName()+" with="+object); try { - lastMethod.invoke(object, new Object[] { parameter2 }); + lastMethod.invoke(object,new Object[]{parameter2}); } catch (Exception e) { - throw new ElementObjectPropertyValueException(e.getMessage(), e); + throw new ElementObjectPropertyValueException(e.getMessage(),e); } } - + /** * Gets the property of an bean. * - * @param object The object to get from. - * @param parameterName The parameter name of the property to get. + * @param object The object to get from. + * @param parameterName The parameter name of the property to get. * @throws ElementObjectPropertyValueException */ - public Object getProperty(Object object, String parameterName) throws ElementObjectPropertyValueException { + public Object getProperty(Object object,String parameterName) throws ElementObjectPropertyValueException { - if (object == null) { + if (object==null) { throw new NullPointerException("Can't get property of null object."); } - if (parameterName == null) { + if (parameterName==null) { throw new NullPointerException("Can't get property is the name is null."); } - + Logger logger = Logger.getLogger(DefaultElementObjectPropertyValue.class.getName()); - + String propRest = null; int index = parameterName.indexOf("."); - if (index > 0) { - propRest = parameterName.substring(index + 1); - parameterName = parameterName.substring(0, index); - logger.finest("slit property into: '" + propRest + "' and '" + parameterName + "'"); + if(index>0) { + propRest = parameterName.substring(index+1); + parameterName = parameterName.substring(0,index); + logger.finest("slit property into: '"+propRest+"' and '"+parameterName+"'"); } - logger.finer("Trying value: pn=" + parameterName + " o=" + object); - String parameterNameSet = "get" + parameterName; + logger.finer("Trying value: pn="+parameterName+" o="+object); + String parameterNameSet = "get"+parameterName; Method[] methodes = object.getClass().getMethods(); Method lastMethod = null; - + // a bit hackie - for (int i = 0; i < methodes.length; i++) { + for(int i=0;i[] types = method.getParameterTypes(); if (types.length != 0) { continue; } - if (method.getName().equalsIgnoreCase(parameterNameSet)) { - logger.finest("Found method: " + method.getName()); + if(method.getName().equalsIgnoreCase(parameterNameSet)) { + logger.finest("Found method: "+method.getName()); lastMethod = method; break; } } - - if (lastMethod == null) { - for (int i = 0; i < methodes.length; i++) { + + if (lastMethod==null) { + for(int i=0;i attributes) throws ElementObjectPropertyValueException { Iterator keyIterator = attributes.keySet().iterator(); - while (keyIterator.hasNext()) { + while(keyIterator.hasNext()) { String key = keyIterator.next(); - setProperty(object, key, attributes.get(key)); + setProperty(object,key,attributes.get(key)); } } } \ No newline at end of file diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/Element.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/Element.java index 22c2743..845881e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/Element.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/Element.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.ArrayList; import java.util.List; @@ -32,43 +32,43 @@ import org.x4o.xml.lang.X4OLanguageSession; * Defines an XML element with an object.
*
* The main function is to store the ElementObject.
- * Also we can configure the ElementObject from differted events hooks. from the attibutes or parent (object)element. + * Also we can configure the ElementObject from differted events hooks. + * from the attibutes or parent (object)element. * * @author Willem Cazander * @version 1.0 Feb 01, 2005 */ public interface Element { - + /** * The ElementTypes which are possible. */ public enum ElementType { - + /** The normale ElementType, which is mostly bound to an object. */ element, - + /** Extra meta characters in xml. */ characters, - + /** The xml comments in xml. */ comment, - + /** ignorableWhitespace in xml. */ ignorableWhitespace, - + /** Receive raw sax event on elementObject. */ overrideSax; - + /** * Filters the given elments list to elementType. - * - * @param elements The elements to filter. - * @param elementType The elementType to filter on. - * @return Always returns List of Elements of filter type. + * @param elements The elements to filter. + * @param elementType The elementType to filter on. + * @return Always returns List of Elements of filter type. */ - public static List filterElements(List elements, ElementType elementType) { + public static List filterElements(List elements,ElementType elementType) { List result = new ArrayList(3); - for (int i = 0; i < elements.size(); i++) { + for (int i=0;i * Or null when there is no parent Element. * - * @return Returns the parent Element + * @return Returns the parent Element */ Element getParent(); - + /** * This method get called when this Element object is not needed anymore.
* Can be used to close resources. - * * @throws ElementException Can be thrown when structure is not correct. */ void release() throws ElementException; - + /** * Gives back the object this Element has made and configed.
* So other elements can do stuff to that object.
* - * @return An Object. + * @return An Object. */ Object getElementObject(); - + /** * Sets the object which we control. - * - * @param object The object to configed by this element. + * @param object The object to configed by this element. */ void setElementObject(Object object); - + /** * Sets the X4OLanguageSession. - * - * @param languageSession The X4OLanguageSession to set. + * @param languageSession The X4OLanguageSession to set. */ void setLanguageSession(X4OLanguageSession languageSession); - + /** * Gets the X4OLanguageSession. - * - * @return Returns the X4OLanguageSession. + * @return Returns the X4OLanguageSession. */ X4OLanguageSession getLanguageSession(); - + /** * Sets the body texts on an event based system. - * - * @param body The body text. + * @param body The body text. * @throws ElementException Can be thrown when structure is not correct. */ void doCharacters(String body) throws ElementException; - + /** * Sets the comment texts on an event based system. - * - * @param comment The comment text. + * @param comment The comment text. * @throws ElementException Can be thrown when structure is not correct. */ void doComment(String comment) throws ElementException; - + /** * Is called when there is whitespace in xml. - * - * @param space The space. + * @param space The space. * @throws ElementException Can be thrown when structure is not correct. */ - void doIgnorableWhitespace(String space) throws ElementException; - + void doIgnorableWhitespace(String space) throws ElementException; + /** * Sets the ElementClass. - * - * @param elementClass The ElementClass to set. + * @param elementClass The ElementClass to set. */ void setElementClass(ElementClass elementClass); - + /** * Gets the ElementClass. - * - * @return Returns the ElementClass. + * @return Returns the ElementClass. */ ElementClass getElementClass(); - + /** * Sets the xml attributes. - * - * @param name The name to set. - * @param value The value to set. + * @param name The name to set. + * @param value The value to set. */ - void setAttribute(String name, String value); - + void setAttribute(String name,String value); + /** * Gets the xml attributes. - * - * @return Returns the xml attributes. + * @return Returns the xml attributes. */ - Map getAttributes(); - + Map getAttributes(); + /** * Gets the childeren elements. - * - * @return Returns the childeren. + * @return Returns the childeren. */ List getChilderen(); - + /** * Gets the childeren elements including those which are comment and white space. (text) - * - * @return Returns all the childeren. + * @return Returns all the childeren. */ List getAllChilderen(); - + /** * Adds an Elment as child of this element. - * - * @param element The child to add. + * @param element The child to add. */ void addChild(Element element); - + /** * Removes an Elment as child of this element. - * - * @param element The child to remove. + * @param element The child to remove. */ void removeChild(Element element); - + /** * Gets the Element type. - * - * @return Returns the ElementType. + * @return Returns the ElementType. */ ElementType getElementType(); - + /** - * Returns if this elements transforms the tree. if true the the doElementRun is runned in the transform phase insteat of the run phase. + * Returns if this elements transforms the tree. + * if true the the doElementRun is runned in the transform phase insteat of the run phase. * * You need to add those new or modified Elements to the DirtyElement for reparsering. * diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementAttributeValueParser.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementAttributeValueParser.java index f15b04f..ef9090a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementAttributeValueParser.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementAttributeValueParser.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import org.x4o.xml.conv.ObjectConverterException; @@ -31,49 +31,46 @@ import org.x4o.xml.conv.ObjectConverterException; * @version 1.0 Aug 20, 2005 */ public interface ElementAttributeValueParser { - + /** * Checks if the value is an EL parameter. - * - * @param name The name of the attribute. - * @param value The value of the attribute. - * @param element The element of the attribute. - * @return Returns true if value is EL parameter. + * @param name The name of the attribute. + * @param value The value of the attribute. + * @param element The element of the attribute. + * @return Returns true if value is EL parameter. */ - boolean isELParameter(String name, String value, Element element); - + boolean isELParameter(String name,String value,Element element); + /** * Returns the object which is stored in the ELContext - * - * @param value The attribute value. - * @param element The element of the attribute. - * @return Returns the resolved el parameter value. + * @param value The attribute value. + * @param element The element of the attribute. + * @return Returns the resolved el parameter value. * @throws ElementAttributeValueParserException * @throws ObjectConverterException */ - Object getELParameterValue(String value, Element element) throws ElementAttributeValueParserException, ObjectConverterException; - + Object getELParameterValue(String value,Element element) throws ElementAttributeValueParserException,ObjectConverterException; + /** * Convert the value into a new value genereted by parameterConverters. - * - * @param name The name of the attribute. - * @param value The value of the attribute. - * @param element The element of the attribute. - * @return Returns the converted attribute value. + * @param name The name of the attribute. + * @param value The value of the attribute. + * @param element The element of the attribute. + * @return Returns the converted attribute value. * @throws ElementAttributeValueParserException * @throws ObjectConverterException */ - Object getConvertedParameterValue(String name, Object value, Element element) throws ElementAttributeValueParserException, ObjectConverterException; - + Object getConvertedParameterValue(String name,Object value,Element element) throws ElementAttributeValueParserException,ObjectConverterException; + /** - * Does is all, Checks if value is EL parameter and lookups the object. and converts to new object via parameter converter and return value. - * - * @param name The name of the attribute. - * @param value The value of the attribute. - * @param element The element of the attribute. - * @return Returns the attribute value. + * Does is all, Checks if value is EL parameter and lookups the object. + * and converts to new object via parameter converter and return value. + * @param name The name of the attribute. + * @param value The value of the attribute. + * @param element The element of the attribute. + * @return Returns the attribute value. * @throws ElementAttributeValueParserException * @throws ObjectConverterException */ - Object getParameterValue(String name, String value, Element element) throws ElementAttributeValueParserException, ObjectConverterException; + Object getParameterValue(String name,String value,Element element) throws ElementAttributeValueParserException,ObjectConverterException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementAttributeValueParserException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementAttributeValueParserException.java index f3014b9..7926c9c 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementAttributeValueParserException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementAttributeValueParserException.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * ElementAttributeValueParserException.
@@ -32,10 +33,14 @@ package org.x4o.xml.element; */ @SuppressWarnings("serial") public class ElementAttributeValueParserException extends ElementException { - + /* - * public ElementAttributeValueParserException(ElementAttributeConverter converter,String message) { super(message); } - * - * public ElementAttributeValueParserException(ElementAttributeConverter converter,String message,Exception exception) { super(message,exception); } - */ + public ElementAttributeValueParserException(ElementAttributeConverter converter,String message) { + super(message); + } + + public ElementAttributeValueParserException(ElementAttributeConverter converter,String message,Exception exception) { + super(message,exception); + } + */ } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementBindingHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementBindingHandler.java index 81cde2c..337dd9a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementBindingHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementBindingHandler.java @@ -20,42 +20,42 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * Bind ElementObjects together. * - * This interface is used to bind a parent and child ElementObject together. For example; when both objects are an JComponent then we can add the child to the - * parent with the method: ((JComponent)parent).add((JComponent)child); + * This interface is used to bind a parent and child ElementObject together. + * For example; when both objects are an JComponent then we can add the child to the parent + * with the method: ((JComponent)parent).add((JComponent)child); * * * @author Willem Cazander * @version 1.0 Aug 17, 2005 */ public interface ElementBindingHandler extends ElementMetaBase { - + /** - * @return Returns the parent classes which this binding handler can do. + * @return Returns the parent classes which this binding handler can do. */ Class getBindParentClass(); - + /** - * @return Returns array of child classes which this binding handler can do. + * @return Returns array of child classes which this binding handler can do. */ Class[] getBindChildClasses(); - + /** * Do the binding of this child to the parent object. - * - * @param childElement The child element to bind to the parent.' + * @param childElement The child element to bind to the parent.' * @throws ElementBindingHandlerException When binding could not happen. */ void bindChild(Element childElement) throws ElementBindingHandlerException; - + /** * Creates the childeren of the parent object. - * - * @param parentElement The parent element to create the childeren from.' + * @param parentElement The parent element to create the childeren from.' * @throws ElementBindingHandlerException When binding could not happen. */ void createChilderen(Element parentElement) throws ElementBindingHandlerException; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementBindingHandlerException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementBindingHandlerException.java index d6373ef..90d4640 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementBindingHandlerException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementBindingHandlerException.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * ElementBindingException.
@@ -32,23 +33,21 @@ package org.x4o.xml.element; */ @SuppressWarnings("serial") public class ElementBindingHandlerException extends ElementException { - + /** * Creates binding exception. - * - * @param message The error message. + * @param message The error message. */ public ElementBindingHandlerException(String message) { super(message); } - + /** * Creates binding exception. - * - * @param message The error message. - * @param exception The error exception. + * @param message The error message. + * @param exception The error exception. */ - public ElementBindingHandlerException(String message, Exception exception) { - super(message, exception); + public ElementBindingHandlerException(String message,Exception exception) { + super(message,exception); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClass.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClass.java index d198f98..1e9d83c 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClass.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClass.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.List; @@ -32,17 +32,15 @@ import java.util.List; * @version 1.0 Aug 11, 2005 */ public interface ElementClass extends ElementClassBase { - + /** * Gets the ElementClass. - * * @return the elementClass */ Class getElementClass(); /** * Sets the ElementClass. - * * @param elementClass the elementClass to set. */ void setElementClass(Class elementClass); @@ -56,7 +54,7 @@ public interface ElementClass extends ElementClassBase { * @param objectClass the objectClass to set. */ void setObjectClass(Class objectClass); - + /** * @return the autoAttributes. */ @@ -66,7 +64,7 @@ public interface ElementClass extends ElementClassBase { * @param autoAttributes the autoAttributes to set. */ void setAutoAttributes(Boolean autoAttributes); - + /** * @return the schemaContentBase */ @@ -76,7 +74,7 @@ public interface ElementClass extends ElementClassBase { * @param schemaContentBase the schemaContentBase to set */ void setSchemaContentBase(String schemaContentBase); - + /** * @return the schemaContentComplex */ @@ -96,25 +94,22 @@ public interface ElementClass extends ElementClassBase { * @param schemaContentMixed the schemaContentMixed to set */ void setSchemaContentMixed(Boolean schemaContentMixed); - + /** * Add an skip phase for this element. - * - * @param phase The phase name. + * @param phase The phase name. */ void addSkipPhase(String phase); - + /** * Removes an skip phase for this element. - * - * @param phase The phase name. + * @param phase The phase name. */ void removeSkipPhase(String phase); - + /** * Get all the skip phases for this element. - * - * @return The defined phases. + * @return The defined phases. */ List getSkipPhases(); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClassAttribute.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClassAttribute.java index fed427c..f92fbab 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClassAttribute.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClassAttribute.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.List; @@ -34,70 +34,61 @@ import org.x4o.xml.conv.ObjectConverter; * @version 1.0 Aug 11, 2005 */ public interface ElementClassAttribute extends ElementMetaBase { - + /** * Gets the ObjectConverter. - * * @return The ObjectConverter. */ ObjectConverter getObjectConverter(); - + /** * Add the ObjectConverter whichs converts. - * - * @param objectConverter The objectConverter to set for this attribute. + * @param objectConverter The objectConverter to set for this attribute. */ void setObjectConverter(ObjectConverter objectConverter); - + /** * Sets the defaultValue of this attribute. - * - * @param defaultValue The defaultValue to set. + * @param defaultValue The defaultValue to set. */ void setDefaultValue(Object defaultValue); - + /** * Gets the default value. - * - * @return Returns the default value if any. + * @return Returns the default value if any. */ Object getDefaultValue(); - + /** * Add an attribute alias for this attribute. - * - * @param alias The alias. + * @param alias The alias. */ void addAttributeAlias(String alias); - + /** * Removes an attribute alias. - * - * @param alias The alias. + * @param alias The alias. */ void removeAttributeAlias(String alias); - + /** * Get all the aliases for this attribute. - * - * @return The defined aliases. + * @return The defined aliases. */ List getAttributeAliases(); - + /** * Gets the required state of this attribute. - * * @return If true then attribute is required. */ Boolean getRequired(); /** * Sets the required state of this attribute. - * * @param required the required to set. */ void setRequired(Boolean required); - + /** * @return the runResolveEL. */ @@ -127,7 +118,7 @@ public interface ElementClassAttribute extends ElementMetaBase { * @param runBeanValue the runBeanValue to set. */ void setRunBeanValue(Boolean runBeanValue); - + /** * @return the writeOrder */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClassBase.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClassBase.java index c1866eb..ebdf490 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClassBase.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementClassBase.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.Collection; import java.util.List; @@ -33,38 +33,35 @@ import java.util.List; * @version 1.0 Jan 19, 2012 */ public interface ElementClassBase extends ElementMetaBase { - + List getElementConfigurators(); - void addElementConfigurators(ElementConfigurator elementConfigurator); - + Collection getElementClassAttributes(); - ElementClassAttribute getElementClassAttributeByName(String attributeName); - void addElementClassAttribute(ElementClassAttribute elementClassAttribute); - + /** - * Add an parent element tag. Used: for xsd/doc only. - * + * Add an parent element tag. + * Used: for xsd/doc only. * @param namespaceUri The namespace uri of this tag relation. - * @param tag The parent element tag. + * @param tag The parent element tag. */ - void addElementParent(String namespaceUri, String tag); - + void addElementParent(String namespaceUri,String tag); + /** - * Remove and parent element Used: for xsd/doc only. - * + * Remove and parent element + * Used: for xsd/doc only. * @param namespaceUri The namespace uri of this tag relation. - * @param tag The parent element tag. + * @param tag The parent element tag. */ - void removeElementParent(String namespaceUri, String tag); - + void removeElementParent(String namespaceUri,String tag); + /** - * Returns list of parent element tags. Used: for xsd/doc only. - * + * Returns list of parent element tags. + * Used: for xsd/doc only. * @param namespaceUri The namespace uri of this tag relation. - * @return The list of tags. + * @return The list of tags. */ List getElementParents(String namespaceUri); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfigurator.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfigurator.java index 76b353b..575b0e4 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfigurator.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfigurator.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * Provides an Interface to configure Element(Object). @@ -30,20 +31,19 @@ package org.x4o.xml.element; * @version 1.0 Jan 18, 2007 */ public interface ElementConfigurator extends ElementMetaBase { - + /** * Gets called for configuring the given Element. - * - * @param element The element to config. - * @throws ElementConfiguratorException Is thrown which error is done. + * @param element The element to config. + * @throws ElementConfiguratorException Is thrown which error is done. */ void doConfigElement(Element element) throws ElementConfiguratorException; - + /** - * Return if this ElementConfigurator is an Action. which means is is executed in the runPhase in the end. So all magic is done, and we can access the fully - * finnisched object and toss it around. - * - * @return Returns true if need to run in config phase. + * Return if this ElementConfigurator is an Action. + * which means is is executed in the runPhase in the end. + * So all magic is done, and we can access the fully finnisched object and toss it around. + * @return Returns true if need to run in config phase. */ boolean isConfigAction(); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfiguratorException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfiguratorException.java index 37880a0..b2a1517 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfiguratorException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfiguratorException.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * ElementConfiguratorException.
@@ -30,48 +31,44 @@ package org.x4o.xml.element; */ @SuppressWarnings("serial") public class ElementConfiguratorException extends ElementException { - + private ElementConfigurator elementConfigurator = null; - + /** * Creates an configurator exception. - * - * @param config The ElementConfigurator. - * @param message The error message. + * @param config The ElementConfigurator. + * @param message The error message. */ - public ElementConfiguratorException(ElementConfigurator config, String message) { + public ElementConfiguratorException(ElementConfigurator config,String message) { super(message); - this.elementConfigurator = config; + this.elementConfigurator=config; } - + /** * Creates an configurator exception. - * - * @param config The ElementConfigurator. - * @param message The error message. - * @param exception The error exception. + * @param config The ElementConfigurator. + * @param message The error message. + * @param exception The error exception. */ - public ElementConfiguratorException(ElementConfigurator config, String message, Exception exception) { - super(message, exception); - this.elementConfigurator = config; + public ElementConfiguratorException(ElementConfigurator config,String message,Exception exception) { + super(message,exception); + this.elementConfigurator=config; } - + /** * Creates an configurator exception. - * - * @param config The ElementConfigurator. - * @param message The error message. - * @param exception The wrapped element error exception. + * @param config The ElementConfigurator. + * @param message The error message. + * @param exception The wrapped element error exception. */ - public ElementConfiguratorException(ElementConfigurator config, String message, ElementException exception) { - super(message, exception); - this.elementConfigurator = config; + public ElementConfiguratorException(ElementConfigurator config,String message,ElementException exception) { + super(message,exception); + this.elementConfigurator=config; } - + /** * Gets the ElementConfigurator which has thrown this exception. - * - * @return The ElementConfigurator. + * @return The ElementConfigurator. */ public ElementConfigurator getElementConfigurator() { return elementConfigurator; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfiguratorGlobal.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfiguratorGlobal.java index 1b773a6..e1f58fc 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfiguratorGlobal.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementConfiguratorGlobal.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * Provides an Interface to configure Element(Object) global. @@ -29,5 +30,5 @@ package org.x4o.xml.element; * @version 1.0 Nov 18, 2012 */ public interface ElementConfiguratorGlobal extends ElementConfigurator { - + } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementException.java index fc4409a..f0dd529 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementException.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; /** * Is throw when there is en Exception within an Element. @@ -29,7 +29,7 @@ package org.x4o.xml.element; * @version 1.0 Aug 8, 2005 */ public class ElementException extends Exception { - + /** The serial version uid */ static final long serialVersionUID = 10L; @@ -42,29 +42,26 @@ public class ElementException extends Exception { /** * Constructs an ElementException with a detail message. - * - * @param message The message of this Exception + * @param message The message of this Exception */ public ElementException(String message) { super(message); } - + /** * Creates an ElementException from a parent exception. - * - * @param e The error exception. + * @param e The error exception. */ public ElementException(Exception e) { super(e); } - + /** * Constructs an ElementException with a detail message. - * - * @param message The message of this Exception - * @param e The error exception. + * @param message The message of this Exception + * @param e The error exception. */ - public ElementException(String message, Exception e) { - super(message, e); + public ElementException(String message,Exception e) { + super(message,e); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementInterface.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementInterface.java index 34a6a0b..7f0c1a4 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementInterface.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementInterface.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; /** * Defines an ElementInterface. @@ -29,17 +29,15 @@ package org.x4o.xml.element; * @version 1.0 Apr 15, 2008 */ public interface ElementInterface extends ElementClassBase { - + /** * Gets this class of the interface to match this converters/etc/ to. - * * @return the tag. */ Class getInterfaceClass(); - + /** * Sets the interface class. - * * @param interfaceClass the interfaceClass to set. */ void setInterfaceClass(Class interfaceClass); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementMetaBase.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementMetaBase.java index 2cd5202..b98e986 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementMetaBase.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementMetaBase.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * ElementMetaBase provides a base interface describe meta information. @@ -30,32 +31,28 @@ package org.x4o.xml.element; * @version 1.0 Jan 13, 2009 */ public interface ElementMetaBase { - + /** * Sets the id of the ElementMetaBase. - * - * @param id The id to set. + * @param id The id to set. */ void setId(String id); - + /** * Returns the id of the ElementMetaBase. - * - * @return Returns the id. + * @return Returns the id. */ String getId(); - + /** * Sets the description of the ElementMetaBase. - * - * @param description The description to set. + * @param description The description to set. */ void setDescription(String description); - + /** * Returns the description of the ElementMetaBase. - * - * @return Returns the description. + * @return Returns the description. */ String getDescription(); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespace.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespace.java index 945bbfe..a590f31 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespace.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespace.java @@ -31,57 +31,50 @@ import java.util.List; * @version 1.0 Oct 28, 2009 */ public interface ElementNamespace extends ElementMetaBase { - + /** * Sets the prefix mapping. - * - * @param prefixMapping The prefix mapping to set. + * @param prefixMapping The prefix mapping to set. */ void setPrefixMapping(String prefixMapping); - + /** * Gets the set prefix mapping of this namespace. - * * @return Returns the prefix mapping. */ String getPrefixMapping(); - + /** * Sets the elememen instance provider which creates the elements objects. - * - * @param elementNamespaceInstanceProvider The ElementNamespaceInstanceProvider to set. + * @param elementNamespaceInstanceProvider The ElementNamespaceInstanceProvider to set. */ void setElementNamespaceInstanceProvider(ElementNamespaceInstanceProvider elementNamespaceInstanceProvider); - + /** * Returns the ElementProvider. - * - * @return Returns the ElementNamespaceInstanceProvider for this namespace. + * @return Returns the ElementNamespaceInstanceProvider for this namespace. */ ElementNamespaceInstanceProvider getElementNamespaceInstanceProvider(); - + /** * Adds an ElementClass. - * - * @param elementClass The elementClass to add to this context. + * @param elementClass The elementClass to add to this context. */ void addElementClass(ElementClass elementClass); - + /** * Gets the ElementClass for an namespace and tag. - * - * @param tag The tag to get the ElementClass for. - * @return Returns the ElementClass for a tag in an namespace. + * @param tag The tag to get the ElementClass for. + * @return Returns the ElementClass for a tag in an namespace. */ ElementClass getElementClass(String tag); - + /** * Returns the loaded ElementClass'es in an namespace in this context. - * - * @return Returns all ElementClasses handled by this namespace. + * @return Returns all ElementClasses handled by this namespace. */ List getElementClasses(); - + /** * @return the uri of this namespace. */ @@ -121,7 +114,7 @@ public interface ElementNamespace extends ElementMetaBase { * @param schemaResource the schemaResource to set. */ void setSchemaResource(String schemaResource); - + /** * @return the description. */ @@ -131,7 +124,7 @@ public interface ElementNamespace extends ElementMetaBase { * @param description the description to set. */ void setDescription(String description); - + /** * @return the languageRoot */ @@ -141,7 +134,7 @@ public interface ElementNamespace extends ElementMetaBase { * @param languageRoot the languageRoot to set */ void setLanguageRoot(Boolean languageRoot); - + /** * @return the schemaPrefix */ @@ -151,17 +144,15 @@ public interface ElementNamespace extends ElementMetaBase { * @param schemaPrefix the schemaPrefix to set */ void setSchemaPrefix(String schemaPrefix); - + /** * Adds an ElementNamespaceAttribute. - * - * @param elementNamespaceAttribute Adds an ElementNamespaceAttribute. + * @param elementNamespaceAttribute Adds an ElementNamespaceAttribute. */ void addElementNamespaceAttribute(ElementNamespaceAttribute elementNamespaceAttribute); /** * Geta All ElementNamespaceAttributes. - * * @return Returns an List of ElementNamespaceAttributes. */ List getElementNamespaceAttributes(); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceAttribute.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceAttribute.java index 0923976..6945ac6 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceAttribute.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceAttribute.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.List; @@ -31,39 +31,35 @@ import java.util.List; * @version 1.0 Aug 20, 2005 */ public interface ElementNamespaceAttribute extends ElementConfigurator { - + /** * Gets the attribute name this attribute handler handles. - * - * @return Returns the attributes name of this attribute handler. + * @return Returns the attributes name of this attribute handler. */ String getAttributeName(); - + /** * Sets the attribute name this attribute handler handles. - * - * @param attributeName The attribute to handle. + * @param attributeName The attribute to handle. */ void setAttributeName(String attributeName); - + /** - * Adds an NextAttribute. There next attributes will defines the order in which the ElementNamespaceAttribute are executed. - * - * @param attribute Add attribute which be will processed after this one. + * Adds an NextAttribute. + * There next attributes will defines the order in which the ElementNamespaceAttribute are executed. + * @param attribute Add attribute which be will processed after this one. */ void addNextAttribute(String attribute); /** * Removes an next attribute. - * - * @param attribute Removes this next attribute. + * @param attribute Removes this next attribute. */ - void removeNextAttribute(String attribute); - + void removeNextAttribute(String attribute); + /** * Get all next attributes. - * - * @return Returns the list of all next attributes. + * @return Returns the list of all next attributes. */ List getNextAttributes(); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceInstanceProvider.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceInstanceProvider.java index c628547..c86cfcc 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceInstanceProvider.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceInstanceProvider.java @@ -32,23 +32,21 @@ import org.x4o.xml.lang.X4OLanguage; * @version 1.0 Jul 8, 2006 */ public interface ElementNamespaceInstanceProvider { - + /** * Starts the ElementProvider. - * - * @param language The X4OLanguage to start in. + * @param language The X4OLanguage to start in. * @param elementNamespace The elementNamespace to start for. - * @throws ElementNamespaceInstanceProviderException Thrown when error happened in language. + * @throws ElementNamespaceInstanceProviderException Thrown when error happened in language. */ - void start(X4OLanguage language, ElementNamespace elementNamespace) throws ElementNamespaceInstanceProviderException; - + void start(X4OLanguage language,ElementNamespace elementNamespace) throws ElementNamespaceInstanceProviderException; + /** * Provide an Element for an xml tag. - * * @param languageSession The languageSession to create element for. - * @param tag The xml tag to create instance for. + * @param tag The xml tag to create instance for. * @return An new Element instance. - * @throws ElementNamespaceInstanceProviderException Thrown when error happened in language. + * @throws ElementNamespaceInstanceProviderException Thrown when error happened in language. */ - Element createElementInstance(X4OLanguageSession languageSession, String tag) throws ElementNamespaceInstanceProviderException; + Element createElementInstance(X4OLanguageSession languageSession,String tag) throws ElementNamespaceInstanceProviderException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceInstanceProviderException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceInstanceProviderException.java index 0c2c46c..2d8f8a8 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceInstanceProviderException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceInstanceProviderException.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * ElementNamespaceInstanceProviderException holds the ElementNamespaceInstanceProvider which created this Exception.
@@ -30,36 +31,33 @@ package org.x4o.xml.element; */ @SuppressWarnings("serial") public class ElementNamespaceInstanceProviderException extends ElementException { - + private ElementNamespaceInstanceProvider elementNamespaceInstanceProvider = null; - + /** - * Creates provider instance exception. - * - * @param elementNamespaceInstanceProvider The provider which creates this exception. - * @param message The message of this exception. + * Creates provider instance exception. + * @param elementNamespaceInstanceProvider The provider which creates this exception. + * @param message The message of this exception. */ - public ElementNamespaceInstanceProviderException(ElementNamespaceInstanceProvider elementNamespaceInstanceProvider, String message) { + public ElementNamespaceInstanceProviderException(ElementNamespaceInstanceProvider elementNamespaceInstanceProvider,String message) { super(message); - this.elementNamespaceInstanceProvider = elementNamespaceInstanceProvider; + this.elementNamespaceInstanceProvider=elementNamespaceInstanceProvider; } - + /** - * Creates provider instance exception. - * - * @param elementNamespaceInstanceProvider The provider which creates this exception. - * @param message The message of this exception. - * @param exception The root cause of this exception. + * Creates provider instance exception. + * @param elementNamespaceInstanceProvider The provider which creates this exception. + * @param message The message of this exception. + * @param exception The root cause of this exception. */ - public ElementNamespaceInstanceProviderException(ElementNamespaceInstanceProvider elementNamespaceInstanceProvider, String message, Exception exception) { - super(message, exception); - this.elementNamespaceInstanceProvider = elementNamespaceInstanceProvider; + public ElementNamespaceInstanceProviderException(ElementNamespaceInstanceProvider elementNamespaceInstanceProvider,String message,Exception exception) { + super(message,exception); + this.elementNamespaceInstanceProvider=elementNamespaceInstanceProvider; } - + /** * Gets the ElementNamespaceInstanceProvider which created this exception. - * - * @return The provider which created the exception. + * @return The provider which created the exception. */ public ElementNamespaceInstanceProvider getElementNamespaceInstanceProvider() { return elementNamespaceInstanceProvider; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementObjectPropertyValue.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementObjectPropertyValue.java index 3e4790e..dd2b00a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementObjectPropertyValue.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementObjectPropertyValue.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; import java.util.Map; @@ -34,30 +34,27 @@ public interface ElementObjectPropertyValue { /** * Sets an bean property of the object. - * * @param object * @param propertyName * @param value * @throws ElementObjectPropertyValueException */ - void setProperty(Object object, String propertyName, Object value) throws ElementObjectPropertyValueException; - + void setProperty(Object object,String propertyName,Object value) throws ElementObjectPropertyValueException; + /** * Get the value of a properterie of a bean, - * - * @param object The object to get the properties from - * @param propertyName The name of the property to get. - * @return Returns the value of the property. + * @param object The object to get the properties from + * @param propertyName The name of the property to get. + * @return Returns the value of the property. * @throws ElementObjectPropertyValueException */ - Object getProperty(Object object, String propertyName) throws ElementObjectPropertyValueException; - + Object getProperty(Object object,String propertyName) throws ElementObjectPropertyValueException; + /** * Sets all bean properties. - * - * @param object To object to set all the properties to. - * @param propertyMap A Map with the keys as properties names and the valua as value to set. + * @param object To object to set all the properties to. + * @param propertyMap A Map with the keys as properties names and the valua as value to set. * @throws ElementObjectPropertyValueException */ - void setPropertyMap(Object object, Map propertyMap) throws ElementObjectPropertyValueException; + void setPropertyMap(Object object,Map propertyMap) throws ElementObjectPropertyValueException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementObjectPropertyValueException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementObjectPropertyValueException.java index 5ca2db7..3609592 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementObjectPropertyValueException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/element/ElementObjectPropertyValueException.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.element; +package org.x4o.xml.element; + /** * ElementObjectPropertyValueException.
@@ -35,20 +36,18 @@ public class ElementObjectPropertyValueException extends ElementException { /** * Creates ElementObjectPropertyValueException with message. - * - * @param message The error message. + * @param message The error message. */ public ElementObjectPropertyValueException(String message) { super(message); } - + /** * Creates ElementObjectPropertyValueException with message and exception. - * - * @param message The error message. - * @param exception The error exception. + * @param message The error message. + * @param exception The error exception. */ - public ElementObjectPropertyValueException(String message, Exception exception) { - super(message, exception); + public ElementObjectPropertyValueException(String message,Exception exception) { + super(message,exception); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java index d37e2b6..e531d46 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java @@ -37,11 +37,11 @@ import org.x4o.xml.lang.X4OLanguageSession; * @version 1.0 Apr 6, 2013 */ public abstract class AbstractX4OConnection extends AbstractX4OConnectionDebug { - + private final X4OLanguage language; protected String phaseStop = null; protected List phaseSkip = null; - + public AbstractX4OConnection(X4OLanguage language) { if (language == null) { throw new NullPointerException("Can't create X4O connection for null language."); @@ -49,45 +49,44 @@ public abstract class AbstractX4OConnection extends AbstractX4OConnectionDebug { this.language = language; this.phaseSkip = new ArrayList(2); } - + @Override public final X4OLanguage getLanguage() { return language; } - + @Override public final X4OLanguageSession createLanguageSession() { return language.createLanguageSession(); } - + abstract SAX3PropertyConfig getPropertyConfig(); - + /** * Sets an X4O Language property. - * - * @param key The key of the property to set. - * @param value The vlue of the property to set. + * @param key The key of the property to set. + * @param value The vlue of the property to set. */ @Override - public final void setProperty(String key, Object value) { + public final void setProperty(String key,Object value) { getPropertyConfig().setProperty(key, value); } - + @Override public final Object getProperty(String key) { return getPropertyConfig().getProperty(key); } - + @Override public final Collection getPropertyKeys() { return getPropertyConfig().getPropertyKeys(); } - + @Override public final void setPhaseStop(String phaseId) { phaseStop = phaseId; } - + @Override public final void addPhaseSkip(String phaseId) { phaseSkip.add(phaseId); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java index 3abb3ed..9089315 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java @@ -53,8 +53,7 @@ public abstract class AbstractX4OConnectionDebug implements X4OConnection { protected final static String ABSTRACT_DEBUG_OUTPUT_HANDLER = "debug/output-handler"; protected final static String ABSTRACT_DEBUG_OUTPUT_STREAM = "debug/output-stream"; - protected void debugStart(X4OLanguageSession languageSession, String debugHandlerKey, String debugStreamKey) - throws UnsupportedEncodingException, SAXException { + protected void debugStart(X4OLanguageSession languageSession, String debugHandlerKey, String debugStreamKey) throws UnsupportedEncodingException, SAXException { Object debugOutputHandler = getProperty(debugHandlerKey); Object debugOutputStream = getProperty(debugStreamKey); // init debug infra diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OReader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OReader.java index 0b593cf..d9b8345 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OReader.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OReader.java @@ -120,7 +120,8 @@ abstract public class AbstractX4OReader extends AbstractX4OReaderSession i } /** - * Fetched the data direct from remote url to a InputStream to is can me readd by SAX. + * Fetched the data direct from remote url to a InputStream to is can me readd + * by SAX. * * @param url The url to read. * @throws X4OConnectionException Is thrown after x4o exception. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4ODriver.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4ODriver.java index df94997..1a96685 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4ODriver.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4ODriver.java @@ -34,16 +34,16 @@ public class DefaultX4ODriver extends X4ODriver { private final String languageName; private final String languageVersion; - + public DefaultX4ODriver(String languageName) { - this(languageName, X4ODriver.DEFAULT_LANGUAGE_VERSION); + this(languageName,X4ODriver.DEFAULT_LANGUAGE_VERSION); } - - public DefaultX4ODriver(String languageName, String languageVersion) { - this.languageName = languageName; - this.languageVersion = languageVersion; + + public DefaultX4ODriver(String languageName,String languageVersion) { + this.languageName=languageName; + this.languageVersion=languageVersion; } - + @Override public String getLanguageName() { return languageName; @@ -51,6 +51,6 @@ public class DefaultX4ODriver extends X4ODriver { @Override public String[] getLanguageVersions() { - return new String[] { languageVersion }; + return new String[]{languageVersion}; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java index 9604d0e..9bcf4d6 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java @@ -55,11 +55,10 @@ import org.xml.sax.SAXException; * @param The root element object type. */ public class DefaultX4OReader extends AbstractX4OReader { - + private final SAX3PropertyConfig propertyConfig; private final Map elBeans = new HashMap<>(); - - //@formatter:off + private final static String PROPERTY_CONTEXT_PREFIX = SAX3PropertyConfig.X4O_PROPERTIES_PREFIX+"reader/x4o/"; public final static SAX3PropertyConfig DEFAULT_PROPERTY_CONFIG; public final static String SAX_ERROR_HANDLER = PROPERTY_CONTEXT_PREFIX + "sax/error-handler"; @@ -97,13 +96,12 @@ public class DefaultX4OReader extends AbstractX4OReader { new PropertyConfigItem(DEBUG_OUTPUT_STREAM,OutputStream.class) ); } - //@formatter:on - + public DefaultX4OReader(X4OLanguage language) { super(language); propertyConfig = new SAX3PropertyConfig(DEFAULT_PROPERTY_CONFIG, PROPERTY_CONTEXT_PREFIX); } - + /** * @see org.x4o.xml.io.AbstractX4OConnection#getPropertyConfig() */ @@ -111,22 +109,20 @@ public class DefaultX4OReader extends AbstractX4OReader { public SAX3PropertyConfig getPropertyConfig() { return propertyConfig; } - + @Override - public void readSession(X4OLanguageSession languageSession, InputStream input, String systemId, URL basePath) - throws X4OConnectionException, SAXException, IOException { + public void readSession(X4OLanguageSession languageSession, InputStream input, String systemId, URL basePath) throws X4OConnectionException, SAXException, IOException { setProperty(INPUT_STREAM, input); setProperty(INPUT_SYSTEM_ID, systemId); setProperty(INPUT_BASE_PATH, basePath); for (String name : elBeans.keySet()) { Object bean = elBeans.get(name); - ValueExpression ve = languageSession.getExpressionLanguageFactory().createValueExpression(languageSession.getExpressionLanguageContext(), - "${" + name + "}", bean.getClass()); + ValueExpression ve = languageSession.getExpressionLanguageFactory().createValueExpression(languageSession.getExpressionLanguageContext(),"${"+name+"}", bean.getClass()); ve.setValue(languageSession.getExpressionLanguageContext(), bean); } readSession(languageSession); } - + public void addELBeanInstance(String name, Object bean) { if (name == null) { throw new NullPointerException("Can't add null name."); @@ -139,19 +135,19 @@ public class DefaultX4OReader extends AbstractX4OReader { } elBeans.put(name, bean); } - + /** * Parses the input stream as a X4O document. */ protected void readSession(X4OLanguageSession languageSession) throws X4OConnectionException, SAXException, IOException { // Extra check if we have a language if (languageSession.getLanguage() == null) { - throw new X4OConnectionException("languageSession is broken getLanguage() returns null."); + throw new X4OConnectionException("languageSession is broken getLanguage() returns null."); } - + // Insert stop/skip phase if we allowed to. TODO: move layer ? if (languageSession instanceof X4OLanguageSessionLocal) { - X4OLanguageSessionLocal ll = (X4OLanguageSessionLocal) languageSession; + X4OLanguageSessionLocal ll = (X4OLanguageSessionLocal)languageSession; if (phaseStop != null) { ll.setPhaseStop(phaseStop); } @@ -159,39 +155,39 @@ public class DefaultX4OReader extends AbstractX4OReader { ll.addPhaseSkip(phaseId); } } - + // init debug debugStart(languageSession, DEBUG_OUTPUT_HANDLER, DEBUG_OUTPUT_STREAM); - + try { // Run init (auto once) X4OLanguageLocal.class.cast(languageSession.getLanguage()).init(languageSession); - + // Run document parsing X4OContentParser parser = new X4OContentParser(propertyConfig); parser.parse(languageSession); - + // Run phases to build object tree getLanguage().getPhaseManager().runPhases(languageSession, X4OPhaseType.XML_READ); } catch (Exception e) { // also debug exceptions debugException(languageSession, e); - - // unwrap exception + + // unwrap exception // TODO: cleanup exceptions a bit more see X4OConnectionException if (e.getCause() instanceof ParserConfigurationException) { - throw new X4OConnectionException((ParserConfigurationException) e.getCause()); + throw new X4OConnectionException((ParserConfigurationException)e.getCause()); } if (e.getCause() instanceof SAXException) { - throw (SAXException) e.getCause(); + throw (SAXException)e.getCause(); } if (e.getCause() instanceof IOException) { - throw (IOException) e.getCause(); + throw (IOException)e.getCause(); } - if (e.getCause() == null) { + if (e.getCause()==null) { throw new SAXException(e); } else { - throw new SAXException((Exception) e.getCause()); + throw new SAXException((Exception)e.getCause()); } } finally { debugStop(languageSession); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java index bd93922..e2d4da5 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java @@ -68,7 +68,6 @@ public class DefaultX4OWriter extends AbstractX4OWriter { private boolean schemaUriPrint; private String schemaUriRoot; - //@formatter:off private final static AttributeEntryComparator ATTR_ENTRY_COMPARATOR = new AttributeEntryComparator(); private final static String PROPERTY_CONTEXT_PREFIX = SAX3PropertyConfig.X4O_PROPERTIES_PREFIX+"writer/x4o/"; public final static SAX3PropertyConfig DEFAULT_PROPERTY_CONFIG; @@ -89,7 +88,6 @@ public class DefaultX4OWriter extends AbstractX4OWriter { new PropertyConfigItem(DEBUG_OUTPUT_STREAM,OutputStream.class) ); } - //@formatter:on /** * Default constructor. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OConnection.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OConnection.java index fd2e6db..7aa1848 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OConnection.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OConnection.java @@ -34,24 +34,23 @@ import org.x4o.xml.lang.X4OLanguageSession; * @version 1.0 Apr 6, 2013 */ public interface X4OConnection { - + X4OLanguage getLanguage(); - + X4OLanguageSession createLanguageSession(); - + /** * Sets an X4O Language property. - * - * @param key The key of the property to set. - * @param value The value of the property to set. + * @param key The key of the property to set. + * @param value The value of the property to set. */ void setProperty(String key, Object value); - + Object getProperty(String key); - + Collection getPropertyKeys(); - + void setPhaseStop(String phaseId); - + void addPhaseSkip(String phaseId); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OConnectionException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OConnectionException.java index 49304c0..23d86e6 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OConnectionException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OConnectionException.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.io; +package org.x4o.xml.io; /** * X4OConnectionException is top level exception for io connections. @@ -29,7 +29,7 @@ package org.x4o.xml.io; * @version 1.0 28 Apr, 2013 */ public class X4OConnectionException extends Exception { - + /** The serial version uid */ static final long serialVersionUID = 10L; @@ -42,29 +42,26 @@ public class X4OConnectionException extends Exception { /** * Constructs an X4OConnectionException with a detail message. - * - * @param message The message of this Exception + * @param message The message of this Exception */ public X4OConnectionException(String message) { super(message); } - + /** * Creates an X4OConnectionException from a parent exception. - * - * @param e The error exception. + * @param e The error exception. */ public X4OConnectionException(Exception e) { super(e); } - + /** * Constructs an X4OConnectionException with a detail message. - * - * @param message The message of this Exception - * @param e The error exception. + * @param message The message of this Exception + * @param e The error exception. */ - public X4OConnectionException(String message, Exception e) { - super(message, e); + public X4OConnectionException(String message,Exception e) { + super(message,e); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java index 3985b87..330b76e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java @@ -48,32 +48,33 @@ import java.util.logging.Logger; * @version 1.0 Aug 20, 2005 */ public class X4OContentHandler extends DefaultHandler2 { - + /** The logger to log to */ private Logger logger = null; private boolean loggerFinest = false; - + /** The Locator for parse errors */ private Locator locator = null; - + /** The element Stack */ private Stack elementStack = null; - + /** The elememtContext */ private X4OLanguageSession elementLanguage = null; - + /** Store the override element */ private Element overrideSaxElement = null; - + /** Store the override element handler */ private DefaultHandler2 overrideSaxHandler = null; - + private final SAX3PropertyConfig propertyConfig; - + /** - * Creates an X4OTagHandler which can receice sax xml events and converts them into the Element* interfaces events. + * Creates an X4OTagHandler + * which can receice sax xml events and converts them into the Element* interfaces events. */ - public X4OContentHandler(X4OLanguageSession elementLanguage, SAX3PropertyConfig propertyConfig) { + public X4OContentHandler(X4OLanguageSession elementLanguage,SAX3PropertyConfig propertyConfig) { logger = Logger.getLogger(X4OContentHandler.class.getName()); loggerFinest = logger.isLoggable(Level.FINEST); elementStack = new Stack(); @@ -86,15 +87,15 @@ public class X4OContentHandler extends DefaultHandler2 { */ @Override public void setDocumentLocator(Locator locator) { - this.locator = locator; + this.locator=locator; } - + /** * @see org.xml.sax.helpers.DefaultHandler#startPrefixMapping(java.lang.String, java.lang.String) */ @Override public void startPrefixMapping(String prefix, String namespaceUri) throws SAXException { - if (overrideSaxHandler != null) { + if (overrideSaxHandler!=null) { overrideSaxHandler.startPrefixMapping(prefix, namespaceUri); return; } @@ -105,8 +106,8 @@ public class X4OContentHandler extends DefaultHandler2 { return; // skip xinclude ns. } ElementNamespace enc = elementLanguage.getLanguage().findElementNamespace(namespaceUri); - if (enc == null) { - throw new SAXException("Can't find namespace uri: " + namespaceUri + " in language: " + elementLanguage.getLanguage().getLanguageName()); + if (enc==null) { + throw new SAXException("Can't find namespace uri: "+namespaceUri+" in language: "+elementLanguage.getLanguage().getLanguageName()); } enc.setPrefixMapping(prefix); } @@ -115,41 +116,41 @@ public class X4OContentHandler extends DefaultHandler2 { * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) */ @Override - public void startElement(String namespaceUri, String tag, String qName, Attributes attributes) throws SAXException { + public void startElement(String namespaceUri, String tag, String qName,Attributes attributes) throws SAXException { if (loggerFinest) { - logger.finest("XMLTAG-START: " + namespaceUri + ":" + tag); + logger.finest("XMLTAG-START: "+namespaceUri+":"+tag); } - if (overrideSaxHandler != null) { + if (overrideSaxHandler!=null) { overrideSaxHandler.startElement(namespaceUri, tag, qName, attributes); return; } ElementNamespace enc = elementLanguage.getLanguage().findElementNamespace(namespaceUri); - if (enc == null) { + if (enc==null) { if ("".equals(namespaceUri)) { String configEmptryUri = propertyConfig.getPropertyString(DefaultX4OReader.DOC_EMPTY_NAMESPACE_URI); - if (configEmptryUri != null) { + if (configEmptryUri!=null) { namespaceUri = configEmptryUri; enc = elementLanguage.getLanguage().findElementNamespace(namespaceUri); } - if (enc == null) { - throw new SAXParseException("No ElementNamespace found for empty namespace.", locator); + if (enc==null) { + throw new SAXParseException("No ElementNamespace found for empty namespace.",locator); } enc.setPrefixMapping(""); } - if (enc == null) { - throw new SAXParseException("No ElementProvider found for namespace: " + namespaceUri, locator); + if (enc==null) { + throw new SAXParseException("No ElementProvider found for namespace: "+namespaceUri,locator); } } - + ElementNamespaceInstanceProvider eip = enc.getElementNamespaceInstanceProvider(); Element element = null; try { - element = eip.createElementInstance(elementLanguage, tag); + element = eip.createElementInstance(elementLanguage,tag); } catch (Exception e) { - throw new SAXParseException("Error while creating element: " + e.getMessage(), locator, e); + throw new SAXParseException("Error while creating element: "+e.getMessage(),locator,e); } enc.addElementClass(element.getElementClass()); - + // next bind them togeter. if (elementStack.empty()) { elementLanguage.setRootElement(element); // root element !! @@ -158,32 +159,32 @@ public class X4OContentHandler extends DefaultHandler2 { element.setParent(parent); // set parent element parent.addChild(element); } - + // create attribute map - Map map = new AttributeMap(attributes); + Map map = new AttributeMap(attributes); element.getAttributes().putAll(map); - + elementStack.push(element); try { element.doElementStart(); } catch (ElementException ee) { - throw new SAXParseException("Error while configing element: " + ee.getMessage(), locator, ee); + throw new SAXParseException("Error while configing element: "+ee.getMessage(),locator,ee); } if (ElementType.overrideSax.equals(element.getElementType())) { overrideSaxElement = element; - overrideSaxHandler = (DefaultHandler2) element.getElementObject(); + overrideSaxHandler = (DefaultHandler2)element.getElementObject(); } } - + /** * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, java.lang.String) */ @Override - public void endElement(String namespaceUri, String tag, String qName) throws SAXException { + public void endElement(String namespaceUri, String tag,String qName) throws SAXException { if (loggerFinest) { - logger.finest("XMLTAG-END: " + namespaceUri + ":" + tag); + logger.finest("XMLTAG-END: "+namespaceUri+":"+tag); } - if (overrideSaxHandler != null) { + if (overrideSaxHandler!=null) { if (overrideSaxElement.getElementClass().getId().equals(tag)) { overrideSaxHandler.endDocument(); overrideSaxHandler = null; @@ -200,37 +201,38 @@ public class X4OContentHandler extends DefaultHandler2 { try { element.doElementEnd(); } catch (ElementException ee) { - throw new SAXParseException("Error while configing element: '" + tag + "' " + ee.getMessage(), locator, ee); + throw new SAXParseException("Error while configing element: '"+tag+"' "+ee.getMessage(),locator,ee); } } - + /** - * Gets called to pass the text between XML-tags and converts it to a String. When this string is 0 length then nothing is done. If there are no element on - * the stact noting is done. + * Gets called to pass the text between XML-tags and converts it to a String. + * When this string is 0 length then nothing is done. + * If there are no element on the stact noting is done. * * @see org.xml.sax.helpers.DefaultHandler#characters(char[],int,int) */ @Override public void characters(char[] ch, int start, int length) throws SAXException { - if (overrideSaxHandler != null) { + if (overrideSaxHandler!=null) { overrideSaxHandler.characters(ch, start, length); return; } - if (length == 0) { + if (length==0) { return; // no text } - String text = new String(ch, start, length); - if (text.length() == 0) { + String text = new String(ch,start,length); + if (text.length()==0) { return; // no text } if (elementStack.isEmpty()) { - return; // no element + return; // no element } Element e = elementStack.peek(); try { e.doCharacters(text); } catch (ElementException ee) { - throw new SAXParseException("Error while doCharacters element: '" + e.getElementClass().getId() + "' " + ee.getMessage(), locator, ee); + throw new SAXParseException("Error while doCharacters element: '"+e.getElementClass().getId()+"' "+ee.getMessage(),locator,ee); } } @@ -239,23 +241,23 @@ public class X4OContentHandler extends DefaultHandler2 { */ @Override public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { - if (overrideSaxHandler != null) { + if (overrideSaxHandler!=null) { overrideSaxHandler.ignorableWhitespace(ch, start, length); return; } String text = new String(ch); text = text.substring(start, start + length); - if (text.length() == 0) { + if (text.length()==0) { return; // no text } if (elementStack.empty()) { - return; // no element + return; // no element } Element e = elementStack.peek(); try { e.doIgnorableWhitespace(text); } catch (ElementException ee) { - throw new SAXParseException("Error while doIgnorableWhitespace element: '" + e.getElementClass().getId() + "' " + ee.getMessage(), locator, ee); + throw new SAXParseException("Error while doIgnorableWhitespace element: '"+e.getElementClass().getId()+"' "+ee.getMessage(),locator,ee); } } @@ -264,31 +266,31 @@ public class X4OContentHandler extends DefaultHandler2 { */ @Override public void comment(char[] ch, int start, int length) throws SAXException { - if (overrideSaxHandler != null) { + if (overrideSaxHandler!=null) { overrideSaxHandler.comment(ch, start, length); return; } String text = new String(ch); text = text.substring(start, start + length); - if (text.length() == 0) { + if (text.length()==0) { return; // no text } if (elementStack.empty()) { - return; // no element + return; // no element } Element e = elementStack.peek(); try { e.doComment(text); } catch (ElementException ee) { - throw new SAXParseException("Error while doComment element: '" + e.getElementClass().getId() + "' " + ee.getMessage(), locator, ee); + throw new SAXParseException("Error while doComment element: '"+e.getElementClass().getId()+"' "+ee.getMessage(),locator,ee); } } - + /** * @see org.xml.sax.helpers.DefaultHandler#processingInstruction(java.lang.String, java.lang.String) */ @Override public void processingInstruction(String target, String data) throws SAXException { - logger.fine("Skipping process instuctions: " + target + " data: " + data); + logger.fine("Skipping process instuctions: "+target+" data: "+data); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java index ed01a05..da0e1c4 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java @@ -48,17 +48,17 @@ import javax.xml.parsers.SAXParserFactory; * @version 1.0 Aug 20, 2005 */ public class X4OContentParser { - + private final SAX3PropertyConfig propertyConfig; - + public X4OContentParser(SAX3PropertyConfig propertyConfig) { - this.propertyConfig = propertyConfig; + this.propertyConfig=propertyConfig; } - + private SAX3PropertyConfig getPropertyConfig() { return propertyConfig; } - + public void parse(X4OLanguageSession languageSession) throws SAXException, IOException, ParserConfigurationException { // Group debug config property messages if (languageSession.hasX4ODebugWriter()) { @@ -72,102 +72,102 @@ public class X4OContentParser { } } } - + private void parseSax(X4OLanguageSession languageSession) throws SAXException, IOException, ParserConfigurationException { - // If xsd caching is needed this should be the way - // XMLParserConfiguration config = new XIncludeAwareParserConfiguration(); - // config.setProperty("http://apache.org/xml/properties/internal/grammar-pool",myFullGrammarPool); - // SAXParser parser = new SAXParser(config); - + // If xsd caching is needed this should be the way + //XMLParserConfiguration config = new XIncludeAwareParserConfiguration(); + //config.setProperty("http://apache.org/xml/properties/internal/grammar-pool",myFullGrammarPool); + //SAXParser parser = new SAXParser(config); + // Create Sax parser with x4o tag handler - X4OContentHandler xth = new X4OContentHandler(languageSession, getPropertyConfig()); + X4OContentHandler xth = new X4OContentHandler(languageSession,getPropertyConfig()); SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setNamespaceAware(true); SAXParser parser = factory.newSAXParser(); XMLReader reader = parser.getXMLReader(); - reader.setErrorHandler(new X4OErrorHandler(languageSession, getPropertyConfig())); - reader.setEntityResolver(new X4OEntityResolver(languageSession, getPropertyConfig())); + reader.setErrorHandler(new X4OErrorHandler(languageSession,getPropertyConfig())); + reader.setEntityResolver(new X4OEntityResolver(languageSession,getPropertyConfig())); reader.setContentHandler(xth); reader.setProperty("http://xml.org/sax/properties/lexical-handler", xth); - reader.setProperty("http://xml.org/sax/properties/declaration-handler", xth); - - // Set properties and optional - Map saxParserProperties = getSAXParserProperties(languageSession); - for (Map.Entry entry : saxParserProperties.entrySet()) { + reader.setProperty("http://xml.org/sax/properties/declaration-handler",xth); + + // Set properties and optional + Map saxParserProperties = getSAXParserProperties(languageSession); + for (Map.Entry entry:saxParserProperties.entrySet()) { String name = entry.getKey(); - Object value = entry.getValue(); + Object value= entry.getValue(); reader.setProperty(name, value); - debugMessage("property", name, value, languageSession); + debugMessage("property",name,value,languageSession); } - Map saxParserPropertiesOptional = getSAXParserPropertiesOptional(languageSession); - for (Map.Entry entry : saxParserPropertiesOptional.entrySet()) { + Map saxParserPropertiesOptional = getSAXParserPropertiesOptional(languageSession); + for (Map.Entry entry:saxParserPropertiesOptional.entrySet()) { String name = entry.getKey(); - Object value = entry.getValue(); + Object value= entry.getValue(); try { reader.setProperty(name, value); - debugMessage("optional-property", name, value, languageSession); + debugMessage("optional-property",name,value,languageSession); } catch (SAXException e) { - debugMessageLog("Could not set optional SAX property: " + name + " to: " + value + " error: " + e.getMessage(), languageSession); + debugMessageLog("Could not set optional SAX property: "+name+" to: "+value+" error: "+e.getMessage(),languageSession); } } - + // Set sax features and optional Map features = getSAXParserFeatures(languageSession); - for (String key : features.keySet()) { - Boolean value = features.get(key); + for (String key:features.keySet()) { + Boolean value=features.get(key); reader.setFeature(key, value); - debugMessage("feature", key, value, languageSession); + debugMessage("feature",key,value,languageSession); } Map featuresOptional = getSAXParserFeaturesOptional(languageSession); - for (String key : featuresOptional.keySet()) { - Boolean value = featuresOptional.get(key); + for (String key:featuresOptional.keySet()) { + Boolean value=featuresOptional.get(key); try { reader.setFeature(key, value); - debugMessage("optional-feature", key, value, languageSession); + debugMessage("optional-feature",key,value,languageSession); } catch (SAXException e) { - debugMessageLog("Could not set optional SAX feature: " + key + " to: " + value + " error: " + e.getMessage(), languageSession); + debugMessageLog("Could not set optional SAX feature: "+key+" to: "+value+" error: "+e.getMessage(),languageSession); } } - + // check for required features List requiredFeatures = getSAXParserFeaturesRequired(languageSession); - for (String requiredFeature : requiredFeatures) { - if (reader.getFeature(requiredFeature) == false) { - throw new IllegalStateException("Missing required feature: " + requiredFeature); + for (String requiredFeature:requiredFeatures) { + if (reader.getFeature(requiredFeature)==false) { + throw new IllegalStateException("Missing required feature: "+requiredFeature); } - debugMessage("required", requiredFeature, "true", languageSession); + debugMessage("required",requiredFeature,"true",languageSession); } - + // Finally start parsing the xml input stream Object requestInputSource = getPropertyConfig().getProperty(DefaultX4OReader.INPUT_SOURCE); InputSource input = null; InputStream inputStream = null; if (requestInputSource instanceof InputSource) { - input = (InputSource) requestInputSource; + input = (InputSource)requestInputSource; } else { - inputStream = (InputStream) getPropertyConfig().getProperty(DefaultX4OReader.INPUT_STREAM); + inputStream = (InputStream)getPropertyConfig().getProperty(DefaultX4OReader.INPUT_STREAM); input = new InputSource(inputStream); } - + Object requestInputEncoding = getPropertyConfig().getProperty(DefaultX4OReader.INPUT_ENCODING); - if (requestInputEncoding != null && requestInputEncoding instanceof String) { + if (requestInputEncoding!=null && requestInputEncoding instanceof String) { input.setEncoding(requestInputEncoding.toString()); } Object requestSystemId = getPropertyConfig().getProperty(DefaultX4OReader.INPUT_SYSTEM_ID); - if (requestSystemId != null && requestSystemId instanceof String) { + if (requestSystemId!=null && requestSystemId instanceof String) { input.setSystemId(requestSystemId.toString()); } - + try { reader.parse(input); } finally { - if (inputStream != null) { + if (inputStream!=null) { inputStream.close(); } } } - - private void debugMessageLog(String message, X4OLanguageSession languageSession) throws SAXException { + + private void debugMessageLog(String message,X4OLanguageSession languageSession) throws SAXException { if (languageSession.hasX4ODebugWriter()) { try { languageSession.getX4ODebugWriter().debugPhaseMessage(message, getClass()); @@ -176,30 +176,28 @@ public class X4OContentParser { } } } - - private void debugMessage(String type, String key, Object value, X4OLanguageSession languageSession) throws IOException { + + private void debugMessage(String type,String key,Object value,X4OLanguageSession languageSession) throws IOException { if (languageSession.hasX4ODebugWriter()) { - languageSession.getX4ODebugWriter().debugSAXMessage(type, key, "" + value); + languageSession.getX4ODebugWriter().debugSAXMessage(type,key,""+value); } } - + public Map getSAXParserProperties(X4OLanguageSession elementContext) { - Map saxParserProperties = new HashMap(1); + Map saxParserProperties = new HashMap(1); return saxParserProperties; } public Map getSAXParserPropertiesOptional(X4OLanguageSession elementContext) { - Map saxParserProperties = new HashMap(1); - // Increase buffer to 8KB - saxParserProperties.put("http://apache.org/xml/properties/input-buffer-size", getPropertyConfig().getProperty(DefaultX4OReader.DOC_BUFFER_SIZE)); + Map saxParserProperties = new HashMap(1); + saxParserProperties.put("http://apache.org/xml/properties/input-buffer-size",getPropertyConfig().getProperty(DefaultX4OReader.DOC_BUFFER_SIZE)); // Increase buffer to 8KB return saxParserProperties; } public Map getSAXParserFeatures(X4OLanguageSession elementContext) { - + // see example: http://xerces.apache.org/xerces2-j/features.html - Map saxParserFeatures = new HashMap(20); - //@formatter:off + Map saxParserFeatures = new HashMap(20); // Tune Sax Parser saxParserFeatures.put("http://xml.org/sax/features/namespaces", true); // Perform namespace processing @@ -237,14 +235,14 @@ public class X4OContentParser { } else { saxParserFeatures.put("http://apache.org/xml/features/validation/schema-full-checking", false); // Disable validation of the schema grammar itself for errors. } - //@formatter:on - + + return saxParserFeatures; } public Map getSAXParserFeaturesOptional(X4OLanguageSession elementContext) { - Map saxParserFeatures = new HashMap(20); - //@formatter:off + Map saxParserFeatures = new HashMap(20); + // Make Sax Impl more strict. saxParserFeatures.put("http://apache.org/xml/features/disallow-doctype-decl", true); // Throws error if document contains a DOCTYPE declaration. saxParserFeatures.put("http://apache.org/xml/features/validation/schema/normalized-value", true); // Expose normalized values for attributes and elements. @@ -259,17 +257,15 @@ public class X4OContentParser { //saxParserFeatures.put("http://apache.org/xml/features/validation/warn-on-undeclared-elemdef", true); // Report a warning if an element referenced in a content model is not declared. //saxParserFeatures.put("http://apache.org/xml/features/validation/balance-syntax-trees", false); // No optimize DTD content models. //saxParserFeatures.put("http://apache.org/xml/features/validation/unparsed-entity-checking", false); // Do not check that each value of type ENTITY in DTD. - //@formatter:on + return saxParserFeatures; } - + public List getSAXParserFeaturesRequired(X4OLanguageSession elementContext) { List result = new ArrayList(5); - //@formatter:off result.add("http://xml.org/sax/features/use-attributes2"); // Attributes objects passed by the parser are ext.Attributes2 interface. result.add("http://xml.org/sax/features/use-locator2"); // Locator objects passed by the parser are org.xml.sax.ext.Locator2 interface. result.add("http://xml.org/sax/features/xml-1.1"); // The parser supports both XML 1.0 and XML 1.1. - //@formatter:on return result; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java index a0d26a5..d7bf627 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.io; +package org.x4o.xml.io; import java.io.IOException; import java.lang.reflect.Method; @@ -62,22 +62,21 @@ import org.xml.sax.helpers.AttributesImpl; * @version 1.0 Jan 15, 2009 */ public class X4ODebugWriter { - + static public final String DEBUG_URI = "http://language.x4o.org/xml/ns/debug-output"; static public final String DEBUG_URI_NS = "debug"; - - protected SAX3WriterEnum contentWriter = null; - + + protected SAX3WriterEnum contentWriter = null; + public X4ODebugWriter(ContentWriter debugWriter) { - this.contentWriter = new SAX3WriterEnum(debugWriter, DEBUG_URI, DEBUG_URI_NS); - } - + this.contentWriter = new SAX3WriterEnum(debugWriter, DEBUG_URI, DEBUG_URI_NS); + } + public ContentWriter getContentWriter() { return contentWriter.getContentWriterWrapped(); } - + // TODO: rename most debug tags - //@formatter:off enum Tag { executePhase, executePhaseDone, @@ -136,72 +135,71 @@ public class X4ODebugWriter { end } - //@formatter:on - + public X4OPhaseListener createDebugX4OPhaseListener() { return new DebugX4OPhaseListener(); } - + class DebugX4OPhaseListener implements X4OPhaseListener { long startTime = 0; - - public void preRunPhase(X4OPhase phase, X4OLanguageSession elementLanguage) throws X4OPhaseException { + + public void preRunPhase(X4OPhase phase,X4OLanguageSession elementLanguage) throws X4OPhaseException { startTime = System.currentTimeMillis(); try { AttributesImpl atts = new AttributesImpl(); - atts.addAttribute("", "phaseId", "", "", phase.getId()); - if (elementLanguage != null) { - atts.addAttribute("", "language", "", "", elementLanguage.getLanguage().getLanguageName()); + atts.addAttribute("", "phaseId","","", phase.getId()); + if (elementLanguage!=null) { + atts.addAttribute("", "language","","", elementLanguage.getLanguage().getLanguageName()); } - contentWriter.printTagStart(Tag.executePhase, atts); + contentWriter.printTagStart (Tag.executePhase, atts); } catch (IOException e) { - throw new X4OPhaseException(phase, e); + throw new X4OPhaseException(phase,e); } } - - public void endRunPhase(X4OPhase phase, X4OLanguageSession elementLanguage) throws X4OPhaseException { + + public void endRunPhase(X4OPhase phase,X4OLanguageSession elementLanguage) throws X4OPhaseException { long stopTime = System.currentTimeMillis(); try { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "phaseId", "", "", phase.getId()); - atts.addAttribute("", "time", "", "", (stopTime - startTime) + ""); + atts.addAttribute("", "time", "", "", (stopTime-startTime)+""); atts.addAttribute("", "timeUnit", "", "", "ms"); contentWriter.printTagStartEnd(Tag.executePhaseDone, atts); - - contentWriter.printTagEnd(Tag.executePhase); + + contentWriter.printTagEnd (Tag.executePhase); } catch (IOException e) { - throw new X4OPhaseException(phase, e); + throw new X4OPhaseException(phase,e); } } } - + private String convertCharToHex(String newline) { StringBuilder buf = new StringBuilder(); buf.append("0x"); - for (char c : newline.toCharArray()) { + for (char c:newline.toCharArray()) { Integer i = Integer.valueOf(c); - if (i < 16) { + if (i<16) { buf.append('0'); } buf.append(Integer.toHexString(i).toUpperCase()); } return buf.toString(); } - - public void debugConnectionStart(X4OLanguageSession languageSession, X4OConnection ec) throws IOException { + + public void debugConnectionStart(X4OLanguageSession languageSession,X4OConnection ec) throws IOException { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "language", "", "", languageSession.getLanguage().getLanguageName()); atts.addAttribute("", "languageVersion", "", "", languageSession.getLanguage().getLanguageVersion()); atts.addAttribute("", "className", "", "", ec.getClass().getName()); - atts.addAttribute("", "currentTimeMillis", "", "", System.currentTimeMillis() + ""); + atts.addAttribute("", "currentTimeMillis", "", "", System.currentTimeMillis()+""); contentWriter.printTagStart(Tag.X4OConnection, atts); - + atts = new AttributesImpl(); atts.addAttribute("", "phaseStop", "", "", languageSession.getPhaseStop()); atts.addAttribute("", "className", "", "", languageSession.getClass().getName()); - // atts.addAttribute("", "listenersSize", "", "", phase.getPhaseListeners().size()+""); + //atts.addAttribute("", "listenersSize", "", "", phase.getPhaseListeners().size()+""); contentWriter.printTagStart(Tag.X4OLanguageSession, atts); - for (String skipPhase : languageSession.getPhaseSkip()) { + for (String skipPhase:languageSession.getPhaseSkip()) { contentWriter.printTagCharacters(Tag.X4OLanguageSessionSkipPhase, skipPhase); } if (languageSession instanceof X4OLanguageSessionLocal) { @@ -218,14 +216,14 @@ public class X4ODebugWriter { } } contentWriter.printTagEnd(Tag.X4OLanguageSession); - + atts = new AttributesImpl(); contentWriter.printTagStart(Tag.X4OConnectionProperties, atts); - for (String key : ec.getPropertyKeys()) { + for (String key:ec.getPropertyKeys()) { Object value = ec.getProperty(key); AttributesImpl atts2 = new AttributesImpl(); atts2.addAttribute("", "key", "", "", key); - if (value == null) { + if (value==null) { atts2.addAttribute("", "valueIsNull", "", "", "true"); } else { if (key.endsWith("char-newline") | key.endsWith("char-tab")) { @@ -237,97 +235,98 @@ public class X4ODebugWriter { } contentWriter.printTagEnd(Tag.X4OConnectionProperties); } - + + public void debugConnectionEnd() throws IOException { contentWriter.printTagEnd(Tag.X4OConnection); } - + public void debugLanguageDefaultClasses(X4OLanguageSession ec) throws ElementException { try { AttributesImpl atts = new AttributesImpl(); - contentWriter.printTagStart(Tag.X4OLanguageDefaultClasses, atts); + contentWriter.printTagStart (Tag.X4OLanguageDefaultClasses,atts); X4OLanguageConfiguration conf = ec.getLanguage().getLanguageConfiguration(); - - debugLanguageDefaultClass("defaultElementNamespace", conf.getDefaultElementNamespace()); - debugLanguageDefaultClass("defaultElementInterface", conf.getDefaultElementInterface()); - debugLanguageDefaultClass("defaultElement", conf.getDefaultElement()); - debugLanguageDefaultClass("defaultElementClass", conf.getDefaultElementClass()); - debugLanguageDefaultClass("defaultElementClassAttribute", conf.getDefaultElementClassAttribute()); - debugLanguageDefaultClass("defaultElementLanguageModule", conf.getDefaultElementLanguageModule()); - debugLanguageDefaultClass("defaultElementBodyComment", conf.getDefaultElementBodyComment()); - debugLanguageDefaultClass("defaultElementBodyCharacters", conf.getDefaultElementBodyCharacters()); - debugLanguageDefaultClass("defaultElementBodyWhitespace", conf.getDefaultElementBodyWhitespace()); - debugLanguageDefaultClass("defaultElementNamespaceInstanceProvider", conf.getDefaultElementNamespaceInstanceProvider()); - debugLanguageDefaultClass("defaultElementAttributeValueParser", conf.getDefaultElementAttributeValueParser()); - debugLanguageDefaultClass("defaultElementObjectPropertyValue", conf.getDefaultElementObjectPropertyValue()); - debugLanguageDefaultClass("defaultElementNamespaceAttributeComparator", conf.getDefaultElementNamespaceAttributeComparator()); - + + debugLanguageDefaultClass("defaultElementNamespace",conf.getDefaultElementNamespace()); + debugLanguageDefaultClass("defaultElementInterface",conf.getDefaultElementInterface()); + debugLanguageDefaultClass("defaultElement",conf.getDefaultElement()); + debugLanguageDefaultClass("defaultElementClass",conf.getDefaultElementClass()); + debugLanguageDefaultClass("defaultElementClassAttribute",conf.getDefaultElementClassAttribute()); + debugLanguageDefaultClass("defaultElementLanguageModule",conf.getDefaultElementLanguageModule()); + debugLanguageDefaultClass("defaultElementBodyComment",conf.getDefaultElementBodyComment()); + debugLanguageDefaultClass("defaultElementBodyCharacters",conf.getDefaultElementBodyCharacters()); + debugLanguageDefaultClass("defaultElementBodyWhitespace",conf.getDefaultElementBodyWhitespace()); + debugLanguageDefaultClass("defaultElementNamespaceInstanceProvider",conf.getDefaultElementNamespaceInstanceProvider()); + debugLanguageDefaultClass("defaultElementAttributeValueParser",conf.getDefaultElementAttributeValueParser()); + debugLanguageDefaultClass("defaultElementObjectPropertyValue",conf.getDefaultElementObjectPropertyValue()); + debugLanguageDefaultClass("defaultElementNamespaceAttributeComparator",conf.getDefaultElementNamespaceAttributeComparator()); + contentWriter.printTagEnd(Tag.X4OLanguageDefaultClasses); } catch (IOException e) { throw new ElementException(e); } } - - private void debugLanguageDefaultClass(String name, Class clazz) throws IOException { + + private void debugLanguageDefaultClass(String name,Class clazz) throws IOException { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "name", "", "", name); atts.addAttribute("", "className", "", "", clazz.getName()); contentWriter.printTagStartEnd(Tag.X4OLanguageDefaultClass, atts); } - + public void debugPhaseOrder(List phases) throws X4OPhaseException { X4OPhase phase = null; try { contentWriter.printTagStart(Tag.phaseOrder); - for (X4OPhase phase2 : phases) { + for (X4OPhase phase2:phases) { phase = phase2; debugPhase(phase2); } contentWriter.printTagEnd(Tag.phaseOrder); } catch (IOException e) { // fall back... - if (phase == null) { + if (phase==null) { if (phases.isEmpty()) { - throw new X4OPhaseException(null, e); /// FIXME: mmmm phase in exception here ? + throw new X4OPhaseException(null,e); /// FIXME: mmmm phase in exception here ? } phase = phases.get(0); } - throw new X4OPhaseException(phase, e); + throw new X4OPhaseException(phase,e); } } - + private void debugPhase(X4OPhase phase) throws X4OPhaseException { try { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "id", "", "", phase.getId()); atts.addAttribute("", "type", "", "", phase.getType().name()); - atts.addAttribute("", "runOnce", "", "", phase.isRunOnce() + ""); - + atts.addAttribute("", "runOnce", "", "", phase.isRunOnce()+""); + contentWriter.printTagStart(Tag.phase, atts); - for (String dep : phase.getPhaseDependencies()) { + for (String dep:phase.getPhaseDependencies()) { contentWriter.printTagCharacters(Tag.X4OPhaseDependency, dep); } contentWriter.printTagEnd(Tag.phase); } catch (IOException e) { - throw new X4OPhaseException(phase, e); + throw new X4OPhaseException(phase,e); } } - + public void debugElementLanguageModules(X4OLanguageSession elementLanguage) throws ElementException { try { - contentWriter.printTagStart(Tag.ElementLanguageModules); - - for (X4OLanguageModule module : elementLanguage.getLanguage().getLanguageModules()) { + contentWriter.printTagStart (Tag.ElementLanguageModules); + + for (X4OLanguageModule module:elementLanguage.getLanguage().getLanguageModules()) { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "className", "", "", module.getClass().getName()); atts.addAttribute("", "id", "", "", module.getId()); atts.addAttribute("", "providerName", "", "", module.getProviderName()); atts.addAttribute("", "providerHost", "", "", module.getProviderHost()); contentWriter.printTagStart(Tag.ElementLanguageModule, atts); - - for (X4OLanguageModuleLoaderResult result : X4OLanguageModuleLoaderResult.values()) { + + for (X4OLanguageModuleLoaderResult result:X4OLanguageModuleLoaderResult.values()) { String value = module.getLoaderResult(result); - if (value == null) { + if (value==null) { continue; } atts = new AttributesImpl(); @@ -335,118 +334,118 @@ public class X4ODebugWriter { atts.addAttribute("", "resultValue", "", "", value); contentWriter.printTagStartEnd(Tag.ElementLanguageModuleResult, atts); } - + debugElementConfiguratorGlobal(module.getElementConfiguratorGlobals()); debugElementBindingHandler(module.getElementBindingHandlers()); - - for (ElementInterface elementInterface : module.getElementInterfaces()) { + + for (ElementInterface elementInterface:module.getElementInterfaces()) { atts = new AttributesImpl(); atts.addAttribute("", "className", "", "", elementInterface.getClass().getName()); atts.addAttribute("", "description", "", "", elementInterface.getDescription()); atts.addAttribute("", "interfaceClass", "", "", elementInterface.getInterfaceClass().getName()); - + contentWriter.printTagStart(Tag.elementInterface, atts); debugElementClassBase(elementInterface); contentWriter.printTagEnd(Tag.elementInterface); } - - for (ElementNamespace enc : module.getElementNamespaces()) { + + for (ElementNamespace enc:module.getElementNamespaces()) { atts = new AttributesImpl(); - atts.addAttribute("", "uri", "", "", enc.getUri()); + atts.addAttribute("", "uri", "", "", enc.getUri()); atts.addAttribute("", "description", "", "", enc.getDescription()); atts.addAttribute("", "schemaUri", "", "", enc.getSchemaUri()); atts.addAttribute("", "schemaResource", "", "", enc.getSchemaResource()); atts.addAttribute("", "className", "", "", enc.getClass().getName()); - + contentWriter.printTagStart(Tag.elementNamespace, atts); - - for (ElementNamespaceAttribute p : enc.getElementNamespaceAttributes()) { + + for (ElementNamespaceAttribute p:enc.getElementNamespaceAttributes()) { atts = new AttributesImpl(); atts.addAttribute("", "attributeName", "", "", p.getAttributeName()); atts.addAttribute("", "description", "", "", p.getDescription()); atts.addAttribute("", "className", "", "", p.getClass().getName()); contentWriter.printTagStart(Tag.elementNamespaceAttribute, atts); - for (String para : p.getNextAttributes()) { + for (String para:p.getNextAttributes()) { atts = new AttributesImpl(); - atts.addAttribute("", "attributeName", "", "", para); - contentWriter.printTagStartEnd(Tag.nextAttribute, atts); + atts.addAttribute("", "attributeName", "", "", para); + contentWriter.printTagStartEnd (Tag.nextAttribute, atts); } contentWriter.printTagEnd(Tag.elementNamespaceAttribute); } - for (ElementClass ec : enc.getElementClasses()) { + for (ElementClass ec:enc.getElementClasses()) { debugElementClass(ec); } - + ElementNamespaceInstanceProvider eip = enc.getElementNamespaceInstanceProvider(); atts = new AttributesImpl(); atts.addAttribute("", "className", "", "", eip.getClass().getName()); contentWriter.printTagStartEnd(Tag.ElementNamespaceInstanceProvider, atts); - + contentWriter.printTagEnd(Tag.elementNamespace); } - + contentWriter.printTagEnd(Tag.ElementLanguageModule); } - + contentWriter.printTagEnd(Tag.ElementLanguageModules); } catch (IOException e) { throw new ElementException(e); } } - + public void debugElement(Element element) throws ElementException { try { AttributesImpl atts = new AttributesImpl(); // atts.addAttribute("", "tag", "", "", element.getElementClass().getTag()); - atts.addAttribute("", "objectClass", "", "", "" + element.getElementClass().getObjectClass()); - - boolean rootElement = element.getParent() == null; + atts.addAttribute("", "objectClass", "", "", ""+element.getElementClass().getObjectClass()); + + boolean rootElement = element.getParent()==null; if (rootElement) { - atts.addAttribute("", "isRootElement", "", "", "true"); + atts.addAttribute("", "isRootElement", "", "", "true"); } - - if (element.getElementObject() == null) { + + if (element.getElementObject()==null) { atts.addAttribute("", "elementObjectClassName", "", "", "null"); } else { atts.addAttribute("", "elementObjectClassName", "", "", element.getElementObject().getClass().getName()); - + AttributesImpl atts2 = new AttributesImpl(); try { - for (Method m : element.getElementObject().getClass().getMethods()) { - if (m.getName().startsWith("get") == false) { // a bit dirty + for (Method m:element.getElementObject().getClass().getMethods()) { + if (m.getName().startsWith("get")==false) { //a bit dirty continue; } - if (m.getParameterTypes().length > 0) { + if (m.getParameterTypes().length>0) { continue; } Object value = m.invoke(element.getElementObject()); - if (value != null) { - // atts2.addAttribute ("", m.getName()+".className", "", "", value.getClass().getName()); - + if (value!=null) { + //atts2.addAttribute ("", m.getName()+".className", "", "", value.getClass().getName()); + if (value instanceof String) { - atts2.addAttribute("", m.getName(), "", "", value.toString()); + atts2.addAttribute("", m.getName(), "", "", value.toString()); } if (value instanceof Number) { - atts2.addAttribute("", m.getName(), "", "", value.toString()); + atts2.addAttribute("", m.getName(), "", "", value.toString()); } if (value instanceof Collection) { - atts2.addAttribute("", m.getName() + ".size", "", "", "" + ((Collection) value).size()); + atts2.addAttribute("", m.getName()+".size", "", "", ""+((Collection)value).size()); } - if (value instanceof Map) { - atts2.addAttribute("", m.getName() + ".size", "", "", "" + ((Map) value).size()); + if (value instanceof Map) { + atts2.addAttribute("", m.getName()+".size", "", "", ""+((Map)value).size()); } } } } catch (Exception e) { atts.addAttribute("", "exceptionWhileGetingBeanValues", "", "", e.getMessage()); } - + contentWriter.printTagStartEnd(Tag.elementObject, atts2); } - - StringBuilder elementPath = getElementPath(element, new StringBuilder()); + + StringBuilder elementPath = getElementPath(element,new StringBuilder()); atts.addAttribute("", "elementPath", "", "", elementPath.toString()); - + contentWriter.printTagStart(Tag.element, atts); // FIXME put elementObject herer ? contentWriter.printTagEnd(Tag.element); @@ -454,47 +453,46 @@ public class X4ODebugWriter { throw new ElementException(e); } } - + /** * Todo move after xpath support. - * - * @param element The element. - * @param buff The buffer. - * @return Returns the buffer of the builf path. + * @param element The element. + * @param buff The buffer. + * @return Returns the buffer of the builf path. */ - private StringBuilder getElementPath(Element element, StringBuilder buff) { - if (element.getParent() == null) { + private StringBuilder getElementPath(Element element,StringBuilder buff) { + if (element.getParent()==null) { buff.append('/'); // root slash buff.append(element.getElementClass().getId()); return buff; } - buff = getElementPath(element.getParent(), buff); + buff = getElementPath(element.getParent(),buff); buff.append('/'); buff.append(element.getElementClass().getId()); return buff; } - + public void debugSAXConfigStart() throws IOException { contentWriter.printTagStart(Tag.SAXConfig); } - + public void debugSAXConfigEnd() throws IOException { contentWriter.printTagEnd(Tag.SAXConfig); } - - public void debugSAXMessage(String type, String key, String value) throws IOException { + + public void debugSAXMessage(String type,String key,String value) throws IOException { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "key", "", "", key); - // atts.addAttribute("", "value", "", "", value); + //atts.addAttribute("", "value", "", "", value); atts.addAttribute("", "type", "", "", type); contentWriter.printTagStart(Tag.SAXConfigProperty, atts); contentWriter.printCharacters(value); contentWriter.printTagEnd(Tag.SAXConfigProperty); } - - public void debugPhaseMessage(String message, Class clazz) throws ElementException { + + public void debugPhaseMessage(String message,Class clazz) throws ElementException { AttributesImpl atts = new AttributesImpl(); - atts.addAttribute("", "fromClass", "", "", clazz.getName() + ""); + atts.addAttribute("", "fromClass", "", "", clazz.getName()+""); try { contentWriter.printTagStart(Tag.message, atts); contentWriter.printCharacters(message); @@ -503,15 +501,15 @@ public class X4ODebugWriter { throw new ElementException(e); } } - - public void debugElementConfigurator(ElementConfigurator ec, Element element) throws ElementException { + + public void debugElementConfigurator(ElementConfigurator ec,Element element) throws ElementException { try { AttributesImpl atts = new AttributesImpl(); - // atts.addAttribute("", key, "", "", value); - atts.addAttribute("", "configAction", "", "", ec.isConfigAction() + ""); + //atts.addAttribute("", key, "", "", value); + atts.addAttribute("", "configAction", "", "", ec.isConfigAction()+""); atts.addAttribute("", "description", "", "", ec.getDescription()); atts.addAttribute("", "className", "", "", ec.getClass().getName()); - + contentWriter.printTagStart(Tag.runElementConfigurator, atts); debugElement(element); contentWriter.printTagEnd(Tag.runElementConfigurator); @@ -519,16 +517,16 @@ public class X4ODebugWriter { throw new ElementException(e); } } - - public void debugElementBindingHandler(ElementBindingHandler ebh, Element element) throws ElementException { + + public void debugElementBindingHandler(ElementBindingHandler ebh,Element element) throws ElementException { try { AttributesImpl atts = new AttributesImpl(); - // atts.addAttribute("", key, "", "", value); + //atts.addAttribute("", key, "", "", value); atts.addAttribute("", "description", "", "", ebh.getDescription()); - atts.addAttribute("", "className", "", "", ebh.getClass().getName() + ""); - - atts.addAttribute("", "parentClass", "", "", element.getParent().getElementObject().getClass() + ""); - atts.addAttribute("", "childClass", "", "", element.getElementObject().getClass() + ""); + atts.addAttribute("", "className", "", "", ebh.getClass().getName()+""); + + atts.addAttribute("", "parentClass", "", "", element.getParent().getElementObject().getClass()+""); + atts.addAttribute("", "childClass", "", "", element.getElementObject().getClass()+""); contentWriter.printTagStart(Tag.doBind, atts); debugElement(element); @@ -537,26 +535,26 @@ public class X4ODebugWriter { throw new ElementException(e); } } - + private void debugElementClass(ElementClass elementClass) throws IOException { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "id", "", "", elementClass.getId()); - atts.addAttribute("", "autoAttributes", "", "", "" + elementClass.getAutoAttributes()); - // atts.addAttribute("", "schemaContentBase", "", "", ""+elementClass.getSchemaContentBase()); + atts.addAttribute("", "autoAttributes", "", "", ""+elementClass.getAutoAttributes()); + //atts.addAttribute("", "schemaContentBase", "", "", ""+elementClass.getSchemaContentBase()); atts.addAttribute("", "description", "", "", elementClass.getDescription()); - atts.addAttribute("", "objectClassName", "", "", "" + elementClass.getObjectClass()); + atts.addAttribute("", "objectClassName", "", "", ""+elementClass.getObjectClass()); atts.addAttribute("", "className", "", "", elementClass.getClass().getName()); contentWriter.printTagStart(Tag.elementClass, atts); - for (String phase : elementClass.getSkipPhases()) { + for (String phase:elementClass.getSkipPhases()) { atts = new AttributesImpl(); - atts.addAttribute("", "phase", "", "", "" + phase); + atts.addAttribute("", "phase", "", "", ""+phase); contentWriter.printTagStartEnd(Tag.elementSkipPhase, atts); } debugElementConfigurator(elementClass.getElementConfigurators()); debugElementClassBase(elementClass); contentWriter.printTagEnd(Tag.elementClass); } - + private void debugElementClassBase(ElementClassBase elementClassBase) throws IOException { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "description", "", "", elementClassBase.getDescription()); @@ -566,115 +564,112 @@ public class X4ODebugWriter { debugElementClassAttributes(elementClassBase.getElementClassAttributes()); contentWriter.printTagEnd(Tag.elementClassBase); } - + private void debugElementConfigurator(List elementConfigurators) throws IOException { - for (ElementConfigurator elementConfigurator : elementConfigurators) { + for (ElementConfigurator elementConfigurator:elementConfigurators) { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "description", "", "", elementConfigurator.getDescription()); atts.addAttribute("", "className", "", "", elementConfigurator.getClass().getName()); contentWriter.printTagStartEnd(Tag.elementConfigurator, atts); } } - + private void debugElementConfiguratorGlobal(List elementConfigurators) throws IOException { - for (ElementConfiguratorGlobal elementConfigurator : elementConfigurators) { + for (ElementConfiguratorGlobal elementConfigurator:elementConfigurators) { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "description", "", "", elementConfigurator.getDescription()); atts.addAttribute("", "className", "", "", elementConfigurator.getClass().getName()); contentWriter.printTagStartEnd(Tag.elementConfiguratorGlobal, atts); } } - + private void debugElementClassAttributes(Collection elementClassAttributes) throws IOException { - for (ElementClassAttribute elementClassAttribute : elementClassAttributes) { + for (ElementClassAttribute elementClassAttribute:elementClassAttributes) { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "id", "", "", elementClassAttribute.getId()); atts.addAttribute("", "description", "", "", elementClassAttribute.getDescription()); atts.addAttribute("", "className", "", "", elementClassAttribute.getClass().getName()); - atts.addAttribute("", "defaultValue", "", "", "" + elementClassAttribute.getDefaultValue()); - atts.addAttribute("", "runBeanValue", "", "", "" + elementClassAttribute.getRunBeanValue()); - atts.addAttribute("", "runConverters", "", "", "" + elementClassAttribute.getRunConverters()); - // atts.addAttribute("", "runInterfaces", "", "", ""+elementClassAttribute.getRunInterfaces()); - atts.addAttribute("", "runResolveEL", "", "", "" + elementClassAttribute.getRunResolveEL()); + atts.addAttribute("", "defaultValue", "", "", ""+elementClassAttribute.getDefaultValue()); + atts.addAttribute("", "runBeanValue", "", "", ""+elementClassAttribute.getRunBeanValue()); + atts.addAttribute("", "runConverters", "", "", ""+elementClassAttribute.getRunConverters()); + //atts.addAttribute("", "runInterfaces", "", "", ""+elementClassAttribute.getRunInterfaces()); + atts.addAttribute("", "runResolveEL", "", "", ""+elementClassAttribute.getRunResolveEL()); contentWriter.printTagStart(Tag.elementClassAttribute, atts); - if (elementClassAttribute.getObjectConverter() != null) { + if (elementClassAttribute.getObjectConverter()!=null) { debugObjectConverter(elementClassAttribute.getObjectConverter()); } - for (String alias : elementClassAttribute.getAttributeAliases()) { + for (String alias:elementClassAttribute.getAttributeAliases()) { atts = new AttributesImpl(); - atts.addAttribute("", "name", "", "", "" + alias); + atts.addAttribute("", "name", "", "", ""+alias); contentWriter.printTagStartEnd(Tag.attributeAlias, atts); } contentWriter.printTagEnd(Tag.elementClassAttribute); - } + } } - + private void debugObjectConverter(ObjectConverter objectConverter) throws IOException { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "objectClassTo", "", "", objectConverter.getObjectClassTo().getName()); atts.addAttribute("", "objectClassBack", "", "", objectConverter.getObjectClassBack().getName()); atts.addAttribute("", "className", "", "", objectConverter.getClass().getName()); contentWriter.printTagStart(Tag.objectConverter, atts); - // for (ObjectConverter oc:objectConverter.getObjectConverters()) { - // debugObjectConverter(oc); // TODO: turn me on - // } + //for (ObjectConverter oc:objectConverter.getObjectConverters()) { + // debugObjectConverter(oc); // TODO: turn me on + //} contentWriter.printTagEnd(Tag.objectConverter); } - + private void debugElementBindingHandler(List elementBindingHandlers) throws IOException { - for (ElementBindingHandler bind : elementBindingHandlers) { + for (ElementBindingHandler bind:elementBindingHandlers) { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "className", "", "", bind.getClass().getName()); atts.addAttribute("", "description", "", "", bind.getDescription()); atts.addAttribute("", "bindParentClass", "", "", bind.getBindParentClass().toString()); contentWriter.printTagStart(Tag.elementBindingHandler, atts); - - for (Class clazz : bind.getBindChildClasses()) { + + for (Class clazz:bind.getBindChildClasses()) { AttributesImpl atts2 = new AttributesImpl(); atts2.addAttribute("", "className", "", "", clazz.getName()); contentWriter.printTagStartEnd(Tag.elementBindingHandlerChildClass, atts2); } - + contentWriter.printTagEnd(Tag.elementBindingHandler); } } - + /** * Creates an debug phase - * - * @return The X4OPhaseHandler for this phase. + * @return The X4OPhaseHandler for this phase. */ public X4OPhaseListener createDebugPrintTreePhaseListener() { return new X4OPhaseListener() { List startedPrefix = new ArrayList(10); - - public void preRunPhase(X4OPhase phase, X4OLanguageSession languageSession) throws X4OPhaseException { + public void preRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException { } - - public void endRunPhase(X4OPhase phase, X4OLanguageSession languageSession) throws X4OPhaseException { - if (languageSession.hasX4ODebugWriter() == false) { - throw new X4OPhaseException(phase, "Use debugPhase only when X4OParser.debugWriter is filled."); + public void endRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException { + if (languageSession.hasX4ODebugWriter()==false) { + throw new X4OPhaseException(phase,"Use debugPhase only when X4OParser.debugWriter is filled."); } try { AttributesImpl atts = new AttributesImpl(); contentWriter.printTagStart(Tag.printElementTree, atts); startedPrefix.clear(); printXML(languageSession.getRootElement()); - for (String prefix : startedPrefix) { + for (String prefix:startedPrefix) { contentWriter.getContentWriterWrapped().endPrefixMapping(prefix); } contentWriter.printTagEnd(Tag.printElementTree); } catch (SAXException e) { - throw new X4OPhaseException(phase, e); + throw new X4OPhaseException(phase,e); } catch (IOException e) { - throw new X4OPhaseException(phase, e); + throw new X4OPhaseException(phase,e); } } - + // note: slow version private String getNamespaceForElement(Element e) { - for (X4OLanguageModule mod : e.getLanguageSession().getLanguage().getLanguageModules()) { - for (ElementNamespace enc : mod.getElementNamespaces()) { + for (X4OLanguageModule mod:e.getLanguageSession().getLanguage().getLanguageModules()) { + for (ElementNamespace enc:mod.getElementNamespaces()) { List l = enc.getElementClasses(); if (l.contains(e.getElementClass())) { return enc.getUri(); @@ -683,50 +678,50 @@ public class X4ODebugWriter { } return null; } - + private void printXML(Element element) throws SAXException, IOException { - if (element == null) { + if (element==null) { throw new IOException("Can't print debug xml of null element."); } ContentWriter handler = getContentWriter(); if (element.getElementType().equals(Element.ElementType.comment)) { - handler.comment((String) element.getElementObject()); + handler.comment((String)element.getElementObject()); return; } if (element.getElementType().equals(Element.ElementType.characters)) { - handler.characters((String) element.getElementObject()); + handler.characters((String)element.getElementObject()); return; } - if (element.getElementClass() == null) { - throw new IOException("Element without ElementClass is not valid: " + element + " obj: " + element.getElementObject()); + if (element.getElementClass()==null) { + throw new IOException("Element without ElementClass is not valid: "+element+" obj: "+element.getElementObject()); } - + AttributesImpl atts = new AttributesImpl(); - for (String key : element.getAttributes().keySet()) { + for (String key:element.getAttributes().keySet()) { String value = element.getAttributes().get(key); - // uri, localName, xml1.0name, type, value + //uri, localName, xml1.0name, type, value atts.addAttribute("", key, "", "", value); } - + String nameSpace = getNamespaceForElement(element); ElementNamespace en = element.getLanguageSession().getLanguage().findElementNamespace(nameSpace); - - String prefix = en.getPrefixMapping(); // TODO: note is for reading; getPrefixMapping - if (prefix == null) { + + String prefix = en.getPrefixMapping(); // TODO: note is for reading; getPrefixMapping + if (prefix==null) { prefix = en.getSchemaPrefix(); } - if (prefix == null) { + if (prefix==null) { prefix = en.getId(); } - if (startedPrefix.contains(prefix) == false) { + if (startedPrefix.contains(prefix)==false) { handler.startPrefixMapping(prefix, nameSpace); startedPrefix.add(prefix); } - handler.startElement(nameSpace, element.getElementClass().getId(), "", atts); - for (Element e : element.getAllChilderen()) { + handler.startElement (nameSpace, element.getElementClass().getId(), "", atts); + for (Element e:element.getAllChilderen()) { printXML(e); } - handler.endElement(nameSpace, element.getElementClass().getId(), ""); + handler.endElement (nameSpace, element.getElementClass().getId(), ""); } }; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java index 857c40c..85737ab 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.io; +package org.x4o.xml.io; import java.io.File; import java.io.FileInputStream; @@ -42,39 +42,42 @@ import org.xml.sax.SAXException; /** * X4OEntityResolver resolves internel entities and proxy to external defined ones. * - * Resolve order; 1) validation base path dir 2) external resolver 3) lookup for language in classpath. 4) throw exception + * Resolve order; + * 1) validation base path dir + * 2) external resolver + * 3) lookup for language in classpath. + * 4) throw exception * * @author Willem Cazander * @version 1.0 Aug 22, 2012 */ public class X4OEntityResolver implements EntityResolver { - + private Logger logger = null; private URL basePath = null; - private Map schemaResources = null; - private Map schemaPathResources = null; + private Map schemaResources = null; + private Map schemaPathResources = null; private final SAX3PropertyConfig propertyConfig; - + /** * Creates an X4OEntityResolver for a language. - * - * @param elementContext The x4o language to resolve entities for. + * @param elementContext The x4o language to resolve entities for. */ - public X4OEntityResolver(X4OLanguageSession elementContext, SAX3PropertyConfig propertyConfig) { - if (elementContext == null) { + public X4OEntityResolver(X4OLanguageSession elementContext,SAX3PropertyConfig propertyConfig) { + if (elementContext==null) { throw new NullPointerException("Can't provide entities with null elementContext."); } - this.logger = Logger.getLogger(X4OEntityResolver.class.getName()); - this.propertyConfig = propertyConfig; - this.basePath = (URL) propertyConfig.getProperty(DefaultX4OReader.INPUT_BASE_PATH); - this.schemaResources = new HashMap(20); - this.schemaPathResources = new HashMap(20); - for (X4OLanguageModule mod : elementContext.getLanguage().getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { - if (ns.getSchemaUri() == null) { + this.logger=Logger.getLogger(X4OEntityResolver.class.getName()); + this.propertyConfig=propertyConfig; + this.basePath=(URL)propertyConfig.getProperty(DefaultX4OReader.INPUT_BASE_PATH); + this.schemaResources=new HashMap(20); + this.schemaPathResources=new HashMap(20); + for (X4OLanguageModule mod:elementContext.getLanguage().getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { + if (ns.getSchemaUri()==null) { continue; } - if (ns.getSchemaResource() == null) { + if (ns.getSchemaResource()==null) { continue; } StringBuilder buf = new StringBuilder(30); @@ -83,48 +86,48 @@ public class X4OEntityResolver implements EntityResolver { buf.append(elementContext.getLanguage().getLanguageName()); buf.append('/'); buf.append(ns.getSchemaResource()); - schemaResources.put(ns.getSchemaUri(), buf.toString()); - + schemaResources.put( ns.getSchemaUri(), buf.toString() ); + buf = new StringBuilder(30); buf.append(elementContext.getLanguage().getLanguageName()); buf.append(File.separatorChar); buf.append(ns.getSchemaResource()); - schemaPathResources.put(ns.getSchemaUri(), buf.toString()); + schemaPathResources.put( ns.getSchemaUri(), buf.toString() ); } } } - + /** * Try to resolve xml entities by systemId. * * @param publicId The public id to search for. * @param systemId The system id to search for. - * @throws IOException When resource could not be read. + * @throws IOException When resource could not be read. * @throws SAXException When exception is thrown. * @return Returns null or the InputSource of the requested ids. */ - public InputSource resolveEntity(String publicId, String systemId) throws IOException, SAXException { - - logger.finer("Fetch sysId: " + systemId + " pubId: " + publicId); - + public InputSource resolveEntity(String publicId, String systemId) throws IOException,SAXException { + + logger.finer("Fetch sysId: "+systemId+" pubId: "+publicId); + // Check if other resolver has resource - EntityResolver resolver = (EntityResolver) propertyConfig.getProperty(DefaultX4OReader.SAX_ENTITY_RESOLVER); - if (resolver != null) { + EntityResolver resolver = (EntityResolver)propertyConfig.getProperty(DefaultX4OReader.SAX_ENTITY_RESOLVER); + if (resolver!=null) { InputSource result = resolver.resolveEntity(publicId, systemId); - if (result != null) { + if (result!=null) { return result; } } - + // Check if we have it on user defined schema base path if (schemaPathResources.containsKey(systemId)) { - File schemaBasePath = (File) propertyConfig.getProperty(DefaultX4OReader.VALIDATION_SCHEMA_PATH); - if (schemaBasePath != null && schemaBasePath.exists()) { + File schemaBasePath = (File)propertyConfig.getProperty(DefaultX4OReader.VALIDATION_SCHEMA_PATH); + if (schemaBasePath!=null && schemaBasePath.exists()) { String schemeResource = schemaResources.get(systemId); - File schemaFile = new File(schemaBasePath.getAbsolutePath() + File.separatorChar + schemeResource); + File schemaFile = new File(schemaBasePath.getAbsolutePath()+File.separatorChar+schemeResource); if (schemaFile.exists()) { if (!schemaFile.canRead()) { - throw new SAXException("Can't read schema file: " + schemaFile); + throw new SAXException("Can't read schema file: "+schemaFile); } try { InputSource in = new InputSource(new FileInputStream(schemaFile)); @@ -133,42 +136,42 @@ public class X4OEntityResolver implements EntityResolver { return in; } catch (IOException e) { // note; IOException(String,Exception) is java6 - throw new SAXException("Could not open: " + schemaFile + " error: " + e.getMessage(), e); + throw new SAXException("Could not open: "+schemaFile+" error: "+e.getMessage(),e); } } } } - + // Check if we have it on the classpath. if (schemaResources.containsKey(systemId)) { String schemeResource = schemaResources.get(systemId); ClassLoader cl = X4OLanguageClassLoader.getClassLoader(); URL resource = cl.getResource(schemeResource); - if (resource != null) { + if (resource!=null) { try { InputSource in = new InputSource(resource.openStream()); in.setPublicId(publicId); in.setSystemId(systemId); return in; } catch (IOException e) { - throw new SAXException("Could not open: " + resource + " error: " + e.getMessage(), e); + throw new SAXException("Could not open: "+resource+" error: "+e.getMessage(),e); } } } - - if (basePath != null && systemId != null && systemId.startsWith(basePath.toExternalForm())) { - logger.finer("Base reference basePath: " + basePath + " systemId: " + systemId); + + if (basePath!=null && systemId!=null && systemId.startsWith(basePath.toExternalForm())) { + logger.finer("Base reference basePath: "+basePath+" systemId: "+systemId); try { InputSource in = new InputSource(new URL(systemId).openStream()); in.setPublicId(publicId); in.setSystemId(systemId); return in; } catch (IOException e) { - throw new SAXException("Could not open: " + systemId + " error: " + e.getMessage(), e); + throw new SAXException("Could not open: "+systemId+" error: "+e.getMessage(),e); } } - + // always throw to remove all network fetches. - throw new SAXException("SystemId not found: " + systemId); + throw new SAXException("SystemId not found: "+systemId); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java index f4cf2cd..9b1e262 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java @@ -36,38 +36,37 @@ import org.xml.sax.SAXParseException; * @version 1.0 Feb 8, 2007 */ public class X4OErrorHandler implements ErrorHandler { - + private X4OLanguageSession languageSession = null; private ErrorHandler errorHandler = null; - + /** * Construct a new SAXErrorPrinter - * - * @param languageSession The language to get errors to. + * @param languageSession The language to get errors to. */ - public X4OErrorHandler(X4OLanguageSession languageSession, SAX3PropertyConfig propertyConfig) { - if (languageSession == null) { + public X4OErrorHandler(X4OLanguageSession languageSession,SAX3PropertyConfig propertyConfig) { + if (languageSession==null) { throw new NullPointerException("Can't debug and proxy errors with null languageSession."); } - this.languageSession = languageSession; - this.errorHandler = (ErrorHandler) propertyConfig.getProperty(DefaultX4OReader.SAX_ERROR_HANDLER); + this.languageSession=languageSession; + this.errorHandler=(ErrorHandler)propertyConfig.getProperty(DefaultX4OReader.SAX_ERROR_HANDLER); } /** * Prints the error message to debug output. */ private void printError(boolean isError, SAXParseException exception) throws SAXException { - if (languageSession.hasX4ODebugWriter() == false) { + if (languageSession.hasX4ODebugWriter()==false) { return; } - String message = printErrorString(isError, exception); + String message = printErrorString(isError,exception); try { languageSession.getX4ODebugWriter().debugPhaseMessage(message, X4OErrorHandler.class); } catch (ElementException e) { throw new SAXException(e); } } - + /** * Prints the error message to string. */ @@ -79,22 +78,22 @@ public class X4OErrorHandler implements ErrorHandler { buf.append(":"); buf.append(exception.getColumnNumber()); buf.append(" "); - buf.append((isError ? "Error: " : "Warning: ")); + buf.append((isError?"Error: ":"Warning: ")); buf.append(exception.getMessage()); return buf.toString(); } // ========= ErrorHandler - + /** * Receive notification of a SAX warning. */ public void warning(SAXParseException exception) throws SAXException { printError(false, exception); - if (errorHandler != null) { + if (errorHandler!=null) { errorHandler.warning(exception); } else { - throw new SAXException(printErrorString(false, exception)); + throw new SAXException(printErrorString(false,exception)); } } @@ -103,10 +102,10 @@ public class X4OErrorHandler implements ErrorHandler { */ public void error(SAXParseException exception) throws SAXException { printError(true, exception); - if (errorHandler != null) { + if (errorHandler!=null) { errorHandler.error(exception); } else { - throw new SAXException(printErrorString(true, exception)); + throw new SAXException(printErrorString(true,exception)); } } @@ -115,10 +114,10 @@ public class X4OErrorHandler implements ErrorHandler { */ public void fatalError(SAXParseException exception) throws SAXException { printError(true, exception); - if (errorHandler != null) { + if (errorHandler!=null) { errorHandler.fatalError(exception); } else { - throw new SAXException(printErrorString(true, exception)); + throw new SAXException(printErrorString(true,exception)); } } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OReader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OReader.java index 42281a9..e376773 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OReader.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OReader.java @@ -41,76 +41,69 @@ public interface X4OReader extends X4OConnection { /** * Adds an bean instance to the el context. - * - * @param name The el name for the bean. - * @param bean The bean to add to the el context. + * @param name The el name for the bean. + * @param bean The bean to add to the el context. */ - void addELBeanInstance(String name, Object bean); - + void addELBeanInstance(String name,Object bean); + /** * Method to parse the xml data. - * - * @param input The inputStream to parse. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param input The inputStream to parse. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. */ - T read(InputStream input, String systemId, URL basePath) throws X4OConnectionException, SAXException, IOException; - + T read(InputStream input,String systemId,URL basePath) throws X4OConnectionException,SAXException,IOException; + /** * Reads the file fileName and parses it as an InputStream. - * - * @param fileName The file name to parse. - * @throws FileNotFoundException Is thrown is file is not found. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param fileName The file name to parse. + * @throws FileNotFoundException Is thrown is file is not found. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(java.io.InputStream,java.lang.String,java.net.URL) */ - T readFile(String fileName) throws X4OConnectionException, SAXException, IOException, FileNotFoundException; - + T readFile(String fileName) throws X4OConnectionException,SAXException,IOException,FileNotFoundException; + /** * Reads the file and parses it as an InputStream. - * - * @param file The file to parse. - * @throws FileNotFoundException Is thrown is file is not found. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param file The file to parse. + * @throws FileNotFoundException Is thrown is file is not found. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(java.io.InputStream,java.lang.String,java.net.URL) */ - T readFile(File file) throws X4OConnectionException, SAXException, IOException, FileNotFoundException; - + T readFile(File file) throws X4OConnectionException,SAXException,IOException,FileNotFoundException; + /** * Parses an resource locaction. - * - * @param resourceName The resource to parser. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param resourceName The resource to parser. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(java.io.InputStream,java.lang.String,java.net.URL) */ - T readResource(String resourceName) throws X4OConnectionException, SAXException, IOException; - + T readResource(String resourceName) throws X4OConnectionException,SAXException,IOException; + /** * Converts a String to a InputStream to is can me parsed by SAX. - * - * @param xmlString The xml as String to parse. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param xmlString The xml as String to parse. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(java.io.InputStream,java.lang.String,java.net.URL) */ - T readString(String xmlString) throws X4OConnectionException, SAXException, IOException; - + T readString(String xmlString) throws X4OConnectionException,SAXException,IOException; + /** * Fetched the data direct from remote url to a InputStream to is can me parsed by SAX. - * - * @param url The url to parse. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param url The url to parse. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(java.io.InputStream,java.lang.String,java.net.URL) */ - T readUrl(URL url) throws X4OConnectionException, SAXException, IOException; + T readUrl(URL url) throws X4OConnectionException,SAXException,IOException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OReaderSession.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OReaderSession.java index a1407ea..0f16045 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OReaderSession.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OReaderSession.java @@ -38,76 +38,70 @@ import org.xml.sax.SAXException; * @version 1.0 Apr 6, 2013 */ public interface X4OReaderSession extends X4OReader { - + /** * Method to parse the xml data. - * - * @param session The language session. - * @param input The inputStream to parse. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param session The language session. + * @param input The inputStream to parse. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. */ void readSession(X4OLanguageSession session, InputStream input, String systemId, URL basePath) throws X4OConnectionException, SAXException, IOException; - + /** * Reads the file fileName and parses it as an InputStream. - * - * @param session The language session. - * @param fileName The file name to parse. - * @throws FileNotFoundException Is thrown is file is not found. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param session The language session. + * @param fileName The file name to parse. + * @throws FileNotFoundException Is thrown is file is not found. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(org.x4o.xml.lang.X4OLanguageSession,java.io.InputStream,java.lang.String,java.net.URL) */ void readFileSession(X4OLanguageSession session, String fileName) throws X4OConnectionException, SAXException, IOException, FileNotFoundException; - + /** * Reads the file and parses it as an InputStream. - * - * @param session The language session. - * @param file The file to parse. - * @throws FileNotFoundException Is thrown is file is not found. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param session The language session. + * @param file The file to parse. + * @throws FileNotFoundException Is thrown is file is not found. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(org.x4o.xml.lang.X4OLanguageSession,java.io.InputStream,java.lang.String,java.net.URL) */ void readFileSession(X4OLanguageSession session, File file) throws X4OConnectionException, SAXException, IOException, FileNotFoundException; - + /** * Parses an resource locaction. - * - * @param session The language session. - * @param resourceName The resource to parser. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param session The language session. + * @param resourceName The resource to parser. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(org.x4o.xml.lang.X4OLanguageSession,java.io.InputStream,java.lang.String,java.net.URL) */ void readResourceSession(X4OLanguageSession session, String resourceName) throws X4OConnectionException, SAXException, IOException; - + /** * Converts a String to a InputStream to is can be parsed by SAX. - * - * @param session The language session. - * @param xmlString The xml as String to parse. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param session The language session. + * @param xmlString The xml as String to parse. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(org.x4o.xml.lang.X4OLanguageSession,java.io.InputStream,java.lang.String,java.net.URL) */ void readStringSession(X4OLanguageSession session, String xmlString) throws X4OConnectionException, SAXException, IOException; - + /** * Fetched the data direct from remote url to a InputStream to is can be parsed by SAX. - * - * @param session The language session. - * @param url The url to parse. - * @throws X4OConnectionException Is thrown after x4o exception. - * @throws SAXException Is thrown after sax xml exception. - * @throws IOException Is thrown after io exception. + * @param session The language session. + * @param url The url to parse. + * @throws X4OConnectionException Is thrown after x4o exception. + * @throws SAXException Is thrown after sax xml exception. + * @throws IOException Is thrown after io exception. * @see org.x4o.xml.io.X4OReaderSession#readSession(org.x4o.xml.lang.X4OLanguageSession,java.io.InputStream,java.lang.String,java.net.URL) */ void readUrlSession(X4OLanguageSession session, URL url) throws X4OConnectionException, SAXException, IOException; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OWriter.java index d866a91..c6915ee 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OWriter.java @@ -37,11 +37,11 @@ import org.xml.sax.SAXException; */ public interface X4OWriter extends X4OConnection { - void write(T object, OutputStream out) throws X4OConnectionException, SAXException, IOException; - - void writeFile(T object, String fileName) throws X4OConnectionException, SAXException, IOException; - - void writeFile(T object, File file) throws X4OConnectionException, SAXException, IOException; - - String writeString(T object) throws X4OConnectionException, SAXException, IOException; + void write(T object,OutputStream out) throws X4OConnectionException,SAXException,IOException; + + void writeFile(T object,String fileName) throws X4OConnectionException,SAXException,IOException; + + void writeFile(T object,File file) throws X4OConnectionException,SAXException,IOException; + + String writeString(T object) throws X4OConnectionException,SAXException,IOException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OWriterSession.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OWriterSession.java index bc0291f..eeafe21 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OWriterSession.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OWriterSession.java @@ -38,10 +38,10 @@ import org.xml.sax.SAXException; public interface X4OWriterSession extends X4OWriter { void writeSession(X4OLanguageSession session, OutputStream out) throws X4OConnectionException, SAXException, IOException; - + void writeFileSession(X4OLanguageSession session, String fileName) throws X4OConnectionException, SAXException, IOException; - + void writeFileSession(X4OLanguageSession session, File file) throws X4OConnectionException, SAXException, IOException; - + String writeStringSession(X4OLanguageSession session) throws X4OConnectionException, SAXException, IOException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageConfiguration.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageConfiguration.java index 98375ee..5dc9177 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageConfiguration.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageConfiguration.java @@ -29,16 +29,16 @@ package org.x4o.xml.lang; * @version 1.0 Apr 28, 2013 */ public abstract class AbstractX4OLanguageConfiguration implements X4OLanguageConfigurationLocal { - + private String languageResourcePathPrefix = null; private String languageResourceModulesFileName = null; - + private Class defaultElementNamespace = null; private Class defaultElementInterface = null; private Class defaultElement = null; private Class defaultElementClass = null; private Class defaultElementClassAttribute = null; - + private Class defaultElementLanguageModule = null; private Class defaultElementBodyComment = null; private Class defaultElementBodyCharacters = null; @@ -47,262 +47,262 @@ public abstract class AbstractX4OLanguageConfiguration implements X4OLanguageCon private Class defaultElementAttributeValueParser = null; private Class defaultElementObjectPropertyValue = null; private Class defaultElementNamespaceAttributeComparator = null; - + private Class defaultLanguageVersionFilter = null; private Class defaultLanguageLoader = null; private Class defaultExpressionLanguageContext = null; - + /** * Default constructor. */ public AbstractX4OLanguageConfiguration() { } - + /** * @return the languageResourcePathPrefix */ public String getLanguageResourcePathPrefix() { return languageResourcePathPrefix; } - + /** * @param languageResourcePathPrefix the languageResourcePathPrefix to set */ public void setLanguageResourcePathPrefix(String languageResourcePathPrefix) { this.languageResourcePathPrefix = languageResourcePathPrefix; } - + /** * @return the languageResourceModulesFileName */ public String getLanguageResourceModulesFileName() { return languageResourceModulesFileName; } - + /** * @param languageResourceModulesFileName the languageResourceModulesFileName to set */ public void setLanguageResourceModulesFileName(String languageResourceModulesFileName) { this.languageResourceModulesFileName = languageResourceModulesFileName; } - + /** * @return the defaultElementNamespace */ public Class getDefaultElementNamespace() { return defaultElementNamespace; } - + /** * @param defaultElementNamespace the defaultElementNamespace to set */ public void setDefaultElementNamespace(Class defaultElementNamespace) { this.defaultElementNamespace = defaultElementNamespace; } - + /** * @return the defaultElementInterface */ public Class getDefaultElementInterface() { return defaultElementInterface; } - + /** * @param defaultElementInterface the defaultElementInterface to set */ public void setDefaultElementInterface(Class defaultElementInterface) { this.defaultElementInterface = defaultElementInterface; } - + /** * @return the defaultElement */ public Class getDefaultElement() { return defaultElement; } - + /** * @param defaultElement the defaultElement to set */ public void setDefaultElement(Class defaultElement) { this.defaultElement = defaultElement; } - + /** * @return the defaultElementClass */ public Class getDefaultElementClass() { return defaultElementClass; } - + /** * @param defaultElementClass the defaultElementClass to set */ public void setDefaultElementClass(Class defaultElementClass) { this.defaultElementClass = defaultElementClass; } - + /** * @return the defaultElementClassAttribute */ public Class getDefaultElementClassAttribute() { return defaultElementClassAttribute; } - + /** * @param defaultElementClassAttribute the defaultElementClassAttribute to set */ public void setDefaultElementClassAttribute(Class defaultElementClassAttribute) { this.defaultElementClassAttribute = defaultElementClassAttribute; } - + /** * @return the defaultElementLanguageModule */ public Class getDefaultElementLanguageModule() { return defaultElementLanguageModule; } - + /** * @param defaultElementLanguageModule the defaultElementLanguageModule to set */ public void setDefaultElementLanguageModule(Class defaultElementLanguageModule) { this.defaultElementLanguageModule = defaultElementLanguageModule; } - + /** * @return the defaultElementBodyComment */ public Class getDefaultElementBodyComment() { return defaultElementBodyComment; } - + /** * @param defaultElementBodyComment the defaultElementBodyComment to set */ public void setDefaultElementBodyComment(Class defaultElementBodyComment) { this.defaultElementBodyComment = defaultElementBodyComment; } - + /** * @return the defaultElementBodyCharacters */ public Class getDefaultElementBodyCharacters() { return defaultElementBodyCharacters; } - + /** * @param defaultElementBodyCharacters the defaultElementBodyCharacters to set */ public void setDefaultElementBodyCharacters(Class defaultElementBodyCharacters) { this.defaultElementBodyCharacters = defaultElementBodyCharacters; } - + /** * @return the defaultElementBodyWhitespace */ public Class getDefaultElementBodyWhitespace() { return defaultElementBodyWhitespace; } - + /** * @param defaultElementBodyWhitespace the defaultElementBodyWhitespace to set */ public void setDefaultElementBodyWhitespace(Class defaultElementBodyWhitespace) { this.defaultElementBodyWhitespace = defaultElementBodyWhitespace; } - + /** * @return the defaultElementNamespaceInstanceProvider */ public Class getDefaultElementNamespaceInstanceProvider() { return defaultElementNamespaceInstanceProvider; } - + /** * @param defaultElementNamespaceInstanceProvider the defaultElementNamespaceInstanceProvider to set */ public void setDefaultElementNamespaceInstanceProvider(Class defaultElementNamespaceInstanceProvider) { this.defaultElementNamespaceInstanceProvider = defaultElementNamespaceInstanceProvider; } - + /** * @return the defaultElementAttributeValueParser */ public Class getDefaultElementAttributeValueParser() { return defaultElementAttributeValueParser; } - + /** * @param defaultElementAttributeValueParser the defaultElementAttributeValueParser to set */ public void setDefaultElementAttributeValueParser(Class defaultElementAttributeValueParser) { this.defaultElementAttributeValueParser = defaultElementAttributeValueParser; } - + /** * @return the defaultElementObjectPropertyValue */ public Class getDefaultElementObjectPropertyValue() { return defaultElementObjectPropertyValue; } - + /** * @param defaultElementObjectPropertyValue the defaultElementObjectPropertyValue to set */ public void setDefaultElementObjectPropertyValue(Class defaultElementObjectPropertyValue) { this.defaultElementObjectPropertyValue = defaultElementObjectPropertyValue; } - + /** * @return the defaultElementNamespaceAttributeComparator */ public Class getDefaultElementNamespaceAttributeComparator() { return defaultElementNamespaceAttributeComparator; } - + /** * @param defaultElementNamespaceAttributeComparator the defaultElementNamespaceAttributeComparator to set */ public void setDefaultElementNamespaceAttributeComparator(Class defaultElementNamespaceAttributeComparator) { this.defaultElementNamespaceAttributeComparator = defaultElementNamespaceAttributeComparator; } - + /** * @return the defaultLanguageVersionFilter */ public Class getDefaultLanguageVersionFilter() { return defaultLanguageVersionFilter; } - + /** * @param defaultLanguageVersionFilter the defaultLanguageVersionFilter to set */ public void setDefaultLanguageVersionFilter(Class defaultLanguageVersionFilter) { this.defaultLanguageVersionFilter = defaultLanguageVersionFilter; } - + /** * @return the defaultLanguageLoader */ public Class getDefaultLanguageLoader() { return defaultLanguageLoader; } - + /** * @param defaultLanguageLoader the defaultLanguageLoader to set */ public void setDefaultLanguageLoader(Class defaultLanguageLoader) { this.defaultLanguageLoader = defaultLanguageLoader; } - + /** * @return the defaultExpressionLanguageContext */ public Class getDefaultExpressionLanguageContext() { return defaultExpressionLanguageContext; } - + /** * @param defaultExpressionLanguageContext the defaultExpressionLanguageContext to set */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageModule.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageModule.java index a5a9a62..10b2610 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageModule.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageModule.java @@ -43,14 +43,14 @@ import org.x4o.xml.element.ElementNamespace; public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase implements X4OLanguageModuleLocal { private Logger logger = null; - private String providerName = null; - private String providerHost = null; - + private String providerName=null; + private String providerHost=null; + private List elementBindingHandlers = null; private List elementConfiguratorGlobals = null; private List elementInterfaces = null; - private Map elementNamespaces = null; - private Map loaderResults = null; + private Map elementNamespaces = null; + private Map loaderResults = null; /** * Creates a new empty ElementLanguage. @@ -61,31 +61,31 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase elementBindingHandlers = new ArrayList(4); elementConfiguratorGlobals = new ArrayList(4); elementInterfaces = new ArrayList(20); - elementNamespaces = new HashMap(10); - loaderResults = new HashMap(10); + elementNamespaces = new HashMap(10); + loaderResults = new HashMap(10); } - + /** * @return the providerName */ public String getProviderName() { return providerName; } - + /** * @param providerName the providerName to set */ public void setProviderName(String providerName) { this.providerName = providerName; } - + /** * @return the providerHost */ public String getProviderHost() { return providerHost; } - + /** * @param providerHost the providerHost to set */ @@ -97,107 +97,109 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase * @see org.x4o.xml.lang.X4OLanguageModuleLocal#addElementBindingHandler(ElementBindingHandler) */ public void addElementBindingHandler(ElementBindingHandler elementBindingHandler) { - if (elementBindingHandler == null) { + if (elementBindingHandler==null) { throw new NullPointerException("Can't add null binding handler."); } - if (elementBindingHandler.getId() == null) { + if (elementBindingHandler.getId()==null) { throw new NullPointerException("Can't add with null id property."); } // Check so doc tree does not loop; see EldDocHtmlWriter.findChilderen() /* - * for (Class cl:elementBindingHandler.getBindChildClasses()) { if (elementBindingHandler.getBindParentClass().equals(cl)) { throw new - * IllegalStateException("Can't add binding handler: "+elementBindingHandler.getId()+" with same parent as child class."); } } - */ - logger.finer("Adding ElementBindingHandler: " + elementBindingHandler); + for (Class cl:elementBindingHandler.getBindChildClasses()) { + if (elementBindingHandler.getBindParentClass().equals(cl)) { + throw new IllegalStateException("Can't add binding handler: "+elementBindingHandler.getId()+" with same parent as child class."); + } + }*/ + logger.finer("Adding ElementBindingHandler: "+elementBindingHandler); elementBindingHandlers.add(elementBindingHandler); } - + /** * @see org.x4o.xml.lang.X4OLanguageModule#getElementBindingHandlers() */ public List getElementBindingHandlers() { return elementBindingHandlers; } - + /** * @see org.x4o.xml.lang.X4OLanguageModuleLocal#addElementConfiguratorGlobal(ElementConfiguratorGlobal) */ public void addElementConfiguratorGlobal(ElementConfiguratorGlobal elementConfigurator) { - if (elementConfigurator == null) { + if (elementConfigurator==null) { throw new NullPointerException("Can't add null"); } - if (elementConfigurator.getId() == null) { + if (elementConfigurator.getId()==null) { throw new NullPointerException("Can't add with null id property."); } - logger.finer("Adding ElementConfiguratorGlobal: " + elementConfigurator); + logger.finer("Adding ElementConfiguratorGlobal: "+elementConfigurator); elementConfiguratorGlobals.add(elementConfigurator); } - + /** * @see org.x4o.xml.lang.X4OLanguageModule#getElementConfiguratorGlobals() */ public List getElementConfiguratorGlobals() { return elementConfiguratorGlobals; } - + /** * @see org.x4o.xml.lang.X4OLanguageModuleLocal#addElementInterface(org.x4o.xml.element.ElementInterface) */ public void addElementInterface(ElementInterface elementInterface) { - if (elementInterface == null) { + if (elementInterface==null) { throw new NullPointerException("Can't add null."); } - if (elementInterface.getId() == null) { + if (elementInterface.getId()==null) { throw new NullPointerException("Can't add with null id property."); } - if (elementInterface.getInterfaceClass() == null) { + if (elementInterface.getInterfaceClass()==null) { throw new NullPointerException("ElementInterface not correctly configured getInterfaceClass returns null."); } elementInterfaces.add(elementInterface); } - + /** * @see org.x4o.xml.lang.X4OLanguageModule#getElementInterfaces() */ public List getElementInterfaces() { return elementInterfaces; } - + /** * @see org.x4o.xml.lang.X4OLanguageModuleLocal#addElementNamespace(org.x4o.xml.element.ElementNamespace) */ public void addElementNamespace(ElementNamespace elementNamespace) { - if (elementNamespace == null) { + if (elementNamespace==null) { throw new NullPointerException("Can't add null."); } - if (elementNamespace.getUri() == null) { + if (elementNamespace.getUri()==null) { throw new NullPointerException("Can add ElementNamespace without uri."); } - logger.fine("Adding namespaceUri: " + elementNamespace.getUri()); + logger.fine("Adding namespaceUri: "+elementNamespace.getUri()); elementNamespaces.put(elementNamespace.getUri(), elementNamespace); } - + /** * @see org.x4o.xml.lang.X4OLanguageModule#getElementNamespace(java.lang.String) */ public ElementNamespace getElementNamespace(String namespaceUri) { return elementNamespaces.get(namespaceUri); } - + /** * @see org.x4o.xml.lang.X4OLanguageModule#getElementNamespaces() */ public List getElementNamespaces() { return new ArrayList(elementNamespaces.values()); } - + /** * @see org.x4o.xml.lang.X4OLanguageModule#getLoaderResult(org.x4o.xml.lang.X4OLanguageModuleLoaderResult) */ public String getLoaderResult(X4OLanguageModuleLoaderResult key) { return loaderResults.get(key); } - + /** * @see org.x4o.xml.lang.X4OLanguageModuleLocal#putLoaderResult(org.x4o.xml.lang.X4OLanguageModuleLoaderResult, java.lang.String) */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java index e0602b3..079b5a5 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java @@ -59,7 +59,7 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo private String phaseStop = null; private List phaseSkip = null; private Map> phaseListeners = null; - + /** * Creates a new empty language context. */ @@ -69,84 +69,84 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo } logger = Logger.getLogger(AbstractX4OLanguageSession.class.getName()); logger.finest("Creating new ParsingContext"); - this.language = language; + this.language=language; dirtyElements = new ArrayList<>(20); phaseSkip = new ArrayList<>(5); phaseListeners = new HashMap<>(3); } - + public X4OLanguage getLanguage() { return language; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#getExpressionLanguageContext() */ public ELContext getExpressionLanguageContext() { return eLContext; } - + /** * @see org.x4o.xml.lang.X4OLanguageSessionLocal#setExpressionLanguageContext(javax.el.ELContext) */ public void setExpressionLanguageContext(ELContext context) { - if (eLContext != null) { + if (eLContext!=null) { throw new IllegalStateException("Can only set elContext once."); } eLContext = context; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#getExpressionLanguageFactory() */ public ExpressionFactory getExpressionLanguageFactory() { return expressionFactory; } - + /** * @see org.x4o.xml.lang.X4OLanguageSessionLocal#setExpressionLanguageFactory(javax.el.ExpressionFactory) */ public void setExpressionLanguageFactory(ExpressionFactory expressionFactory) { - if (this.expressionFactory != null) { + if (this.expressionFactory!=null) { throw new IllegalStateException("Can only set expressionFactory once."); } this.expressionFactory = expressionFactory; } - + /** * @return the elementAttributeValueParser */ public ElementAttributeValueParser getElementAttributeValueParser() { return elementAttributeValueParser; } - + /** * @param elementAttributeValueParser the elementAttributeValueParser to set */ public void setElementAttributeValueParser(ElementAttributeValueParser elementAttributeValueParser) { - if (this.elementAttributeValueParser != null) { + if (this.elementAttributeValueParser!=null) { throw new IllegalStateException("Can only set elementAttributeValueParser once."); } this.elementAttributeValueParser = elementAttributeValueParser; } - + /** * @return the elementObjectPropertyValue */ public ElementObjectPropertyValue getElementObjectPropertyValue() { return elementObjectPropertyValue; } - + /** * @param elementObjectPropertyValue the elementObjectPropertyValue to set */ public void setElementObjectPropertyValue(ElementObjectPropertyValue elementObjectPropertyValue) { - if (this.elementObjectPropertyValue != null) { + if (this.elementObjectPropertyValue!=null) { throw new IllegalStateException("Can only set elementObjectPropertyValue once."); } this.elementObjectPropertyValue = elementObjectPropertyValue; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#addDirtyElement(org.x4o.xml.element.Element) */ @@ -156,99 +156,98 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo } dirtyElements.add(element); } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#getDirtyElements() */ public List getDirtyElements() { return dirtyElements; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#getRootElement() */ public Element getRootElement() { return rootElement; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#setRootElement(org.x4o.xml.element.Element) */ public void setRootElement(Element element) { - if (element == null) { + if (element==null) { throw new NullPointerException("May not set rootElement to null"); } - rootElement = element; + rootElement=element; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#getX4ODebugWriter() */ public X4ODebugWriter getX4ODebugWriter() { return debugWriter; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#hasX4ODebugWriter() */ public boolean hasX4ODebugWriter() { - return debugWriter != null; + return debugWriter!=null; } - + /** * @see org.x4o.xml.lang.X4OLanguageSessionLocal#setX4ODebugWriter(org.x4o.xml.io.X4ODebugWriter) */ public void setX4ODebugWriter(X4ODebugWriter debugWriter) { - this.debugWriter = debugWriter; + this.debugWriter=debugWriter; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#getPhaseCurrent() */ public X4OPhase getPhaseCurrent() { return phaseCurrent; } - + /** * @see org.x4o.xml.lang.X4OLanguageSessionLocal#setPhaseCurrent(org.x4o.xml.lang.phase.X4OPhase) */ public void setPhaseCurrent(X4OPhase phaseCurrent) { this.phaseCurrent = phaseCurrent; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#getPhaseStop() */ public String getPhaseStop() { return phaseStop; } - + /** * @see org.x4o.xml.lang.X4OLanguageSession#getPhaseSkip() */ public List getPhaseSkip() { return phaseSkip; } - + /** * @see org.x4o.xml.lang.X4OLanguageSessionLocal#setPhaseStop(java.lang.String) */ public void setPhaseStop(String phaseId) { - this.phaseStop = phaseId; + this.phaseStop=phaseId; } - + /** * @see org.x4o.xml.lang.X4OLanguageSessionLocal#addPhaseSkip(java.lang.String) */ public void addPhaseSkip(String phaseId) { phaseSkip.add(phaseId); } - + /** * Gets the phase listeners for a phase. - * * @param phaseId The phaseId of for the listeners. - * @return The x4o phase listeners. + * @return The x4o phase listeners. */ public List storePhaseListeners(String phaseId) { List result = phaseListeners.get(phaseId); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguage.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguage.java index d12c253..1ac936a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguage.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguage.java @@ -83,7 +83,7 @@ public class DefaultX4OLanguage implements X4OLanguageLocal { inited = true; getPhaseManager().runPhases(session, X4OPhaseType.INIT); } - + /** * @see org.x4o.xml.lang.X4OLanguage#getLanguageName() */ @@ -151,16 +151,13 @@ public class DefaultX4OLanguage implements X4OLanguageLocal { languageSession.setExpressionLanguageFactory(X4OExpressionFactory.createExpressionFactory()); } if (languageSession.getExpressionLanguageContext() == null) { - languageSession.setExpressionLanguageContext( - X4OExpressionFactory.createELContext(languageSession.getLanguage().getLanguageConfiguration().getDefaultExpressionLanguageContext())); + languageSession.setExpressionLanguageContext(X4OExpressionFactory.createELContext(languageSession.getLanguage().getLanguageConfiguration().getDefaultExpressionLanguageContext())); } if (languageSession.getElementAttributeValueParser() == null) { - languageSession.setElementAttributeValueParser(X4OLanguageClassLoader.newInstance(ElementAttributeValueParser.class, - getLanguageConfiguration().getDefaultElementAttributeValueParser())); + languageSession.setElementAttributeValueParser(X4OLanguageClassLoader.newInstance(ElementAttributeValueParser.class, getLanguageConfiguration().getDefaultElementAttributeValueParser())); } if (languageSession.getElementObjectPropertyValue() == null) { - languageSession.setElementObjectPropertyValue(X4OLanguageClassLoader.newInstance(ElementObjectPropertyValue.class, - getLanguageConfiguration().getDefaultElementObjectPropertyValue())); + languageSession.setElementObjectPropertyValue(X4OLanguageClassLoader.newInstance(ElementObjectPropertyValue.class, getLanguageConfiguration().getDefaultElementObjectPropertyValue())); } } catch (ClassNotFoundException e) { throw new RuntimeException(e.getMessage(), e); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageConfiguration.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageConfiguration.java index 4c4e023..ed4f50a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageConfiguration.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageConfiguration.java @@ -47,14 +47,13 @@ import org.x4o.xml.element.DefaultElementNamespaceAttributeComparator; * @version 1.0 27 Oct 2009 */ public class DefaultX4OLanguageConfiguration extends AbstractX4OLanguageConfiguration { - + /** * Default constructor. */ public DefaultX4OLanguageConfiguration() { } - - //@formatter:off + public void fillDefaults() { if (getLanguageResourcePathPrefix()==null) { setLanguageResourcePathPrefix( X4OLanguageConfiguration.DEFAULT_LANG_PATH_PREFIX); } if (getLanguageResourceModulesFileName()==null) { setLanguageResourceModulesFileName( X4OLanguageConfiguration.DEFAULT_LANG_MODULES_FILE);} @@ -75,29 +74,28 @@ public class DefaultX4OLanguageConfiguration extends AbstractX4OLanguageConfigur if (getDefaultLanguageLoader()==null) { setDefaultLanguageLoader( DefaultX4OLanguageLoader.class); } if (getDefaultExpressionLanguageContext()==null) { setDefaultExpressionLanguageContext( X4OELContext.class); } } - //@formatter:on - + /** * @see org.x4o.xml.lang.X4OLanguageConfigurationLocal#createProxy() */ public X4OLanguageConfiguration createProxy() { - Object proxy = Proxy.newProxyInstance(X4OLanguageClassLoader.getClassLoader(), new Class[] { X4OLanguageConfiguration.class }, new InvocationHandler() { + Object proxy = Proxy.newProxyInstance(X4OLanguageClassLoader.getClassLoader(), new Class[]{X4OLanguageConfiguration.class}, new InvocationHandler() { public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { X4OLanguageConfigurationLocal local = DefaultX4OLanguageConfiguration.this; int argsLength = 0; - if (args != null) { + if (args!=null) { argsLength = args.length; } Class[] invokeArgs = new Class[argsLength]; - for (int i = 0; i < argsLength; i++) { - // Object o = args[i]; - invokeArgs[i] = X4OLanguageSession.class; // o.getClass(); todo fix + for (int i=0;i modulesAll = loadLanguageModules(session, languageLocal, language); modulesAll = filterVersionModules(modulesAll, languageLocal, languageVersion); validateModules(modulesAll); - + int loaded = 0; for (VersionedResources versionedResources : modulesAll) { X4OLanguageModuleLoader loader; @@ -95,32 +93,31 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { String languagePrefix = languageLocal.getLanguageConfiguration().getLanguageResourcePathPrefix(); String resource = languagePrefix + "/" + language + "/" + value; if (language.equals(EldDriver.LANGUAGE_NAME)) { - loader = new EldModuleLoader(resource, true); // load cel + loader = new EldModuleLoader(resource,true); // load cel } else { - loader = new EldModuleLoader(resource, false); // load eld + loader = new EldModuleLoader(resource,false); // load eld } loadModule(session, languageLocal, loader, value, versionedResources); } for (String value : versionedResources.moduleLoaders) { try { - loader = (X4OLanguageModuleLoader) X4OLanguageClassLoader.newInstance(value); + loader = (X4OLanguageModuleLoader)X4OLanguageClassLoader.newInstance(value); } catch (Exception ee) { - throw new X4OLanguageLoaderException("Could not load class: " + value + " error: " + ee.getMessage(), ee); + throw new X4OLanguageLoaderException("Could not load class: " + value + " error: " + ee.getMessage(),ee); } loadModule(session, languageLocal, loader, value, versionedResources); } for (String value : versionedResources.siblingLoaders) { try { - loader = (X4OLanguageModuleLoader) X4OLanguageClassLoader.newInstance(value); + loader = (X4OLanguageModuleLoader)X4OLanguageClassLoader.newInstance(value); } catch (Exception ee) { - throw new X4OLanguageLoaderException("Could not load class: " + value + " error: " + ee.getMessage(), ee); + throw new X4OLanguageLoaderException("Could not load class: " + value + " error: " + ee.getMessage(),ee); } loadModule(session, languageLocal, loader, value, versionedResources); if (loader instanceof X4OLanguageModuleLoaderSibling) { // mmm - X4OPhaseInitLanguageSiblings sibPhase = (X4OPhaseInitLanguageSiblings) languageLocal.getPhaseManager() - .getPhase(X4OPhaseLanguageInit.INIT_LANG_SIB); - sibPhase.addLanguageModuleLoaderSibling((X4OLanguageModuleLoaderSibling) loader); + X4OPhaseInitLanguageSiblings sibPhase = (X4OPhaseInitLanguageSiblings)languageLocal.getPhaseManager().getPhase(X4OPhaseLanguageInit.INIT_LANG_SIB); + sibPhase.addLanguageModuleLoaderSibling((X4OLanguageModuleLoaderSibling)loader); } } for (String value : versionedResources.elbResources) { @@ -133,14 +130,12 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { throw new X4OLanguageLoaderException("No modules defined for version: " + languageVersion); } } - - private List filterVersionModules(List resources, X4OLanguageLocal languageLocal, String languageVersion) - throws X4OLanguageLoaderException { + + private List filterVersionModules(List resources, X4OLanguageLocal languageLocal, String languageVersion) throws X4OLanguageLoaderException { List result = new ArrayList(resources.size()); X4OLanguageVersionFilter lvf; try { - lvf = X4OLanguageClassLoader.newInstance(X4OLanguageVersionFilter.class, - languageLocal.getLanguageConfiguration().getDefaultLanguageVersionFilter()); + lvf = X4OLanguageClassLoader.newInstance(X4OLanguageVersionFilter.class, languageLocal.getLanguageConfiguration().getDefaultLanguageVersionFilter()); } catch (ClassNotFoundException e) { throw new X4OLanguageLoaderException(e); } @@ -155,7 +150,7 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { } return result; } - + protected void validateModules(List resources) throws X4OLanguageLoaderException { List eldResources = new ArrayList(5); List moduleLoaders = new ArrayList(5); @@ -168,7 +163,7 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { validateModuleList(siblingLoaders, vr.siblingLoaders, "sibling-loader"); } } - + private void validateModuleList(List data, List values, String xmlTag) throws X4OLanguageLoaderException { for (String value : values) { if (data.contains(value)) { @@ -177,23 +172,21 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { data.add(value); } } - - private void loadModule(X4OLanguageSession session, X4OLanguageLocal languageLocal, X4OLanguageModuleLoader loader, String resource, - VersionedResources versionedResources) throws X4OLanguageLoaderException { + + private void loadModule(X4OLanguageSession session, X4OLanguageLocal languageLocal, X4OLanguageModuleLoader loader, String resource, VersionedResources versionedResources) throws X4OLanguageLoaderException { X4OLanguageModuleLocal module; try { - module = X4OLanguageClassLoader.newInstance(X4OLanguageModuleLocal.class, - languageLocal.getLanguageConfiguration().getDefaultElementLanguageModule()); + module = X4OLanguageClassLoader.newInstance(X4OLanguageModuleLocal.class, languageLocal.getLanguageConfiguration().getDefaultElementLanguageModule()); } catch (ClassNotFoundException e) { throw new X4OLanguageLoaderException(e); } - logMessage(session, "Created module: " + module); + logMessage(session,"Created module: " + module); long startTime = System.currentTimeMillis(); try { - logMessage(session, "Starting modules: " + module + " for language: " + languageLocal.getLanguageName()); + logMessage(session,"Starting modules: " + module + " for language: " + languageLocal.getLanguageName()); loader.loadLanguageModule(session, languageLocal, module); } catch (X4OLanguageModuleLoaderException e) { - throw new X4OLanguageLoaderException(e); // FIXME info + throw new X4OLanguageLoaderException(e); // FIXME info } long totalTime = System.currentTimeMillis() - startTime; module.putLoaderResult(X4OLanguageModuleLoaderResult.LOAD_TIME, "" + totalTime); @@ -204,18 +197,16 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { module.putLoaderResult(X4OLanguageModuleLoaderResult.LOAD_MODULE_RESOURCE, resource); } module.putLoaderResult(X4OLanguageModuleLoaderResult.LOAD_FROM_RESOURCE, versionedResources.loadedFrom); - + languageLocal.addLanguageModule(module); } - + /** * Loads all modules of an language. - * - * @param languageLocal The ElementLanguage to load for. - * @param language The language to load. + * @param languageLocal The ElementLanguage to load for. + * @param language The language to load. */ - protected List loadLanguageModules(X4OLanguageSession session, X4OLanguageLocal languageLocal, String language) - throws X4OLanguageLoaderException { + protected List loadLanguageModules(X4OLanguageSession session, X4OLanguageLocal languageLocal, String language) throws X4OLanguageLoaderException { List result = new ArrayList(15); StringBuilder buf = new StringBuilder(150); buf.append(languageLocal.getLanguageConfiguration().getLanguageResourcePathPrefix()); @@ -224,7 +215,7 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { buf.append('/'); buf.append(language); buf.append(languageLocal.getLanguageConfiguration().getLanguageResourceModulesFileName()); - + logger.finer("loading X4O language: " + language); try { Enumeration e = Thread.currentThread().getContextClassLoader().getResources(buf.toString()); @@ -233,29 +224,27 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { logMessage(session, "Loading relative modules: " + u + " for: " + language); result.addAll(loadLanguageModulesXml(u.openStream(), u.toString())); } - - e = Thread.currentThread().getContextClassLoader().getResources("/" + buf.toString()); + + e = Thread.currentThread().getContextClassLoader().getResources("/"+buf.toString()); while (e.hasMoreElements()) { URL u = e.nextElement(); logMessage(session, "Loading root modules: " + u + " for: " + language); result.addAll(loadLanguageModulesXml(u.openStream(), u.toString())); } return result; - } catch (IOException | SAXException | ParserConfigurationException e) { + } catch (IOException | SAXException | ParserConfigurationException e) { throw new X4OLanguageLoaderException(e); } } - + /** * Parser xml inputstream to languge modules. - * - * @param in The inputstream to parser. + * @param in The inputstream to parser. * @throws IOException * @throws SAXException - * @throws ParserConfigurationException + * @throws ParserConfigurationException */ - protected List loadLanguageModulesXml(InputStream in, String loadedFrom) - throws IOException, SAXException, ParserConfigurationException { + protected List loadLanguageModulesXml(InputStream in, String loadedFrom) throws IOException, SAXException, ParserConfigurationException { if (in == null) { throw new NullPointerException("Can't parse null input stream"); } @@ -266,7 +255,7 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { XMLReader reader = parser.getXMLReader(); reader.setContentHandler(xth); reader.setProperty("http://xml.org/sax/properties/lexical-handler", xth); - reader.setProperty("http://xml.org/sax/properties/declaration-handler", xth); + reader.setProperty("http://xml.org/sax/properties/declaration-handler",xth); try { reader.parse(new InputSource(in)); return xth.getResult(); @@ -274,26 +263,26 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { in.close(); } } - + private class ModulesTagHandler extends DefaultHandler2 { private StringBuilder buf = new StringBuilder(); private String loadedFrom = null; private VersionedResources versionedResources = null; private List result = null; - + public ModulesTagHandler(String loadedFrom) { this.loadedFrom = loadedFrom; this.result = new ArrayList(5); } - + public List getResult() { return result; } - + @Override public void startDocument() throws SAXException { } - + @Override public void startElement(String namespaceUri, String tag, String qName, Attributes attr) throws SAXException { if ("language".equals(tag)) { @@ -304,14 +293,14 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { logger.finest("Version attribute: " + version); } } - + @Override - public void endElement(String namespaceUri, String tag, String qName) throws SAXException { - + public void endElement(String namespaceUri, String tag,String qName) throws SAXException { + // Get and clear text String value = buf.toString(); buf = new StringBuilder(); - + // Skip root and language and non versions if ("modules".equals(tag)) { return; @@ -324,7 +313,7 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { if (versionedResources == null) { return; } - + if ("eld-resource".equals(tag)) { versionedResources.eldResources.add(value); } else if ("module-loader".equals(tag)) { @@ -336,7 +325,7 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { } logger.finest("Stored tag: " + tag + " value: " + value); } - + @Override public void characters(char[] ch, int start, int length) throws SAXException { String text = new String(ch, start, length).trim(); @@ -346,7 +335,7 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader { buf.append(text); } } - + protected class VersionedResources { public String version; public String loadedFrom; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageModule.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageModule.java index b1c7ef4..dfcf52c 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageModule.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageModule.java @@ -20,7 +20,8 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang; +package org.x4o.xml.lang; + /** * An DefaultElementLanguageModule. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageSession.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageSession.java index 9b26aa8..0ed305a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageSession.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageSession.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang; +package org.x4o.xml.lang; import org.x4o.xml.io.X4OConnectionException; import org.x4o.xml.lang.phase.X4OPhaseException; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageVersionFilter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageVersionFilter.java index a1ea037..3658f3a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageVersionFilter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageVersionFilter.java @@ -24,6 +24,7 @@ package org.x4o.xml.lang; import java.util.List; + /** * DefaultX4OLanguageVersionFilter makes best filter match attempt. * @@ -34,27 +35,26 @@ public class DefaultX4OLanguageVersionFilter implements X4OLanguageVersionFilter /** * Filters to the best version. - * * @see org.x4o.xml.lang.X4OLanguageVersionFilter#filterVersion(java.lang.String, java.util.List) * @return The perfect or best match or null if no match for requested language. - * @param requestVersion The language version to search for. - * @param versions The list of version to search in. + * @param requestVersion The language version to search for. + * @param versions The list of version to search in. */ public String filterVersion(String requestVersion, List versions) { - for (int i = 0; i < versions.size(); i++) { + for (int i=0;i 2) { - requestVersionDot = requestVersion.substring(0, requestVersion.length() - 2); + if (requestVersion.length()>2) { + requestVersionDot = requestVersion.substring(0,requestVersion.length()-2); } - for (int i = 0; i < versions.size(); i++) { + for (int i=0;i objectClass); - + Element createElementInstance(X4OLanguageSession context,Class objectClass); + /** * Gets all ElementBindingHandlers which are possible for parent. - * * @param parent The parent element object or class to search for. - * @return Returns an List with all ElementBindingHandler for the search. + * @return Returns an List with all ElementBindingHandler for the search. */ List findElementBindingHandlers(Object parent); - + /** * Gets all ElementBindingHandlers for parent and child combination. - * * @param parent The parent element object or class to search for. - * @param child The parent element object or class to search for. - * @return Returns an List with all ElementBindingHandler for the search pair. + * @param child The parent element object or class to search for. + * @return Returns an List with all ElementBindingHandler for the search pair. */ - List findElementBindingHandlers(Object parent, Object child); - + List findElementBindingHandlers(Object parent,Object child); + /** * Returns list of ElementInterfaces for an element. - * * @param object The element object or class to search for. - * @return The list of elementInterfaces. + * @return The list of elementInterfaces. */ List findElementInterfaces(Object object); - + /** * Returns the namespace context for an namespace uri. - * * @param namespaceUri the namespace uri. - * @return The ElementNamespace. + * @return The ElementNamespace. */ ElementNamespace findElementNamespace(String namespaceUri); - + /** * @return Returns a collection of element language modules in this defined and loaded language. */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageClassLoader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageClassLoader.java index bc8059d..0c6351c 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageClassLoader.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageClassLoader.java @@ -33,17 +33,16 @@ import java.net.URL; * @version 1.0 6 Aug 2012 */ public final class X4OLanguageClassLoader { - + /** * Made X4OLanguageClassLoader have private constructor. */ private X4OLanguageClassLoader() { } - + /** * Gets the thread classloader or the normal classloader. - * - * @return Returns the ClassLoader. + * @return Returns the ClassLoader. */ public static ClassLoader getClassLoader() { ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -52,74 +51,69 @@ public final class X4OLanguageClassLoader { } return cl; } - + /** - * Loads a Class from the ContextClassLoader and if that is not set, then uses the class of the String className instance. + * Loads a Class from the ContextClassLoader and if that is not set, then + * uses the class of the String className instance. * - * @param className The class name to load - * @return The loaded class - * @throws ClassNotFoundException if class not loaded. + * @param className The class name to load + * @return The loaded class + * @throws ClassNotFoundException if class not loaded. */ public static Class loadClass(String className) throws ClassNotFoundException { return getClassLoader().loadClass(className); } - + /** * Creates new instance of clazz. - * * @param resultType The result type to cast to.. - * @param clazz The class to make object from. - * @return The object of the clazz. - * @throws ClassNotFoundException On any construct access or invoke error. + * @param clazz The class to make object from. + * @return The object of the clazz. + * @throws ClassNotFoundException On any construct access or invoke error. */ @SuppressWarnings("unchecked") public static T newInstance(Class resultType, Class clazz) throws ClassNotFoundException { return (T) newInstance(clazz); } - + /** * Creates new instance of clazz. - * - * @param clazz The class to make object from. - * @return The object of the clazz. - * @throws ClassNotFoundException On any construct access or invoke error. + * @param clazz The class to make object from. + * @return The object of the clazz. + * @throws ClassNotFoundException On any construct access or invoke error. */ public static Object newInstance(Class clazz) throws ClassNotFoundException { try { return clazz.getConstructor().newInstance(); - } catch (IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | InstantiationException - | IllegalAccessException e) { + } catch (IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException e) { throw new ClassNotFoundException(e.getMessage(), e); } } - + /** * Creates new instance of className. - * - * @param className The className to create object from. - * @return The object of the className. - * @throws ClassNotFoundException When className is not found or can't be created. + * @param className The className to create object from. + * @return The object of the className. + * @throws ClassNotFoundException When className is not found or can't be created. */ public static Object newInstance(String className) throws ClassNotFoundException { return newInstance(loadClass(className)); } - + /** * Gets a resource from the classloader to an url. - * - * @param resourceName The resource to get from the classloader. - * @return The url to the resource or null if not found. + * @param resourceName The resource to get from the classloader. + * @return The url to the resource or null if not found. * @see java.lang.ClassLoader#getResource(String) */ public static URL getResource(String resourceName) { return getClassLoader().getResource(resourceName); } - + /** * Gets a resource from the classloader to an inputstream. - * - * @param resourceName The resource to get from the classloader. - * @return The inputstream to the resource or null if not found. + * @param resourceName The resource to get from the classloader. + * @return The inputstream to the resource or null if not found. * @see java.lang.ClassLoader#getResourceAsStream(String) */ public static InputStream getResourceAsStream(String resourceName) { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfiguration.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfiguration.java index 897f9e6..83ec7fe 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfiguration.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfiguration.java @@ -29,63 +29,52 @@ package org.x4o.xml.lang; * @version 1.0 27 Oct 2009 */ public interface X4OLanguageConfiguration { - + /** Prefix where we load all language definitions from. */ public static final String DEFAULT_LANG_PATH_PREFIX = "META-INF"; - + /** The modules file to startup the language definition process. */ public static final String DEFAULT_LANG_MODULES_FILE = "-modules.xml"; - + /** - * @return Returns the path prefix for loading language resources. + * @return Returns the path prefix for loading language resources. */ String getLanguageResourcePathPrefix(); - + /** - * @return Returns the filename (postfix) of the modules definition file. + * @return Returns the filename (postfix) of the modules definition file. */ String getLanguageResourceModulesFileName(); - + // Core interfaces are also in class for text reference without instance Class getDefaultElementNamespace(); - Class getDefaultElementInterface(); - Class getDefaultElement(); - Class getDefaultElementClass(); - Class getDefaultElementClassAttribute(); - + // Other needed interfaces in class form also Class getDefaultElementLanguageModule(); - Class getDefaultElementBodyComment(); - Class getDefaultElementBodyCharacters(); - Class getDefaultElementBodyWhitespace(); - Class getDefaultElementNamespaceInstanceProvider(); - Class getDefaultElementAttributeValueParser(); - Class getDefaultElementObjectPropertyValue(); - Class getDefaultElementNamespaceAttributeComparator(); - + /** - * @return Returns the X4OLanguageVersionFilter which filters the best version to use. + * @return Returns the X4OLanguageVersionFilter which filters the best version to use. */ Class getDefaultLanguageVersionFilter(); - + /** - * @return Returns the X4OLanguageLoader which loads languages into the element context. + * @return Returns the X4OLanguageLoader which loads languages into the element context. */ Class getDefaultLanguageLoader(); - + /** - * @return Returns the Expression Language Context which holds the el objects. + * @return Returns the Expression Language Context which holds the el objects. */ Class getDefaultExpressionLanguageContext(); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfigurationLocal.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfigurationLocal.java index 10b6e32..93bcaf1 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfigurationLocal.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfigurationLocal.java @@ -31,40 +31,26 @@ package org.x4o.xml.lang; public interface X4OLanguageConfigurationLocal extends X4OLanguageConfiguration { X4OLanguageConfiguration createProxy(); - + void setLanguageResourcePathPrefix(String value); - void setLanguageResourceModulesFileName(String value); - + void setDefaultElementNamespace(Class value); - void setDefaultElementInterface(Class value); - void setDefaultElement(Class value); - void setDefaultElementClass(Class value); - void setDefaultElementClassAttribute(Class value); - + void setDefaultElementLanguageModule(Class value); - void setDefaultElementBodyComment(Class value); - void setDefaultElementBodyCharacters(Class value); - void setDefaultElementBodyWhitespace(Class value); - void setDefaultElementNamespaceInstanceProvider(Class value); - void setDefaultElementAttributeValueParser(Class value); - void setDefaultElementObjectPropertyValue(Class value); - void setDefaultElementNamespaceAttributeComparator(Class value); - + void setDefaultLanguageVersionFilter(Class value); - void setDefaultLanguageLoader(Class value); - void setDefaultExpressionLanguageContext(Class value); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoader.java index c7f4fb6..342a165 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoader.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoader.java @@ -29,15 +29,14 @@ package org.x4o.xml.lang; * @version 1.0 28 Oct 2009 */ public interface X4OLanguageLoader { - + /** * Loads the language modules. - * - * @param session The session we run in. - * @param language The local Language to load for. - * @param languageName The language name to load. - * @param languageVersion The language version to load. - * @throws X4OLanguageLoaderException When there is an error. + * @param session The session we run in. + * @param language The local Language to load for. + * @param languageName The language name to load. + * @param languageVersion The language version to load. + * @throws X4OLanguageLoaderException When there is an error. */ void loadLanguage(X4OLanguageSession session, X4OLanguageLocal language, String languageName, String languageVersion) throws X4OLanguageLoaderException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoaderException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoaderException.java index e79adb1..26146ea 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoaderException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoaderException.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang; +package org.x4o.xml.lang; /** * Is throw when there is en Exception within an Element. @@ -29,10 +29,10 @@ package org.x4o.xml.lang; * @version 1.0 Oct 28, 2009 */ public class X4OLanguageLoaderException extends Exception { - + /** The serial version uid */ static final long serialVersionUID = 10L; - + /** * Constructs an X4OLanguageLoaderException without a detail message. */ @@ -42,29 +42,26 @@ public class X4OLanguageLoaderException extends Exception { /** * Constructs an X4OLanguageLoaderException with a detail message. - * - * @param message The message of this Exception + * @param message The message of this Exception */ public X4OLanguageLoaderException(String message) { super(message); } - + /** * Creates an X4OLanguageLoaderException from a parent exception. - * - * @param e The exception. + * @param e The exception. */ public X4OLanguageLoaderException(Exception e) { super(e); } - + /** * Constructs an X4OLanguageLoaderException with a detail message. - * - * @param message The message of this Exception - * @param e The exception. + * @param message The message of this Exception + * @param e The exception. */ - public X4OLanguageLoaderException(String message, Exception e) { - super(message, e); + public X4OLanguageLoaderException(String message,Exception e) { + super(message,e); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLocal.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLocal.java index cc92bdd..8fe4bca 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLocal.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLocal.java @@ -31,13 +31,12 @@ import org.x4o.xml.lang.phase.X4OPhaseException; * @version 1.0 30 apr 2013 */ public interface X4OLanguageLocal extends X4OLanguage { - + // TODO: refactor a bit more a this is now called manually on magic places void init(X4OLanguageSession session) throws X4OPhaseException; - + /** * Adds an X4OLanguageModule to this language. - * * @param languageModule The element language module to add. */ void addLanguageModule(X4OLanguageModule languageModule); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModule.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModule.java index 63d1b78..2b300c3 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModule.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModule.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang; +package org.x4o.xml.lang; import java.util.List; @@ -40,58 +40,52 @@ public interface X4OLanguageModule /* extends ElementMetaBase TODO add local lay // temp here see local String getId(); - String getDescription(); - + /** * @return the providerName. */ String getProviderName(); - + /** * @return the providerHost */ String getProviderHost(); - + /** * Gets all ElementBindingHandlers. - * - * @return Returns an List with all ElementBindingHandlers. + * @return Returns an List with all ElementBindingHandlers. */ List getElementBindingHandlers(); - + /** * Gets all ElementConfiguratorGlobals. - * - * @return All gloval ElementConfigurators. + * @return All gloval ElementConfigurators. */ List getElementConfiguratorGlobals(); - + /** * Returns list of ElementInterfaces in this context. - * - * @return The list of elementInterfaces. + * @return The list of elementInterfaces. */ List getElementInterfaces(); - + /** * Returns the namespace context for an namespace uri. - * * @param namespaceUri the namespace uri. - * @return The ElementNamespace. + * @return The ElementNamespace. */ ElementNamespace getElementNamespace(String namespaceUri); - + /** * @return Returns a list of all namespaces defined in this language. */ List getElementNamespaces(); - + /** - * Gets module loader meta result info. - * - * @param key The key to get info of. - * @return The value of the info. + * Gets module loader meta result info. + * @param key The key to get info of. + * @return The value of the info. */ String getLoaderResult(X4OLanguageModuleLoaderResult key); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoader.java index 25d6a7d..1279d05 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoader.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoader.java @@ -23,20 +23,20 @@ package org.x4o.xml.lang; /** - * X4OLanguageModuleLoader Loads all elements and other options into the X4OLanguageModule for the X4OLanguageLocal language. + * X4OLanguageModuleLoader Loads all elements and other options + * into the X4OLanguageModule for the X4OLanguageLocal language. * * @author Willem Cazander * @version 1.0 Jul 8, 2006 */ public interface X4OLanguageModuleLoader { - + /** * Starts the ElementProvider. - * - * @param session The session we run in. + * @param session The session we run in. * @param language The local Language to load for. - * @param module The language module to load it into. - * @throws X4OLanguageModuleLoaderException Gets thrown when modules could not be correctly loaded. + * @param module The language module to load it into. + * @throws X4OLanguageModuleLoaderException Gets thrown when modules could not be correctly loaded. */ void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal module) throws X4OLanguageModuleLoaderException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderException.java index 90e13be..e8b3b8d 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderException.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang; +package org.x4o.xml.lang; import org.x4o.xml.element.ElementException; @@ -32,35 +32,32 @@ import org.x4o.xml.element.ElementException; */ @SuppressWarnings("serial") public class X4OLanguageModuleLoaderException extends ElementException { - + private X4OLanguageModuleLoader elementLanguageModuleLoader = null; - + /** - * Creates module loader exception. - * - * @param elementLanguageModuleLoader The loader module which creates this exception. - * @param message The message of the exception. + * Creates module loader exception. + * @param elementLanguageModuleLoader The loader module which creates this exception. + * @param message The message of the exception. */ - public X4OLanguageModuleLoaderException(X4OLanguageModuleLoader elementLanguageModuleLoader, String message) { + public X4OLanguageModuleLoaderException(X4OLanguageModuleLoader elementLanguageModuleLoader,String message) { super(message); - this.elementLanguageModuleLoader = elementLanguageModuleLoader; + this.elementLanguageModuleLoader=elementLanguageModuleLoader; } - + /** - * Creates module loader exception. - * - * @param elementLanguageModuleLoader The loader module which creates this exception. - * @param message The message of the exception. - * @param exception The root cause of the exception. + * Creates module loader exception. + * @param elementLanguageModuleLoader The loader module which creates this exception. + * @param message The message of the exception. + * @param exception The root cause of the exception. */ - public X4OLanguageModuleLoaderException(X4OLanguageModuleLoader elementLanguageModuleLoader, String message, Exception exception) { - super(message, exception); - this.elementLanguageModuleLoader = elementLanguageModuleLoader; + public X4OLanguageModuleLoaderException(X4OLanguageModuleLoader elementLanguageModuleLoader,String message,Exception exception) { + super(message,exception); + this.elementLanguageModuleLoader=elementLanguageModuleLoader; } - + /** * Returns the module loader which created the exception. - * * @return Returns the module loader. */ public X4OLanguageModuleLoader getElementProvider() { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderResult.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderResult.java index 5d852d0..a67f390 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderResult.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderResult.java @@ -29,13 +29,11 @@ package org.x4o.xml.lang; * @version 1.0 Mar 7, 2014 */ public enum X4OLanguageModuleLoaderResult { - - //@formatter:off + LOAD_MODULE_RESOURCE, LOAD_FROM_RESOURCE, LOAD_VERSION, LOAD_CLASS, LOAD_TIME, LOAD_DATE; - //@formatter:on } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderSibling.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderSibling.java index 85627dd..49df662 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderSibling.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderSibling.java @@ -22,6 +22,8 @@ */ package org.x4o.xml.lang; + + /** * ElementLanguageModuleLoaderSibling provides sibling language loading support. * @@ -30,13 +32,12 @@ package org.x4o.xml.lang; * @version 1.0 Aug 7, 2012 */ public interface X4OLanguageModuleLoaderSibling extends X4OLanguageModuleLoader { - + /** * Loads in the sibling language. - * - * @param session The session we run in. + * @param session The session we run in. * @param language The local Language to load for. - * @param loader The loader to use to load the x4o languages. + * @param loader The loader to use to load the x4o languages. * @throws X4OLanguageLoaderException Gets thrown when there is an error loading the sibling language. */ void loadLanguageSibling(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageLoader loader) throws X4OLanguageLoaderException; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLocal.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLocal.java index 139fbde..9bf6860 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLocal.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLocal.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang; +package org.x4o.xml.lang; import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementConfiguratorGlobal; @@ -34,51 +34,46 @@ import org.x4o.xml.element.ElementNamespace; * @author Willem Cazander * @version 1.0 Mar 7, 2014 */ -public interface X4OLanguageModuleLocal extends X4OLanguageModule, ElementMetaBase { - +public interface X4OLanguageModuleLocal extends X4OLanguageModule,ElementMetaBase { + /** * @param providerName the providerName to set. */ void setProviderName(String providerName); - + /** * @param providerHost the providerHost to set */ void setProviderHost(String providerHost); - + /** * Adds an ElementBindingHanlder. - * - * @param elementBindingHandler The ElementBindingHandler to add. + * @param elementBindingHandler The ElementBindingHandler to add. */ void addElementBindingHandler(ElementBindingHandler elementBindingHandler); - + /** * Adds an ElementConfiguratorGlobal. - * - * @param elementConfigurator The ElementConfigurtor to add. + * @param elementConfigurator The ElementConfigurtor to add. */ void addElementConfiguratorGlobal(ElementConfiguratorGlobal elementConfigurator); - + /** * Adds an ElementInterface. - * - * @param elementInterface The elementInterface to add. + * @param elementInterface The elementInterface to add. */ void addElementInterface(ElementInterface elementInterface); - + /** * Adds an namespace to this langauge module. - * * @param elementNamespace Adds an ElementNamespace to this langauge module. */ void addElementNamespace(ElementNamespace elementNamespace); - + /** * Sets module loader meta result info. - * - * @param key The key of the info. - * @param value The value of the info. + * @param key The key of the info. + * @param value The value of the info. */ - void putLoaderResult(X4OLanguageModuleLoaderResult key, String value); + void putLoaderResult(X4OLanguageModuleLoaderResult key,String value); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java index 9242834..9b2873d 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang; +package org.x4o.xml.lang; import java.util.List; @@ -41,91 +41,85 @@ import org.x4o.xml.lang.phase.X4OPhase; * @version 1.0 Feb 14, 2007 */ public interface X4OLanguageSession extends AutoCloseable { - + /** - * @return Returns the language from which this session in created. + * @return Returns the language from which this session in created. */ X4OLanguage getLanguage(); - + /** * Gets the EL Context. - * - * @return Returns the ELContext. + * @return Returns the ELContext. */ ELContext getExpressionLanguageContext(); - + /** * Gets the ExpressionFactory. - * - * @return Returns the ExpressionFactory. + * @return Returns the ExpressionFactory. */ ExpressionFactory getExpressionLanguageFactory(); - + /** - * @return Returns the ElementAttributeValueParser. + * @return Returns the ElementAttributeValueParser. */ ElementAttributeValueParser getElementAttributeValueParser(); - + /** - * @return Returns the ElementObjectPropertyValue. + * @return Returns the ElementObjectPropertyValue. */ ElementObjectPropertyValue getElementObjectPropertyValue(); - + /** * Marks an (new) Element as dirty and run the phases from this start phase. * - * @param element The Element which needs the magic. + * @param element The Element which needs the magic. */ void addDirtyElement(Element element); /** * Get all Dirty Elements. - * - * @return Returns List with dirty elements. + * @return Returns List with dirty elements. */ List getDirtyElements(); - + /** * Returns the root Element which starts the xml tree. - * - * @return Returns the root element of the document instance we parse. + * @return Returns the root element of the document instance we parse. */ Element getRootElement(); - + /** * Sets the root element. - * - * @param element The root element to set. + * @param element The root element to set. */ void setRootElement(Element element); - + /** - * @return Returns null or an X4ODebugWriter to write parsing steps and debug data to. + * @return Returns null or an X4ODebugWriter to write parsing steps and debug data to. */ X4ODebugWriter getX4ODebugWriter(); - - /** - * @return Returns true if this config has a debug writer. + + /** + * @return Returns true if this config has a debug writer. */ boolean hasX4ODebugWriter(); - + /** * Returns the current X4OPhase of the parser. - * - * @return Returns the current phase. + * @return Returns the current phase. */ X4OPhase getPhaseCurrent(); - + /** - * @return Returns the phase this session will stop processing. + * @return Returns the phase this session will stop processing. */ String getPhaseStop(); - + /** - * @return Returns a list of phases we skip while processing. + * @return Returns a list of phases we skip while processing. */ List getPhaseSkip(); - + /** * Closes this language session */ diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java index 0b72c34..200c5ee 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang; +package org.x4o.xml.lang; import java.util.List; @@ -40,52 +40,49 @@ import org.x4o.xml.lang.phase.X4OPhaseListener; * @version 1.0 Oct 28, 2009 */ public interface X4OLanguageSessionLocal extends X4OLanguageSession { - + /** - * Returns list of phase listeners which where added to it. TODO: bad api here - * + * Returns list of phase listeners which where added to it. + * TODO: bad api here * @param phaseId The phaseId of for the listeners. * @return All X4OPhaseListeners. */ List storePhaseListeners(String phaseId); - + /** * Sets the EL Context. - * - * @param context The ELContext to set. + * @param context The ELContext to set. */ void setExpressionLanguageContext(ELContext context); - + /** * Sets the ExpressionFactory. - * - * @param expressionFactory The ExpressionFactory to set. + * @param expressionFactory The ExpressionFactory to set. */ void setExpressionLanguageFactory(ExpressionFactory expressionFactory); - + /** * @param elementAttributeValueParser The elementAttributeValueParser to set. */ void setElementAttributeValueParser(ElementAttributeValueParser elementAttributeValueParser); - + /** - * @param elementObjectPropertyValue The elementObjectPropertyValue to set. + * @param elementObjectPropertyValue The elementObjectPropertyValue to set. */ void setElementObjectPropertyValue(ElementObjectPropertyValue elementObjectPropertyValue); - + /** - * @param debugWriter The debug writer to set + * @param debugWriter The debug writer to set */ void setX4ODebugWriter(X4ODebugWriter debugWriter); - + /** * Sets the phase of the context. - * - * @param phase The current phase to set. + * @param phase The current phase to set. */ void setPhaseCurrent(X4OPhase phase); - + void setPhaseStop(String phaseId); - + void addPhaseSkip(String phaseId); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageVersionFilter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageVersionFilter.java index 588e2e2..1852522 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageVersionFilter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageVersionFilter.java @@ -31,13 +31,13 @@ import java.util.List; * @version 1.0 6 Aug 2012 */ public interface X4OLanguageVersionFilter { - + /** * Finds the version to load or returns null if no match is found. * - * @param languageVersion The languageVersion to requested. - * @param versions The versions provided by the module. - * @return The version to load. + * @param languageVersion The languageVersion to requested. + * @param versions The versions provided by the module. + * @return The version to load. */ - String filterVersion(String languageVersion, List versions); + String filterVersion(String languageVersion,List versions); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java index cf71368..b5b7489 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java @@ -30,6 +30,7 @@ import org.x4o.xml.element.AbstractElementNamespaceAttribute; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementConfiguratorException; + /** * Stores an ElementObject into the EL context. * @@ -43,23 +44,17 @@ public class ELIDAttributeHandler extends AbstractElementNamespaceAttribute { */ public void doConfigElement(Element element) throws ElementConfiguratorException { String attributeValue = element.getAttributes().get(getAttributeName()); - if (attributeValue == null) { - return; - } - if (element.getElementObject() == null) { + if(attributeValue==null) { return; } + if(element.getElementObject()==null) { if (this.isConfigAction()) { throw new NullPointerException("Can't bind null object to el context"); } this.setConfigAction(true); return; } - if (element.getElementObject() == null) { - throw new NullPointerException("Can't bind null object to el context"); - } - ValueExpression ee = element.getLanguageSession().getExpressionLanguageFactory().createValueExpression( - element.getLanguageSession().getExpressionLanguageContext(), "${" + attributeValue + "}", element.getElementObject().getClass()); - Logger.getLogger(ELIDAttributeHandler.class.getName()) - .finer("Set Variable in ELContext: " + "${" + attributeValue + "}" + " object SET: " + element.getElementObject()); + if(element.getElementObject()==null) { throw new NullPointerException("Can't bind null object to el context"); } + ValueExpression ee = element.getLanguageSession().getExpressionLanguageFactory().createValueExpression(element.getLanguageSession().getExpressionLanguageContext(),"${"+attributeValue+"}", element.getElementObject().getClass()); + Logger.getLogger(ELIDAttributeHandler.class.getName()).finer("Set Variable in ELContext: "+"${"+attributeValue+"}"+" object SET: "+element.getElementObject()); ee.setValue(element.getLanguageSession().getExpressionLanguageContext(), element.getElementObject()); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java index dd06963..ce15230 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java @@ -29,6 +29,7 @@ import javax.el.ValueExpression; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; + /** * An ELReferenceElement.
* Fills the ElementObject with an object from el. @@ -37,16 +38,13 @@ import org.x4o.xml.element.ElementException; * @version 1.0 Jan 23, 2007 */ public class ELReferenceElement extends AbstractElement { - + @Override public void doElementRun() throws ElementException { String attributeValue = getAttributes().get("el.ref"); - if ("".equals(attributeValue) | attributeValue == null) { - throw new ElementException("Set the el.ref attribute"); - } - ValueExpression ee = getLanguageSession().getExpressionLanguageFactory().createValueExpression(getLanguageSession().getExpressionLanguageContext(), - "${" + attributeValue + "}", Object.class); - Logger.getLogger(ELReferenceElement.class.getName()).finer("Get Variable in ELContext: ${" + attributeValue + "}"); + if("".equals(attributeValue) | attributeValue==null) { throw new ElementException("Set the el.ref attribute"); } + ValueExpression ee = getLanguageSession().getExpressionLanguageFactory().createValueExpression(getLanguageSession().getExpressionLanguageContext(),"${"+attributeValue+"}",Object.class); + Logger.getLogger(ELReferenceElement.class.getName()).finer("Get Variable in ELContext: ${"+attributeValue+"}"); setElementObject(ee.getValue(getLanguageSession().getExpressionLanguageContext())); - } + } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java index 324242f..8a5833e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java @@ -31,7 +31,7 @@ import org.x4o.xml.lang.X4OLanguageModuleLocal; import org.x4o.xml.lang.X4OLanguageSession; /** - * MetaLanguageSiblingLoader loads the generic x4o meta language into defined language. + * MetaLanguageSiblingLoader loads the generic x4o meta language into defined language. * * @author Willem Cazander * @version 1.0 Aug 7, 2012 @@ -40,19 +40,18 @@ public class MetaLanguageSiblingLoader implements X4OLanguageModuleLoaderSibling /** Defines the identifier of the meta x4o language. */ public static final String META_LANGUAGE = "meta"; - + /** Defines the version of the meta x4o language. */ public static final String META_LANGUAGE_VERSION = "1.0"; - + /** Defines the identifier of the meta x4o language host. */ public static final String META_LANGUAGE_HOST = "meta.x4o.org"; /** Defines the identifier of the meta x4o language host. */ public static final String META_LANGUAGE_DESCRIPTION = "X4O Meta XML Language Module."; - + @Override - public void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal module) - throws X4OLanguageModuleLoaderException { + public void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal module) throws X4OLanguageModuleLoaderException { module.setId(META_LANGUAGE); module.setProviderHost(META_LANGUAGE_HOST); module.setProviderName(MetaLanguageSiblingLoader.class.getSimpleName()); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MethodElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MethodElement.java index 358074c..47049ec 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MethodElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MethodElement.java @@ -28,6 +28,7 @@ import java.lang.reflect.Method; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; + /** * MethodElement invokes an method on a element object. * @@ -43,17 +44,17 @@ public class MethodElement extends AbstractElement { */ @Override public void doElementRun() throws ElementException { - if (getParent() == null) { + if (getParent()==null) { throw new IllegalStateException("need to have parent."); } Object parent = getParent().getElementObject(); - if (parent == null) { + if (parent==null) { throw new IllegalStateException("need to have parent ElementObject."); } String methodString = getAttributes().get("method"); Method[] ms = parent.getClass().getMethods(); try { - for (Method m : ms) { + for (Method m:ms) { if (methodString.equalsIgnoreCase(m.getName())) { m.invoke(parent); return; @@ -66,6 +67,6 @@ public class MethodElement extends AbstractElement { } catch (InvocationTargetException e) { throw new ElementException(e); } - throw new ElementException("could not find method on parent element object: " + methodString + " on; " + parent); + throw new ElementException("could not find method on parent element object: "+methodString+" on; "+parent); } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java index 130713f..f6a8dcc 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java @@ -35,7 +35,7 @@ public class ParentObjectElement extends AbstractElement { @Override public Object getElementObject() { - if (getParent() == null) { + if (getParent()==null) { return null; } return getParent().getElementObject(); @@ -43,7 +43,7 @@ public class ParentObjectElement extends AbstractElement { @Override public void setElementObject(Object object) { - if (getParent() == null) { + if (getParent()==null) { return; } getParent().setElementObject(object); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java index ceb1cca..ac86a7f 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java @@ -30,6 +30,7 @@ import org.x4o.xml.eld.lang.BeanElement; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; + /** * An PropertyElement.
* @@ -45,65 +46,65 @@ public class PropertyElement extends AbstractElement { @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public void doElementRun() throws ElementException { - - if (getParent().getElementObject() == null) { + + if (getParent().getElementObject()==null) { throw new IllegalStateException("need to have parent ElementObject"); } - + String name = getAttributes().get("key"); String valueString = getAttributes().get("value"); Object value = valueString; - - if (name == null) { + + if (name==null) { name = getAttributes().get("name"); } - if (name == null) { + if (name==null) { name = getAttributes().get("field"); } // convert value object try { - value = getLanguageSession().getElementAttributeValueParser().getParameterValue(name, valueString, this); + value = getLanguageSession().getElementAttributeValueParser().getParameterValue(name,valueString,this); } catch (ObjectConverterException ece) { throw new ElementException(ece); } - + if (getParent() instanceof BeanElement) { - BeanElement bean = (BeanElement) getParent(); + BeanElement bean = (BeanElement)getParent(); bean.addConstuctorArgument(value); return; } - - if (name == null) { + + if (name==null) { throw new IllegalStateException("Can't set properties without key."); } - + // check map interface if (getParent().getElementObject() instanceof Map) { - ((Map) getParent().getElementObject()).put(name, value); + ((Map)getParent().getElementObject()).put(name,value); return; } - + // check for setProperty(String,Object) method Method[] methodes = getParent().getElementObject().getClass().getMethods(); - for (int i = 0; i < methodes.length; i++) { - Method method = methodes[i]; + for (int i=0;i x4oPhases; - + /** * Constructor. */ public DefaultX4OPhaseManager() { x4oPhases = new ArrayList(25); } - /* -//@formatter:off +/* + PHASE_ORDER = { *startupX4OPhase, *createLanguagePhase, *createLanguageSiblingsPhase, @@ -63,9 +64,9 @@ PHASE_ORDER = { *startupX4OPhase, *releasePhase }; * = runOnce -//@formatter:on + */ - + public X4OPhase getPhase(String phaseName) { for (X4OPhase phase : x4oPhases) { if (phase.getId().equals(phaseName)) { @@ -74,7 +75,7 @@ PHASE_ORDER = { *startupX4OPhase, } return null; } - + public List getPhaseKeys() { List result = new ArrayList(x4oPhases.size()); for (X4OPhase phase : x4oPhases) { @@ -82,27 +83,25 @@ PHASE_ORDER = { *startupX4OPhase, } return result; } - + /** * Adds an X4OPhaseHandler. - * - * @param phase The X4OPhaseHandler to add. + * @param phase The X4OPhaseHandler to add. */ public void addX4OPhase(X4OPhase phase) { - if (phase == null) { + if (phase==null) { throw new NullPointerException("Can't add null phase handler."); } - // context is created in first phase. - // if (X4OPhase.FIRST_PHASE.equals(elementLanguage.getCurrentX4OPhase())==false) { + // context is created in first phase. + //if (X4OPhase.FIRST_PHASE.equals(elementLanguage.getCurrentX4OPhase())==false) { // throw new IllegalStateException("Can't add new phases after first phase is completed."); - // } + //} x4oPhases.add(phase); } - + /** * Returns all the X4OPhaseHandlers. - * - * @return Returns all X4OPhaseHandlers. + * @return Returns all X4OPhaseHandlers. */ public List getAllPhases() { return new ArrayList(x4oPhases); @@ -110,8 +109,7 @@ PHASE_ORDER = { *startupX4OPhase, /** * Returns all the X4OPhaseHandlers in ordered list. - * - * @return Returns all X4OPhaseHandler is order. + * @return Returns all X4OPhaseHandler is order. */ public List getOrderedPhases(X4OPhaseType type) { List result = new ArrayList(x4oPhases.size()); @@ -126,45 +124,44 @@ PHASE_ORDER = { *startupX4OPhase, /** * Runs all the phases in the right order. - * * @throws X4OPhaseException When a running handlers throws one. */ public void runPhases(X4OLanguageSession languageSession, X4OPhaseType type) throws X4OPhaseException { // convert to local for state changes X4OLanguageSessionLocal languageSessionLocal = X4OLanguageSessionLocal.class.cast(languageSession); - + // sort for the order List x4oPhasesOrder = getOrderedPhases(type); - + // debug output if (languageSession.getX4ODebugWriter() != null) { languageSession.getX4ODebugWriter().debugPhaseOrder(x4oPhasesOrder); } - + List phaseSkip = languageSession.getPhaseSkip(); String phaseStop = languageSession.getPhaseStop(); - + // run the phases in ordered order for (X4OPhase phase : x4oPhasesOrder) { - + if (phaseSkip.contains(phase.getId())) { continue; // skip phase when requested by context } - + // debug output languageSessionLocal.setPhaseCurrent(phase); - + // run listeners for (X4OPhaseListener l : languageSessionLocal.storePhaseListeners(phase.getId())) { l.preRunPhase(phase, languageSession); } - + // always run endRunPhase for valid debug xml try { // do the run interface phase.runPhase(languageSession); - - // run the element phase if possible + + // run the element phase if possible executePhaseRoot(languageSession, phase); } finally { // run the listeners again @@ -172,25 +169,24 @@ PHASE_ORDER = { *startupX4OPhase, l.endRunPhase(phase, languageSession); } } - + if (phaseStop != null && phaseStop.equals(phase.getId())) { return; // we are done } } } - + /** * Runs phase on single element. - * - * @param e The Element to process. - * @param p The phase to run. + * @param e The Element to process. + * @param p The phase to run. * @throws X4OPhaseException When a running handlers throws one. */ - public void runPhasesForElement(Element e, X4OPhaseType type, X4OPhase p) throws X4OPhaseException { + public void runPhasesForElement(Element e,X4OPhaseType type,X4OPhase p) throws X4OPhaseException { X4OLanguageSession languageSession = e.getLanguageSession(); List phaseSkip = languageSession.getPhaseSkip(); String phaseStop = languageSession.getPhaseStop(); - + // sort for the order List x4oPhasesOrder = getOrderedPhases(type); for (X4OPhase phase : x4oPhasesOrder) { @@ -200,25 +196,24 @@ PHASE_ORDER = { *startupX4OPhase, if (phaseSkip.contains(phase.getId())) { continue; // skip phase when requested by context } - + // set phase - ((X4OLanguageSessionLocal) languageSession).setPhaseCurrent(phase); - + ((X4OLanguageSessionLocal)languageSession).setPhaseCurrent(phase); + // do the run interface phase.runPhase(languageSession); - - // run the element phase if possible + + // run the element phase if possible executePhaseRoot(languageSession, phase); - + if (phaseStop != null && phaseStop.equals(phase.getId())) { return; // we are done } } } - + /** * Run release phase manual if auto release is disabled by config. - * * @throws X4OPhaseException When a running handlers throws one. */ public void doReleasePhaseManual(X4OLanguageSession languageSession) throws X4OPhaseException { @@ -232,15 +227,15 @@ PHASE_ORDER = { *startupX4OPhase, } if (releaseRequested == null) { return; // No manual release requested - // throw new IllegalStateException("No manual release requested."); + //throw new IllegalStateException("No manual release requested."); } if (languageSession.getRootElement() == null) { - return; // no root element , empty xml document ? + return; // no root element , empty xml document ? } if (languageSession.getRootElement().getElementClass() == null) { throw new IllegalStateException("Release phase has already been runned."); } - + X4OPhase h = null; for (X4OPhase phase : x4oPhases) { if (phase.getId().equals(releaseRequested)) { @@ -251,26 +246,26 @@ PHASE_ORDER = { *startupX4OPhase, if (h == null) { throw new IllegalStateException("No release phase found in manager to run."); } - + // set phase - ((X4OLanguageSessionLocal) languageSession).setPhaseCurrent(h); - + ((X4OLanguageSessionLocal)languageSession).setPhaseCurrent(h); + // do the run interface h.runPhase(languageSession); - - // run the element phase if possible + + // run the element phase if possible executePhaseRoot(languageSession, h); } - + class X4OPhaseComparator implements Comparator { /** * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(X4OPhase e1, X4OPhase e2) { - + String pid = e1.getId(); String[] dpids = e2.getPhaseDependencies(); - + for (int i = 0; i < dpids.length; i++) { String dpid = dpids[i]; if (pid.equals(dpid)) { @@ -278,35 +273,69 @@ PHASE_ORDER = { *startupX4OPhase, } } return 0; + + /* + if (p1==p2) { + return 0; + } + if (p1==X4OPhase.debugPhase) { + return 0; + } + if (p2==X4OPhase.debugPhase) { + return 0; + } + + int i1 = phaseOrder(p1); + int i2 = phaseOrder(p2); + + if (i1>i2) { + return 1; + } + if (i1 siblingLoaders = new ArrayList(2); - // mmmm think of better then cast public void addLanguageModuleLoaderSibling(X4OLanguageModuleLoaderSibling loader) { siblingLoaders.add(loader); } - public X4OPhaseType getType() { return X4OPhaseType.INIT; } - public String getId() { return INIT_LANG_SIB; } - public String[] getPhaseDependencies() { - return new String[] { INIT_LANG }; + return new String[] {INIT_LANG}; } - public boolean isElementPhase() { return false; } - public void runElementPhase(Element element) throws X4OPhaseException { } - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { try { - if (siblingLoaders.isEmpty() == false) { - X4OLanguageLoader loader = X4OLanguageClassLoader.newInstance(X4OLanguageLoader.class, - languageSession.getLanguage().getLanguageConfiguration().getDefaultLanguageLoader()); - X4OLanguageLocal language = (X4OLanguageLocal) languageSession.getLanguage(); - for (X4OLanguageModuleLoaderSibling siblingLoader : siblingLoaders) { + if (siblingLoaders.isEmpty()==false) { + X4OLanguageLoader loader = X4OLanguageClassLoader.newInstance(X4OLanguageLoader.class, languageSession.getLanguage().getLanguageConfiguration().getDefaultLanguageLoader()); + X4OLanguageLocal language = (X4OLanguageLocal)languageSession.getLanguage(); + for (X4OLanguageModuleLoaderSibling siblingLoader:siblingLoaders) { debugPhaseMessage(languageSession, "Loading sibling langauge loader: " + siblingLoader); siblingLoader.loadLanguageSibling(languageSession, language, loader); } @@ -172,11 +154,11 @@ public class X4OPhaseLanguageInit { siblingLoaders.clear(); } } catch (Exception e) { - throw new X4OPhaseException(this, e); + throw new X4OPhaseException(this,e); } } }; - + /** * Creates the X4OPhaseInitEnd which is a empty meta phase. */ @@ -184,22 +166,17 @@ public class X4OPhaseLanguageInit { public X4OPhaseType getType() { return X4OPhaseType.INIT; } - public String getId() { return INIT_END; } - public String[] getPhaseDependencies() { - return new String[] { INIT_LANG_SIB }; + return new String[]{INIT_LANG_SIB}; } - public boolean isElementPhase() { return false; } - public void runElementPhase(Element element) throws X4OPhaseException { } - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { logger.finest("Run init end phase"); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java index 15e1ea9..64f6281 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang.phase; +package org.x4o.xml.lang.phase; import java.util.ArrayList; import java.util.Collections; @@ -68,48 +68,48 @@ public class X4OPhaseLanguageRead { public static final String READ_RUN_DIRTY_LAST = "READ_RUN_DIRTY_LAST"; public static final String READ_END = "READ_END"; public static final String READ_RELEASE = "READ_RELEASE"; - + public X4OPhaseLanguageRead() { logger = Logger.getLogger(X4OPhaseLanguageRead.class.getName()); } - + public void createPhases(X4OPhaseManagerLocal manager) { - + // meta start point manager.addX4OPhase(new X4OPhaseReadBegin()); - + // config X4OPhaseReadRunConfigurator runConf = new X4OPhaseReadRunConfigurator(); manager.addX4OPhase(new X4OPhaseReadConfigElement(runConf)); manager.addX4OPhase(new X4OPhaseReadConfigElementInterface(runConf)); manager.addX4OPhase(new X4OPhaseReadConfigGlobalElement(runConf)); manager.addX4OPhase(new X4OPhaseReadConfigGlobalAttribute(runConf)); - + // run all attribute events manager.addX4OPhase(new X4OPhaseReadRunAttribute()); - + // templating manager.addX4OPhase(new X4OPhaseReadFillTemplate()); - + // transforming manager.addX4OPhase(new X4OPhaseReadTransform()); manager.addX4OPhase(new X4OPhaseReadRunDirty(manager)); - + // binding elements manager.addX4OPhase(new X4OPhaseReadBindElement()); - + // runing and releasing manager.addX4OPhase(new X4OPhaseReadRun()); manager.addX4OPhase(runConf); manager.addX4OPhase(new X4OPhaseReadRunDirtyLast(manager)); manager.addX4OPhase(new X4OPhaseReadEnd()); - + // after release phase Element Tree is not avible anymore manager.addX4OPhase(releasePhase()); - + // We are done } - + /** * Creates the startX4OPhase which is a empty meta phase. */ @@ -117,67 +117,57 @@ public class X4OPhaseLanguageRead { public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_BEGIN; } - public String[] getPhaseDependencies() { - return new String[] {}; + return new String[]{}; } - public boolean isElementPhase() { return false; } - public void runElementPhase(Element element) throws X4OPhaseException { // not used. } - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { // print the properties and classes for this language/config if (languageSession.hasX4ODebugWriter()) { try { - // languageSession.getX4ODebugWriter().debugLanguageProperties(languageSession); + //languageSession.getX4ODebugWriter().debugLanguageProperties(languageSession); languageSession.getX4ODebugWriter().debugLanguageDefaultClasses(languageSession); } catch (ElementException e) { - throw new X4OPhaseException(this, e); + throw new X4OPhaseException(this,e); } } } }; - + /** * X4OPhaseReadConfigElement */ class X4OPhaseReadConfigElement extends AbstractX4OPhase { private X4OPhaseReadRunConfigurator runConf = null; - public X4OPhaseReadConfigElement(X4OPhaseReadRunConfigurator runConf) { - this.runConf = runConf; + this.runConf=runConf; } - public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_CONFIG_ELEMENT; } - public String[] getPhaseDependencies() { - return new String[] { READ_BEGIN }; + return new String[] {READ_BEGIN}; } - public void runElementPhase(Element element) throws X4OPhaseException { - + // First phase is to rename attributes, maybe move so sax phase - for (ElementClassAttribute eca : element.getElementClass().getElementClassAttributes()) { + for (ElementClassAttribute eca:element.getElementClass().getElementClassAttributes()) { List aliases = eca.getAttributeAliases(); if (aliases.isEmpty()) { continue; } - for (String alias : aliases) { + for (String alias:aliases) { if (element.getAttributes().containsKey(alias)) { String attributeValue = element.getAttributes().get(alias); element.getAttributes().put(eca.getId(), attributeValue); @@ -185,138 +175,122 @@ public class X4OPhaseLanguageRead { } } } - - logger.finest("Do ElementClass Config Configurators: " + element.getElementClass().getElementConfigurators().size()); - for (ElementConfigurator ec : element.getElementClass().getElementConfigurators()) { - runConf.runElementConfigurator(ec, element, this); + + logger.finest("Do ElementClass Config Configurators: "+element.getElementClass().getElementConfigurators().size()); + for (ElementConfigurator ec:element.getElementClass().getElementConfigurators()) { + runConf.runElementConfigurator(ec,element,this); } } }; - + /** * X4OPhaseReadConfigElementInterface */ class X4OPhaseReadConfigElementInterface extends AbstractX4OPhase { private X4OPhaseReadRunConfigurator runConf = null; - public X4OPhaseReadConfigElementInterface(X4OPhaseReadRunConfigurator runConf) { - this.runConf = runConf; + this.runConf=runConf; } - public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_CONFIG_ELEMENT_INTERFACE; } - public String[] getPhaseDependencies() { - return new String[] { READ_CONFIG_ELEMENT }; + return new String[] {READ_CONFIG_ELEMENT}; } - public void runElementPhase(Element element) throws X4OPhaseException { - if (element.getElementObject() == null) { + if (element.getElementObject()==null) { logger.finest("Null elementObject skipping, interfaces"); return; } - for (ElementInterface ei : element.getLanguageSession().getLanguage().findElementInterfaces(element.getElementObject())) { - logger.finest("Do ElementInterface Config Configurators: " + ei.getElementConfigurators().size()); - for (ElementConfigurator ec : ei.getElementConfigurators()) { - runConf.runElementConfigurator(ec, element, this); + for (ElementInterface ei:element.getLanguageSession().getLanguage().findElementInterfaces(element.getElementObject())) { + logger.finest("Do ElementInterface Config Configurators: "+ei.getElementConfigurators().size()); + for (ElementConfigurator ec:ei.getElementConfigurators()) { + runConf.runElementConfigurator(ec,element,this); } } } }; - + /** * X4OPhaseReadConfigGlobalElement */ class X4OPhaseReadConfigGlobalElement extends AbstractX4OPhase { private X4OPhaseReadRunConfigurator runConf = null; - public X4OPhaseReadConfigGlobalElement(X4OPhaseReadRunConfigurator runConf) { - this.runConf = runConf; + this.runConf=runConf; } - public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_CONFIG_GLOBAL_ELEMENT; } - public String[] getPhaseDependencies() { - return new String[] { READ_CONFIG_ELEMENT, READ_CONFIG_ELEMENT_INTERFACE }; + return new String[] {READ_CONFIG_ELEMENT,READ_CONFIG_ELEMENT_INTERFACE}; } - public void runElementPhase(Element element) throws X4OPhaseException { - for (X4OLanguageModule mod : element.getLanguageSession().getLanguage().getLanguageModules()) { - logger.finest("Do Element Config Global Configurators: " + mod.getElementConfiguratorGlobals().size()); - for (ElementConfiguratorGlobal ec : mod.getElementConfiguratorGlobals()) { - runConf.runElementConfigurator(ec, element, this); + for (X4OLanguageModule mod:element.getLanguageSession().getLanguage().getLanguageModules()) { + logger.finest("Do Element Config Global Configurators: "+mod.getElementConfiguratorGlobals().size()); + for (ElementConfiguratorGlobal ec:mod.getElementConfiguratorGlobals()) { + runConf.runElementConfigurator(ec,element,this); } } } }; - + /** * X4OPhaseReadConfigGlobalAttribute */ class X4OPhaseReadConfigGlobalAttribute extends AbstractX4OPhase { Comparator elementNamespaceAttributeComparator = null; private X4OPhaseReadRunConfigurator runConf = null; - public X4OPhaseReadConfigGlobalAttribute(X4OPhaseReadRunConfigurator runConf) { - this.runConf = runConf; + this.runConf=runConf; } - public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_CONFIG_GLOBAL_ATTRIBUTE; } - public String[] getPhaseDependencies() { - return new String[] { READ_CONFIG_GLOBAL_ELEMENT }; + return new String[] {READ_CONFIG_GLOBAL_ELEMENT}; } - @SuppressWarnings("unchecked") public void runElementPhase(Element element) throws X4OPhaseException { - if (elementNamespaceAttributeComparator == null) { + if (elementNamespaceAttributeComparator==null) { try { - elementNamespaceAttributeComparator = (Comparator) X4OLanguageClassLoader - .newInstance(element.getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementNamespaceAttributeComparator()); + elementNamespaceAttributeComparator = (Comparator)X4OLanguageClassLoader.newInstance(element.getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementNamespaceAttributeComparator()); } catch (ClassNotFoundException e) { - throw new X4OPhaseException(this, e); + throw new X4OPhaseException(this,e); } } - + // do global parameters logger.finest("Do Element Global AttributeHandlers."); List handlers = new ArrayList(); - for (X4OLanguageModule mod : element.getLanguageSession().getLanguage().getLanguageModules()) { - for (ElementNamespace ns : mod.getElementNamespaces()) { - for (ElementNamespaceAttribute global : ns.getElementNamespaceAttributes()) { + for (X4OLanguageModule mod:element.getLanguageSession().getLanguage().getLanguageModules()) { + for (ElementNamespace ns:mod.getElementNamespaces()) { + for (ElementNamespaceAttribute global:ns.getElementNamespaceAttributes()) { String attribute = element.getAttributes().get(global.getAttributeName()); - if (attribute != null) { + if (attribute!=null) { handlers.add(global); } } } } - Collections.sort(handlers, elementNamespaceAttributeComparator); + Collections.sort(handlers,elementNamespaceAttributeComparator); List handlers2 = new ArrayList(handlers.size()); handlers2.addAll(handlers); - for (ElementConfigurator ec : handlers) { - runConf.runElementConfigurator(ec, element, this); + for (ElementConfigurator ec:handlers) { + runConf.runElementConfigurator(ec,element,this); } } }; - + /** * X4OPhaseReadRunAttribute */ @@ -324,78 +298,75 @@ public class X4OPhaseLanguageRead { public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_RUN_ATTRIBUTE; } - public String[] getPhaseDependencies() { - return new String[] { READ_CONFIG_GLOBAL_ATTRIBUTE }; + return new String[] {READ_CONFIG_GLOBAL_ATTRIBUTE}; } - public void runElementPhase(Element element) throws X4OPhaseException { // we only can config ElementObjects - if (element.getElementObject() == null) { + if (element.getElementObject()==null) { return; } - + // do config - Map attr = element.getAttributes(); + Map attr = element.getAttributes(); ElementAttributeValueParser attrParser = element.getLanguageSession().getElementAttributeValueParser(); Boolean autoAttributes = element.getElementClass().getAutoAttributes(); - if (autoAttributes == null) { + if (autoAttributes==null) { autoAttributes = true; } try { - for (String name : attr.keySet()) { - String valueString = (String) attr.get(name); - if (valueString == null) { + for (String name:attr.keySet()) { + String valueString = (String)attr.get(name); + if (valueString==null) { continue; } Object value = valueString; ElementClassAttribute attrClass = element.getElementClass().getElementClassAttributeByName(name); - if (attrClass != null) { - if (attrClass.getRunResolveEL() == null || attrClass.getRunResolveEL() && attrParser.isELParameter(name, valueString, element)) { + if (attrClass!=null) { + if (attrClass.getRunResolveEL()==null || attrClass.getRunResolveEL() && attrParser.isELParameter(name, valueString, element)) { value = attrParser.getELParameterValue(valueString, element); } - if (attrClass.getRunConverters() == null || attrClass.getRunConverters()) { + if (attrClass.getRunConverters()==null || attrClass.getRunConverters()) { value = attrParser.getConvertedParameterValue(name, value, element); } - if (attrClass.getRunBeanValue() == null || attrClass.getRunBeanValue()) { + if (attrClass.getRunBeanValue()==null || attrClass.getRunBeanValue()) { element.getLanguageSession().getElementObjectPropertyValue().setProperty(element.getElementObject(), name, value); } } else if (autoAttributes) { - - value = attrParser.getParameterValue(name, valueString, element); + + value = attrParser.getParameterValue(name,valueString,element); element.getLanguageSession().getElementObjectPropertyValue().setProperty(element.getElementObject(), name, value); - + } else { continue; // skip all non auto attribute non attribute defined xml attributes, or throw exception ? } } // check for defaults - for (ElementClassAttribute attrClass : element.getElementClass().getElementClassAttributes()) { - if (attrClass.getDefaultValue() != null && attr.containsKey(attrClass.getId()) == false) { + for (ElementClassAttribute attrClass:element.getElementClass().getElementClassAttributes()) { + if (attrClass.getDefaultValue()!=null && attr.containsKey(attrClass.getId())==false) { Object value = null; if (attrClass.getDefaultValue() instanceof String) { - value = attrParser.getParameterValue(attrClass.getId(), (String) attrClass.getDefaultValue(), element); + value = attrParser.getParameterValue(attrClass.getId(),(String)attrClass.getDefaultValue(),element); } else { value = attrClass.getDefaultValue(); } - if (attrClass.getRunBeanValue() == null || attrClass.getRunBeanValue()) { + if (attrClass.getRunBeanValue()==null || attrClass.getRunBeanValue()) { element.getLanguageSession().getElementObjectPropertyValue().setProperty(element.getElementObject(), attrClass.getId(), value); } } } } catch (ObjectConverterException oce) { - throw new X4OPhaseException(this, "Error while converting parameters: " + oce.getMessage(), oce); + throw new X4OPhaseException(this,"Error while converting parameters: "+oce.getMessage(),oce); } catch (ElementException e) { - throw new X4OPhaseException(this, "Error while setting parameters: " + e.getMessage(), e); + throw new X4OPhaseException(this,"Error while setting parameters: "+e.getMessage(),e); } } }; - + /** * X4OPhaseReadFillTemplate */ @@ -403,19 +374,16 @@ public class X4OPhaseLanguageRead { public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_FILL_TEMPLATE; } - public String[] getPhaseDependencies() { - return new String[] { READ_RUN_ATTRIBUTE }; + return new String[] {READ_RUN_ATTRIBUTE}; } - public void runElementPhase(Element element) throws X4OPhaseException { } }; - + /** * X4OPhaseReadTransform */ @@ -423,17 +391,14 @@ public class X4OPhaseLanguageRead { public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_TRANSFORM; } - public String[] getPhaseDependencies() { - return new String[] { READ_FILL_TEMPLATE }; + return new String[] {READ_FILL_TEMPLATE}; } - public void runElementPhase(Element element) throws X4OPhaseException { - if (element.isTransformingTree() == false) { + if (element.isTransformingTree()==false) { return; } try { @@ -442,33 +407,28 @@ public class X4OPhaseLanguageRead { } element.doElementRun(); } catch (ElementException e) { - throw new X4OPhaseException(this, e); + throw new X4OPhaseException(this,e); } } }; - + /** * X4OPhaseReadRunDirty */ class X4OPhaseReadRunDirty extends AbstractX4OPhase { private X4OPhaseManager phaseManager = null; - public X4OPhaseReadRunDirty(X4OPhaseManager phaseManager) { this.phaseManager = phaseManager; } - public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_RUN_DIRTY; } - public String[] getPhaseDependencies() { - return new String[] { READ_TRANSFORM }; + return new String[] {READ_TRANSFORM}; } - public void runElementPhase(Element element) throws X4OPhaseException { List dirtyElements = element.getLanguageSession().getDirtyElements(); if (dirtyElements.isEmpty()) { @@ -477,7 +437,7 @@ public class X4OPhaseLanguageRead { debugPhaseMessage(element.getLanguageSession(), "Dirty elements: " + dirtyElements.size()); X4OPhase p = phaseManager.getPhase(READ_BEGIN); for (Element e : dirtyElements) { - phaseManager.runPhasesForElement(e, getType(), p); + phaseManager.runPhasesForElement(e,getType(), p); } element.getLanguageSession().getDirtyElements().clear(); } @@ -488,23 +448,18 @@ public class X4OPhaseLanguageRead { */ class X4OPhaseReadRunDirtyLast extends AbstractX4OPhase { private X4OPhaseManager phaseManager = null; - public X4OPhaseReadRunDirtyLast(X4OPhaseManager phaseManager) { this.phaseManager = phaseManager; } - public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_RUN_DIRTY_LAST; } - public String[] getPhaseDependencies() { - return new String[] { READ_RUN }; + return new String[] {READ_RUN}; } - public void runElementPhase(Element element) throws X4OPhaseException { List dirtyElements = element.getLanguageSession().getDirtyElements(); if (dirtyElements.isEmpty()) { @@ -513,12 +468,12 @@ public class X4OPhaseLanguageRead { debugPhaseMessage(element.getLanguageSession(), "Dirty elements last: " + dirtyElements.size()); X4OPhase p = phaseManager.getPhase(READ_BEGIN); for (Element e : dirtyElements) { - phaseManager.runPhasesForElement(e, getType(), p); + phaseManager.runPhasesForElement(e,getType(), p); } element.getLanguageSession().getDirtyElements().clear(); } }; - + /** * X4OPhaseReadBindElement */ @@ -526,47 +481,44 @@ public class X4OPhaseLanguageRead { public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_BIND_ELEMENT; } - public String[] getPhaseDependencies() { - return new String[] { READ_RUN_DIRTY }; + return new String[] {READ_RUN_DIRTY}; } - public void runElementPhase(Element element) throws X4OPhaseException { Element parentElement = element.getParent(); - if (parentElement == null) { + if(parentElement==null) { logger.finest("No parent element, so no binding needed."); return; } Object parentObject = parentElement.getElementObject(); - if (parentObject == null) { + if(parentObject==null) { logger.finest("No parent object, so no binding needed."); return; } Object childObject = element.getElementObject(); - if (childObject == null) { + if (childObject==null) { logger.finest("No child object, so no binding needed."); return; } - + List binds = element.getLanguageSession().getLanguage().findElementBindingHandlers(parentObject, childObject); - logger.finest("Calling bindings handlers; " + binds.size()); + logger.finest("Calling bindings handlers; "+binds.size()); try { - for (ElementBindingHandler binding : binds) { + for (ElementBindingHandler binding:binds) { if (element.getLanguageSession().hasX4ODebugWriter()) { - element.getLanguageSession().getX4ODebugWriter().debugElementBindingHandler(binding, element); + element.getLanguageSession().getX4ODebugWriter().debugElementBindingHandler(binding,element); } binding.bindChild(element); } } catch (ElementException e) { - throw new X4OPhaseException(this, "Error while binding", e); + throw new X4OPhaseException(this,"Error while binding",e); } } }; - + /** * X4OPhaseReadRun */ @@ -574,101 +526,88 @@ public class X4OPhaseLanguageRead { public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_RUN; } - public String[] getPhaseDependencies() { - return new String[] { READ_BIND_ELEMENT }; + return new String[] {READ_BIND_ELEMENT}; } - public void runElementPhase(Element element) throws X4OPhaseException { if (element.isTransformingTree()) { return; // has already runned. } try { - // if (element.getlanguageSession().hasX4ODebugWriter()) { - // element.getlanguageSession().getX4ODebugWriter().debugElement(element); - // } + //if (element.getlanguageSession().hasX4ODebugWriter()) { + // element.getlanguageSession().getX4ODebugWriter().debugElement(element); + //} element.doElementRun(); } catch (ElementException e) { - throw new X4OPhaseException(this, e); + throw new X4OPhaseException(this,e); } } }; class X4OPhaseReadRunConfigurator extends AbstractX4OPhase { private List runConf = null; - protected X4OPhaseReadRunConfigurator() { runConf = new ArrayList(10); } - public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_RUN_CONFIGURATOR; } - public String[] getPhaseDependencies() { - return new String[] { READ_RUN }; + return new String[] {READ_RUN}; } - public boolean isElementPhase() { return false; } - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { - for (RunConfigurator conf : runConf) { + for (RunConfigurator conf:runConf) { try { if (languageSession.hasX4ODebugWriter()) { - languageSession.getX4ODebugWriter().debugElementConfigurator(conf.elementConfigurator, conf.element); + languageSession.getX4ODebugWriter().debugElementConfigurator(conf.elementConfigurator,conf.element); } conf.elementConfigurator.doConfigElement(conf.element); } catch (ElementException e) { - throw new X4OPhaseException(this, e); + throw new X4OPhaseException(this,e); } } } - @Override public void runElementPhase(Element element) throws X4OPhaseException { } - class RunConfigurator { Element element; ElementConfigurator elementConfigurator; - - RunConfigurator(Element element, ElementConfigurator elementConfigurator) { - this.element = element; - this.elementConfigurator = elementConfigurator; + RunConfigurator(Element element,ElementConfigurator elementConfigurator) { + this.element=element; + this.elementConfigurator=elementConfigurator; } } - - public void runElementConfigurator(ElementConfigurator ec, Element e, X4OPhase phase) throws X4OPhaseException { + public void runElementConfigurator(ElementConfigurator ec,Element e,X4OPhase phase) throws X4OPhaseException { if (ec.isConfigAction()) { - runConf.add(new RunConfigurator(e, ec)); + runConf.add(new RunConfigurator(e,ec)); return; } try { if (e.getLanguageSession().hasX4ODebugWriter()) { - e.getLanguageSession().getX4ODebugWriter().debugElementConfigurator(ec, e); + e.getLanguageSession().getX4ODebugWriter().debugElementConfigurator(ec,e); } ec.doConfigElement(e); - - // may request rerun of config + + // may request rerun of config if (ec.isConfigAction()) { - runConf.add(new RunConfigurator(e, ec)); + runConf.add(new RunConfigurator(e,ec)); } } catch (ElementException ee) { - throw new X4OPhaseException(phase, ee); + throw new X4OPhaseException(phase,ee); } } } - + /** * X4OPhaseReadEnd Is the read end phase. */ @@ -676,81 +615,87 @@ public class X4OPhaseLanguageRead { public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_END; } - public String[] getPhaseDependencies() { - return new String[] { READ_RUN_CONFIGURATOR }; + return new String[]{READ_RUN_CONFIGURATOR}; } - public boolean isElementPhase() { return false; } - public void runElementPhase(Element element) throws X4OPhaseException { // not used. } - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { // print the properties and classes for this language/config if (languageSession.hasX4ODebugWriter()) { try { languageSession.getX4ODebugWriter().debugLanguageDefaultClasses(languageSession); } catch (ElementException e) { - throw new X4OPhaseException(this, e); + throw new X4OPhaseException(this,e); } } } }; - + /** * - * @return The X4OPhaseHandler for this phase. + * @return The X4OPhaseHandler for this phase. */ public X4OPhase releasePhase() { - + // for debug output TODO: redo release counters /* - * class ReleasePhaseListener implements X4OPhaseListener { private int elementsReleased = 0; public void preRunPhase(X4OPhase phase,X4OLanguageSession - * languageSession) throws X4OPhaseException { elementsReleased=0; } public void endRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws - * X4OPhaseException { if (languageSession.hasX4ODebugWriter()==false) { return; } try { AttributesImpl atts = new AttributesImpl(); atts.addAttribute - * ("", "elements", "", "", elementsReleased+""); languageSession.getX4ODebugWriter().getContentWriter().startElement (X4ODebugWriter.DEBUG_URI, - * "executeReleases", "", atts); languageSession.getX4ODebugWriter().getContentWriter().endElement (X4ODebugWriter.DEBUG_URI, "executeReleases" , ""); } - * catch (SAXException e) { throw new X4OPhaseException(phase,e); } } - * - * public void addReleasedElement() { elementsReleased++; } } - */ - - // final ReleasePhaseListener releaseCounter = new ReleasePhaseListener(); + class ReleasePhaseListener implements X4OPhaseListener { + private int elementsReleased = 0; + public void preRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException { + elementsReleased=0; + } + public void endRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException { + if (languageSession.hasX4ODebugWriter()==false) { + return; + } + try { + AttributesImpl atts = new AttributesImpl(); + atts.addAttribute ("", "elements", "", "", elementsReleased+""); + languageSession.getX4ODebugWriter().getContentWriter().startElement (X4ODebugWriter.DEBUG_URI, "executeReleases", "", atts); + languageSession.getX4ODebugWriter().getContentWriter().endElement (X4ODebugWriter.DEBUG_URI, "executeReleases" , ""); + } catch (SAXException e) { + throw new X4OPhaseException(phase,e); + } + } + + public void addReleasedElement() { + elementsReleased++; + } + } + */ + + //final ReleasePhaseListener releaseCounter = new ReleasePhaseListener(); X4OPhase result = new AbstractX4OPhase() { public X4OPhaseType getType() { return X4OPhaseType.XML_READ; } - public String getId() { return READ_RELEASE; } - public String[] getPhaseDependencies() { - return new String[] { READ_END }; + return new String[] {READ_END}; } - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { } - - public void runElementPhase(Element element) throws X4OPhaseException { + public void runElementPhase(Element element) throws X4OPhaseException { try { element.release(); } catch (ElementException e) { - throw new X4OPhaseException(this, e); - } // finally { - // releaseCounter.addReleasedElement(); - // } + throw new X4OPhaseException(this,e); + }// finally { + // releaseCounter.addReleasedElement(); + //} } }; - // result.addPhaseListener(releaseCounter); + //result.addPhaseListener(releaseCounter); return result; } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageWrite.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageWrite.java index 82e2ff7..3c02cc1 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageWrite.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageWrite.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang.phase; +package org.x4o.xml.lang.phase; import java.util.logging.Logger; @@ -47,18 +47,18 @@ public class X4OPhaseLanguageWrite { public static final String WRITE_FILL_TREE = "WRITE_FILL_TREE"; public static final String WRITE_END = "WRITE_END"; public static final String WRITE_RELEASE = "WRITE_RELEASE"; - + public X4OPhaseLanguageWrite() { logger = Logger.getLogger(X4OPhaseLanguageWrite.class.getName()); } - + public void createPhases(X4OPhaseManagerLocal manager) { manager.addX4OPhase(new X4OPhaseWriteBegin()); manager.addX4OPhase(new X4OPhaseWriteFillTree()); manager.addX4OPhase(new X4OPhaseWriteEnd()); - // manager.addX4OPhase(new X4OPhaseWriteRelease()); + //manager.addX4OPhase(new X4OPhaseWriteRelease()); } - + /** * Creates the X4OPhaseWriteBegin which is a empty meta phase. */ @@ -66,27 +66,22 @@ public class X4OPhaseLanguageWrite { public X4OPhaseType getType() { return X4OPhaseType.XML_WRITE; } - public String getId() { return WRITE_BEGIN; } - public String[] getPhaseDependencies() { - return new String[] {}; + return new String[]{}; } - public boolean isElementPhase() { return false; } - public void runElementPhase(Element element) throws X4OPhaseException { } - - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { + public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { logger.finest("Run init begin phase"); } }; - + /** * Fills the element tree */ @@ -94,84 +89,77 @@ public class X4OPhaseLanguageWrite { public X4OPhaseType getType() { return X4OPhaseType.XML_WRITE; } - public String getId() { return WRITE_FILL_TREE; } - public String[] getPhaseDependencies() { - return new String[] { WRITE_BEGIN }; + return new String[]{WRITE_BEGIN}; } - public boolean isElementPhase() { return false; } - public void runElementPhase(Element element) throws X4OPhaseException { } - - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { + public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { try { Element root = languageSession.getRootElement(); // TODO: check for read tree then write support as ec is not null then .. - if (root.getElementClass() == null) { - root = fillElementTree(languageSession, root.getElementObject()); + if (root.getElementClass()==null) { + root = fillElementTree(languageSession,root.getElementObject()); } } catch (Exception e) { - throw new X4OPhaseException(this, e); + throw new X4OPhaseException(this,e); } } - - private Element fillElementTree(X4OLanguageSession languageSession, Object object) - throws ElementNamespaceInstanceProviderException, ElementBindingHandlerException { - Element element = findRootElement(languageSession, object.getClass()); + + private Element fillElementTree(X4OLanguageSession languageSession,Object object) throws ElementNamespaceInstanceProviderException, ElementBindingHandlerException { + Element element = findRootElement(languageSession,object.getClass()); element.setElementObject(object); languageSession.setRootElement(element); - - for (ElementBindingHandler bind : languageSession.getLanguage().findElementBindingHandlers(object)) { + + for (ElementBindingHandler bind:languageSession.getLanguage().findElementBindingHandlers(object)) { bind.createChilderen(element); - fillTree(languageSession, element); + fillTree(languageSession,element); } return element; } - - private void fillTree(X4OLanguageSession languageSession, Element element) - throws ElementNamespaceInstanceProviderException, ElementBindingHandlerException { - for (Element e : element.getChilderen()) { + + private void fillTree(X4OLanguageSession languageSession,Element element) throws ElementNamespaceInstanceProviderException, ElementBindingHandlerException { + for (Element e:element.getChilderen()) { Object object = e.getElementObject(); - for (ElementBindingHandler bind : languageSession.getLanguage().findElementBindingHandlers(object)) { + for (ElementBindingHandler bind:languageSession.getLanguage().findElementBindingHandlers(object)) { bind.createChilderen(e); - fillTree(languageSession, e); + fillTree(languageSession,e); } } } - - private Element findRootElement(X4OLanguageSession languageSession, Class objectClass) throws ElementNamespaceInstanceProviderException { + + private Element findRootElement(X4OLanguageSession languageSession,Class objectClass) throws ElementNamespaceInstanceProviderException { // redo this mess, add nice find for root - for (X4OLanguageModule modContext : languageSession.getLanguage().getLanguageModules()) { - for (ElementNamespace nsContext : modContext.getElementNamespaces()) { - if (nsContext.getLanguageRoot() != null && nsContext.getLanguageRoot()) { - for (ElementClass ec : nsContext.getElementClasses()) { - if (ec.getObjectClass() != null && ec.getObjectClass().equals(objectClass)) { + for (X4OLanguageModule modContext:languageSession.getLanguage().getLanguageModules()) { + for (ElementNamespace nsContext:modContext.getElementNamespaces()) { + if (nsContext.getLanguageRoot()!=null && nsContext.getLanguageRoot()) { + for (ElementClass ec:nsContext.getElementClasses()) { + if (ec.getObjectClass()!=null && ec.getObjectClass().equals(objectClass)) { return nsContext.getElementNamespaceInstanceProvider().createElementInstance(languageSession, ec.getId()); } } } } } - for (X4OLanguageModule modContext : languageSession.getLanguage().getLanguageModules()) { - for (ElementNamespace nsContext : modContext.getElementNamespaces()) { - for (ElementClass ec : nsContext.getElementClasses()) { - if (ec.getObjectClass() != null && ec.getObjectClass().equals(objectClass)) { + for (X4OLanguageModule modContext:languageSession.getLanguage().getLanguageModules()) { + for (ElementNamespace nsContext:modContext.getElementNamespaces()) { + for (ElementClass ec:nsContext.getElementClasses()) { + if (ec.getObjectClass()!=null && ec.getObjectClass().equals(objectClass)) { return nsContext.getElementNamespaceInstanceProvider().createElementInstance(languageSession, ec.getId()); } } } } - throw new IllegalArgumentException("Could not find ElementClass for: " + objectClass.getName()); + throw new IllegalArgumentException("Could not find ElementClass for: "+objectClass.getName()); } }; - + /** * Creates the X4OPhaseWriteEnd which is a empty meta phase. */ @@ -179,51 +167,42 @@ public class X4OPhaseLanguageWrite { public X4OPhaseType getType() { return X4OPhaseType.XML_WRITE; } - public String getId() { return WRITE_END; } - public String[] getPhaseDependencies() { - return new String[] { WRITE_FILL_TREE }; + return new String[]{WRITE_FILL_TREE}; } - public boolean isElementPhase() { return false; } - public void runElementPhase(Element element) throws X4OPhaseException { } - - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { + public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { logger.finest("Run init end phase"); } }; - + class X4OPhaseWriteRelease extends AbstractX4OPhase { public X4OPhaseType getType() { return X4OPhaseType.XML_WRITE; } - public String getId() { return WRITE_RELEASE; } - public String[] getPhaseDependencies() { - return new String[] { WRITE_END }; + return new String[] {WRITE_END}; } - public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException { } - - public void runElementPhase(Element element) throws X4OPhaseException { + public void runElementPhase(Element element) throws X4OPhaseException { try { element.release(); } catch (ElementException e) { - throw new X4OPhaseException(this, e); - } /* - * finally { releaseCounter.addReleasedElement(); } - */ + throw new X4OPhaseException(this,e); + }/* finally { + releaseCounter.addReleasedElement(); + }*/ } } } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseListener.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseListener.java index 8f6456f..d3faad4 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseListener.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseListener.java @@ -20,33 +20,33 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang.phase; +package org.x4o.xml.lang.phase; import org.x4o.xml.lang.X4OLanguageSession; + /** - * An X4OPhaseListener can be placed on an X4OPhaseHandler and is called before and after the phase has runned. + * An X4OPhaseListener can be placed on an X4OPhaseHandler and is called + * before and after the phase has runned. * * @author Willem Cazander * @version 1.0 Dec 31, 2008 */ public interface X4OPhaseListener { - + /** * Gets called before the X4OPhaseHandler is run. - * - * @param phase The phase to be run. - * @param languageSession The X4O language session of the driver. - * @throws X4OPhaseException Is throws when listeners has error. + * @param phase The phase to be run. + * @param languageSession The X4O language session of the driver. + * @throws X4OPhaseException Is throws when listeners has error. */ - void preRunPhase(X4OPhase phase, X4OLanguageSession languageSession) throws X4OPhaseException; - + void preRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException; + /** * Gets called after the X4OPhaseHandler is runned. - * - * @param phase The phase just run. - * @param languageSession The X4O language session of the driver. - * @throws X4OPhaseException Is throws when listeners has error. + * @param phase The phase just run. + * @param languageSession The X4O language session of the driver. + * @throws X4OPhaseException Is throws when listeners has error. */ - void endRunPhase(X4OPhase phase, X4OLanguageSession languageSession) throws X4OPhaseException; + void endRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManager.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManager.java index 567742e..6f47ed6 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManager.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManager.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang.phase; +package org.x4o.xml.lang.phase; import java.util.List; @@ -28,49 +28,45 @@ import org.x4o.xml.element.Element; import org.x4o.xml.lang.X4OLanguageSession; /** - * X4OPhaseManager stores the X4OPhaseHandler and puts them in the right order. And will execute the phases when runPhases is called. + * X4OPhaseManager stores the X4OPhaseHandler and puts them in the right order. + * And will execute the phases when runPhases is called. * * @author Willem Cazander * @version 1.0 Jan 6, 2008 */ public interface X4OPhaseManager { - + /** * Gets an X4OPhase object by the phaseName. - * - * @param phaseName The phaseName to lookup. - * @return The X4OPhase requested or null. + * @param phaseName The phaseName to lookup. + * @return The X4OPhase requested or null. */ X4OPhase getPhase(String phaseName); - + /** * Gets all the keys of the phases registrated whith this phase manager. - * - * @return The phase keys. + * @return The phase keys. */ List getPhaseKeys(); - + /** - * Runs release phase if it was requested not to run it automaticly. - * - * @param languageSession The session to release. + * Runs release phase if it was requested not to run it automaticly. + * @param languageSession The session to release. * @throws X4OPhaseException When a running handlers throws one. */ void doReleasePhaseManual(X4OLanguageSession languageSession) throws X4OPhaseException; - + /** * Runs all the phases in the right order. - * * @throws X4OPhaseException When a running handlers throws one. */ - void runPhases(X4OLanguageSession elementContext, X4OPhaseType type) throws X4OPhaseException; - + void runPhases(X4OLanguageSession elementContext,X4OPhaseType type) throws X4OPhaseException; + /** * Runs phase on single element. - * - * @param e The Element to process. - * @param p The phase to run. + * @param e The Element to process. + * @param p The phase to run. * @throws X4OPhaseException When a running handlers throws one. */ - void runPhasesForElement(Element e, X4OPhaseType type, X4OPhase p) throws X4OPhaseException; + void runPhasesForElement(Element e,X4OPhaseType type,X4OPhase p) throws X4OPhaseException; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManagerLocal.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManagerLocal.java index 98e1d43..6885d61 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManagerLocal.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManagerLocal.java @@ -20,15 +20,16 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang.phase; +package org.x4o.xml.lang.phase; + /** - * X4OPhaseManagerLocal has the local config methods. + * X4OPhaseManagerLocal has the local config methods. * * @author Willem Cazander * @version 1.0 Mrt 8, 2014 */ public interface X4OPhaseManagerLocal extends X4OPhaseManager { - + void addX4OPhase(X4OPhase phase); } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseType.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseType.java index 2027129..eabd02e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseType.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseType.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang.phase; +package org.x4o.xml.lang.phase; /** * X4OPhaseType defines which phase type there are to put phases in to execute. @@ -29,13 +29,13 @@ package org.x4o.xml.lang.phase; * @version 1.0 Apr 30, 2013 */ public enum X4OPhaseType { - + /** Language init. */ INIT, - + /** XML Reading. */ XML_READ, - + /** XML Writing. */ XML_WRITE; } diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java index 9199fd6..01bca15 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.lang.task; +package org.x4o.xml.lang.task; import java.util.List; @@ -38,27 +38,27 @@ public abstract class AbstractX4OLanguageTask implements X4OLanguageTask { private final String name; private final String description; private final SAX3PropertyConfig propertyConfig; - - public AbstractX4OLanguageTask(String id, SAX3PropertyConfig propertyConfig) { - this(id, id, id, propertyConfig); + + public AbstractX4OLanguageTask(String id,SAX3PropertyConfig propertyConfig) { + this(id,id,id,propertyConfig); } - - public AbstractX4OLanguageTask(String id, String name, String description, SAX3PropertyConfig propertyConfig) { - this.id = id; - this.name = name; - this.description = description; - this.propertyConfig = propertyConfig; + + public AbstractX4OLanguageTask(String id,String name,String description,SAX3PropertyConfig propertyConfig) { + this.id=id; + this.name=name; + this.description=description; + this.propertyConfig=propertyConfig; } - + protected abstract X4OLanguageTaskExecutor createTaskExecutorChecked(SAX3PropertyConfig config); - + /** * @see org.x4o.xml.lang.task.X4OLanguageTask#createTaskExecutor(org.x4o.sax3.io.SAX3PropertyConfig) */ public X4OLanguageTaskExecutor createTaskExecutor(SAX3PropertyConfig config) { return createTaskExecutorChecked(checkConfig(config)); } - + private SAX3PropertyConfig checkConfig(SAX3PropertyConfig config) { List keys = config.getPropertyKeysRequiredValues(); if (keys.isEmpty()) { @@ -66,39 +66,39 @@ public abstract class AbstractX4OLanguageTask implements X4OLanguageTask { } StringBuilder buf = new StringBuilder(100); buf.append("Error missing value(s) for key(s) {"); - for (int i = 0; i < keys.size(); i++) { + for (int i=0;i driver = null; private X4OLanguageTask task = null; private SAX3PropertyConfig config = null; - + public static void main(String[] argu) { X4OTaskCommandLine cmd = new X4OTaskCommandLine(); cmd.parseCommandLine(argu); cmd.executeCommandLine(); } - + private X4OTaskCommandLine() { } - + private void parseCommandLine(String[] argu) { List arguList = Arrays.asList(argu); viewHelp(arguList); @@ -71,45 +71,45 @@ public class X4OTaskCommandLine { findProperties(arguList.iterator()); checkConfig(); } - + private void executeCommandLine() { try { long startTime = System.currentTimeMillis(); executeLanguageTask(); - long totalTime = System.currentTimeMillis() - startTime; - System.out.println("Succesfully executed task: " + task.getId() + " in " + totalTime + " ms."); + long totalTime = System.currentTimeMillis()-startTime; + System.out.println("Succesfully executed task: "+task.getId()+" in "+totalTime+" ms."); } catch (Exception e) { - System.err.println("Error while executing task: " + e.getMessage()); + System.err.println("Error while executing task: "+e.getMessage()); e.printStackTrace(); System.exit(1); } } - + private void executeLanguageTask() throws X4OLanguageTaskException { X4OLanguage language = driver.createLanguage(); // TODO: also add support for version select X4OTaskRunner.runTaskLanguage(task, language, config); } - + private void systemErrExit(String message) { System.err.println(message); System.exit(1); return; } - + private void checkConfig() { Collection keys = config.getPropertyKeysRequiredValues(); if (keys.isEmpty()) { return; } System.err.println("Missing properties;"); - for (String key : keys) { - System.err.println(" - " + key); + for (String key:keys) { + System.err.println(" - "+key); } System.exit(1); } - + private void viewHelp(List argu) { - for (String arg : argu) { + for (String arg:argu) { if ("-help".equals(arg) || "-h".equals(arg)) { System.out.println("X4O Language Task Command Line Usage;"); System.out.println("-languages (-l) = Selects langauge."); @@ -131,13 +131,13 @@ public class X4OTaskCommandLine { } } } - + private void viewListings(List argu) { - for (String arg : argu) { + for (String arg:argu) { if ("-list-languages".equals(arg) || "-ll".equals(arg)) { System.out.println("X4O Languages;"); - for (String language : X4ODriverManager.getX4OLanguages()) { - System.out.println("- " + language); + for (String language:X4ODriverManager.getX4OLanguages()) { + System.out.println("- "+language); } System.out.println(); System.exit(0); @@ -146,14 +146,14 @@ public class X4OTaskCommandLine { if ("-list-language-tasks".equals(arg) || "-llt".equals(arg)) { System.out.println("X4O Language Tasks;"); int prefix = 12; - for (X4OLanguageTask task : X4ODriverManager.getX4OLanguageTasks()) { + for (X4OLanguageTask task:X4ODriverManager.getX4OLanguageTasks()) { int lId = task.getId().length(); System.out.print(task.getId()); - for (int i = 0; i < prefix - lId; i++) { + for (int i=0;i arguIterator) { - if (task == null) { + if (task==null) { return; } while (arguIterator.hasNext()) { String arg = arguIterator.next(); if ("-list-keys".equals(arg) || "-lk".equals(arg)) { - System.out.println(task.getName() + " config keys;"); + System.out.println(task.getName()+" config keys;"); SAX3PropertyConfig config = task.createTaskConfig(); - for (String key : config.getPropertyKeys()) { + for (String key:config.getPropertyKeys()) { Class keyType = config.getPropertyType(key); Object valueDefault = config.getPropertyDefault(key); String def = ""; - if (valueDefault != null) { - def = "(default=\"" + unescapeDefault(valueDefault.toString()) + "\")"; + if (valueDefault!=null) { + def = "(default=\""+unescapeDefault(valueDefault.toString())+"\")"; } if (config.isPropertyRequired(key)) { def = "(required=\"true\")"; } - System.out.println(String.format("%1$-65s - %2$-8s %3$s", key, keyType.getSimpleName(), def)); + System.out.println(String.format("%1$-65s - %2$-8s %3$s", key,keyType.getSimpleName(),def)); } System.out.println(); System.exit(0); @@ -192,101 +192,98 @@ public class X4OTaskCommandLine { } } } - + private String unescapeDefault(String defaultValue) { - StringBuilder buf = new StringBuilder(defaultValue.length() + 10); - for (char c : defaultValue.toCharArray()) { - if (c == '\n') { - buf.append("\\n"); - continue; + StringBuilder buf = new StringBuilder(defaultValue.length()+10); + for (char c:defaultValue.toCharArray()) { + if (c=='\n') { + buf.append("\\n");continue; } - if (c == '\t') { - buf.append("\\t"); - continue; + if (c=='\t') { + buf.append("\\t");continue; } - if (c == '\r') { - buf.append("\\r"); - continue; + if (c=='\r') { + buf.append("\\r");continue; } buf.append(c); } return buf.toString(); } - + private void findDriver(Iterator arguIterator) { while (arguIterator.hasNext()) { String arg = arguIterator.next(); if ("-language".equals(arg) || "-l".equals(arg)) { - if (arguIterator.hasNext() == false) { - systemErrExit("No argument for " + arg + " given."); + if (arguIterator.hasNext()==false) { + systemErrExit("No argument for "+arg+" given."); } String languageName = arguIterator.next(); driver = X4ODriverManager.getX4ODriver(languageName); break; } } - if (driver == null) { + if (driver==null) { systemErrExit("No -language or -l argument with language given."); } } - + private void findTask(Iterator arguIterator) { while (arguIterator.hasNext()) { String arg = arguIterator.next(); if ("-task".equals(arg) || "-t".equals(arg)) { - if (arguIterator.hasNext() == false) { - systemErrExit("No argument for " + arg + " given."); + if (arguIterator.hasNext()==false) { + systemErrExit("No argument for "+arg+" given."); } String taskId = arguIterator.next(); task = driver.getLanguageTask(taskId); break; } } - if (task == null) { + if (task==null) { systemErrExit("No -task or -t argument with task given."); } } - + private void findProperties(Iterator arguIterator) { config = task.createTaskConfig(); while (arguIterator.hasNext()) { String arg = arguIterator.next(); if ("-property".equals(arg) || "-p".equals(arg)) { - if (arguIterator.hasNext() == false) { - systemErrExit("No argument for " + arg + " given."); + if (arguIterator.hasNext()==false) { + systemErrExit("No argument for "+arg+" given."); } String valuePair = arguIterator.next(); String[] values = valuePair.split("="); - if (values.length == 1) { - systemErrExit("No property value given for key " + valuePair); + if (values.length==1) { + systemErrExit("No property value given for key "+valuePair); } - config.setPropertyParsedValue(values[0], values[1]); + config.setPropertyParsedValue(values[0],values[1]); } } } - + private void loadFileProperties(Iterator arguIterator) { while (arguIterator.hasNext()) { String arg = arguIterator.next(); if ("-load-props".equals(arg) || "-lp".equals(arg)) { - if (arguIterator.hasNext() == false) { - systemErrExit("No argument for " + arg + " given."); + if (arguIterator.hasNext()==false) { + systemErrExit("No argument for "+arg+" given."); } - loadProperties(arguIterator.next(), false); + loadProperties(arguIterator.next(),false); } if ("-load-props-xml".equals(arg) || "-lpx".equals(arg)) { - if (arguIterator.hasNext() == false) { - systemErrExit("No argument for " + arg + " given."); + if (arguIterator.hasNext()==false) { + systemErrExit("No argument for "+arg+" given."); } - loadProperties(arguIterator.next(), true); + loadProperties(arguIterator.next(),true); } } } - - private void loadProperties(String file, boolean isXml) { + + private void loadProperties(String file,boolean isXml) { File propFile = new File(file); if (!propFile.exists()) { - systemErrExit("File does not exsits; " + propFile); + systemErrExit("File does not exsits; "+propFile); } Properties p = new Properties(); InputStream in = null; @@ -297,13 +294,13 @@ public class X4OTaskCommandLine { } else { p.load(in); } - for (Object keyObj : p.keySet()) { + for (Object keyObj:p.keySet()) { String key = keyObj.toString(); String value = p.getProperty(key); config.setPropertyParsedValue(key, value); } } catch (IOException e) { - systemErrExit("Fatal-Error: " + e.getMessage()); + systemErrExit("Fatal-Error: "+e.getMessage()); } finally { try { in.close(); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskProperty.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskProperty.java index c8ac5da..5466242 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskProperty.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskProperty.java @@ -29,60 +29,59 @@ package org.x4o.xml.lang.task.run; * @version 1.0 Aug 30, 2013 */ public class X4OTaskProperty { - + /** The key of the property. */ private String key = null; - + /** The value of the property. */ private String value = null; - + /** * @return the key. */ public String getKey() { return key; } - + /** * @param key the key to set. */ public void setKey(String key) { this.key = key; } - + /** * @return the value. */ public String getValue() { return value; } - + /** * @param value the value to set. */ public void setValue(String value) { this.value = value; } - + /** * Parsed line like 'key=value' into a X4OTaskProperty object. - * - * @param line The text line to parse. - * @return The filled X4OTaskProperty. + * @param line The text line to parse. + * @return The filled X4OTaskProperty. */ static public X4OTaskProperty parseLine(String line) { - if (line == null) { + if (line==null) { throw new NullPointerException("Can't parse null line."); } int idx = line.indexOf('='); - if (idx < 0) { + if (idx<0) { throw new IllegalArgumentException("Can't parse line with '=' sign."); } - if (idx == line.length()) { + if (idx==line.length()) { throw new IllegalArgumentException("Can't parse line empty value."); } - String key = line.substring(0, idx); - String value = line.substring(idx + 1); + String key = line.substring(0,idx); + String value = line.substring(idx+1); X4OTaskProperty result = new X4OTaskProperty(); result.setKey(key); result.setValue(value); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java index dbbf5ad..f1fab44 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java @@ -37,7 +37,8 @@ import org.x4o.xml.lang.task.X4OLanguageTaskException; import org.x4o.xml.lang.task.X4OLanguageTaskExecutor; /** - * X4OTaskRunner finds all x4o objects and configs and then run the x4o langauge task. + * X4OTaskRunner finds all x4o objects and configs and then run the x4o langauge + * task. * * @author Willem Cazander * @version 1.0 Aug 30, 2013 diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/X4ODriverManagerTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/X4ODriverManagerTest.java index 6952192..2d14abe 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/X4ODriverManagerTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/X4ODriverManagerTest.java @@ -38,28 +38,28 @@ import org.x4o.xml.lang.X4OLanguageSessionLocal; * @version 1.0 Jul 24, 2006 */ public class X4ODriverManagerTest { - + @Test public void testDefaultLanguageVersionSelect() throws Exception { - String version = X4ODriverManager.getDefaultLanguageVersion(new String[] { "1.0", "2.0", "3.0" }); + String version = X4ODriverManager.getDefaultLanguageVersion(new String[]{"1.0","2.0","3.0"}); Assertions.assertNotNull(version); - Assertions.assertEquals("3.0", version); + Assertions.assertEquals("3.0",version); } - + @Test public void testDefaultLanguageVersionEmpty() throws Exception { - String version = X4ODriverManager.getDefaultLanguageVersion(new String[] {}); + String version = X4ODriverManager.getDefaultLanguageVersion(new String[]{}); Assertions.assertNotNull(version); - Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION, version); + Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION,version); } - + @Test public void testDefaultLanguageVersionNull() throws Exception { String version = X4ODriverManager.getDefaultLanguageVersion(null); Assertions.assertNotNull(version); - Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION, version); + Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION,version); } - + @Test public void testLanguageNull() throws Exception { String language = null; @@ -73,7 +73,7 @@ public class X4ODriverManagerTest { Assertions.assertEquals(NullPointerException.class, e.getClass()); Assertions.assertTrue(e.getMessage().contains("language")); } - + @Test public void testLanguageEmpty() throws Exception { String language = ""; @@ -87,7 +87,7 @@ public class X4ODriverManagerTest { Assertions.assertEquals(IllegalArgumentException.class, e.getClass()); Assertions.assertTrue(e.getMessage().contains("language"), "Error message string is missing language"); } - + @Test public void testLanguageVersionNonExcisting() throws Exception { String languageTest = "test"; @@ -101,23 +101,26 @@ public class X4ODriverManagerTest { e = catchE; } Assertions.assertNotNull(e); - /* - * TODO assertNotNull(e); assertNotNull(e.getCause()); assertNotNull(e.getCause().getCause()); assertEquals(X4OPhaseException.class, - * e.getCause().getClass()); assertEquals(X4OLanguageLoaderException.class, e.getCause().getCause().getClass()); - * assertTrue("Error message string is missing language",e.getMessage().contains("language")); - * assertTrue("Error message string is missing test",e.getMessage().contains("test")); - * assertTrue("Error message string is missing modules",e.getMessage().contains("modules")); - * assertTrue("Error message string is missing 2.0",e.getMessage().contains("2.0")); - */ + /* TODO + assertNotNull(e); + assertNotNull(e.getCause()); + assertNotNull(e.getCause().getCause()); + assertEquals(X4OPhaseException.class, e.getCause().getClass()); + assertEquals(X4OLanguageLoaderException.class, e.getCause().getCause().getClass()); + assertTrue("Error message string is missing language",e.getMessage().contains("language")); + assertTrue("Error message string is missing test",e.getMessage().contains("test")); + assertTrue("Error message string is missing modules",e.getMessage().contains("modules")); + assertTrue("Error message string is missing 2.0",e.getMessage().contains("2.0")); + */ } - + @Test public void testLanguageCount() throws Exception { List languages = X4ODriverManager.getX4OLanguages(); Assertions.assertNotNull(languages); Assertions.assertFalse(languages.isEmpty()); } - + @Test public void testLanguageNames() throws Exception { List languages = X4ODriverManager.getX4OLanguages(); @@ -126,17 +129,17 @@ public class X4ODriverManagerTest { Assertions.assertTrue(languages.contains("eld"), "eld language is missing"); Assertions.assertTrue(languages.contains("test"), "test language is missing"); } - + @Test public void testLanguagesLoopSpeed() throws Exception { long startTime = System.currentTimeMillis(); - for (int i = 0; i < 100; i++) { + for (int i=0;i<100;i++) { testLanguageCount(); } long loopTime = System.currentTimeMillis() - startTime; - Assertions.assertEquals(true, loopTime < 500, "Language list loop is slow;" + loopTime); + Assertions.assertEquals(true, loopTime<500, "Language list loop is slow;"+loopTime); } - + @Test public void testRegisterDriverNull() throws Exception { Exception e = null; @@ -149,22 +152,15 @@ public class X4ODriverManagerTest { Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } - + @Test public void testRegisterDriverNameNull() throws Exception { Exception e = null; try { X4ODriverManager.registerX4ODriver(new X4ODriver() { - @Override - public String[] getLanguageVersions() { - return new String[] { "1.0" }; - } - - @Override - public String getLanguageName() { - return null; - } - + @Override public String[] getLanguageVersions() { return new String[]{"1.0"}; } + @Override public String getLanguageName() { return null; } + }); } catch (Exception catchE) { e = catchE; @@ -173,22 +169,15 @@ public class X4ODriverManagerTest { Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } - + @Test public void testRegisterDriverNameEmpty() throws Exception { Exception e = null; try { X4ODriverManager.registerX4ODriver(new X4ODriver() { - @Override - public String[] getLanguageVersions() { - return new String[] { "1.0" }; - } - - @Override - public String getLanguageName() { - return ""; - } - + @Override public String[] getLanguageVersions() { return new String[]{"1.0"}; } + @Override public String getLanguageName() { return ""; } + }); } catch (Exception catchE) { e = catchE; @@ -197,22 +186,15 @@ public class X4ODriverManagerTest { Assertions.assertEquals(IllegalArgumentException.class, e.getClass(), "Wrong exception class"); Assertions.assertTrue(e.getMessage().contains("empty"), "Wrong exception message"); } - + @Test public void testRegisterDriverVersionNull() throws Exception { Exception e = null; try { X4ODriverManager.registerX4ODriver(new X4ODriver() { - @Override - public String[] getLanguageVersions() { - return null; - } - - @Override - public String getLanguageName() { - return "junit-driver-test"; - } - + @Override public String[] getLanguageVersions() { return null; } + @Override public String getLanguageName() { return "junit-driver-test"; } + }); } catch (Exception catchE) { e = catchE; @@ -221,22 +203,15 @@ public class X4ODriverManagerTest { Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } - + @Test public void testRegisterDriverVersionEmpty() throws Exception { Exception e = null; try { X4ODriverManager.registerX4ODriver(new X4ODriver() { - @Override - public String[] getLanguageVersions() { - return new String[] {}; - } - - @Override - public String getLanguageName() { - return "junit-driver-test"; - } - + @Override public String[] getLanguageVersions() { return new String[]{}; } + @Override public String getLanguageName() { return "junit-driver-test"; } + }); } catch (Exception catchE) { e = catchE; @@ -245,7 +220,7 @@ public class X4ODriverManagerTest { Assertions.assertEquals(IllegalArgumentException.class, e.getClass(), "Wrong exception class"); Assertions.assertTrue(e.getMessage().contains("empty"), "Wrong exception message"); } - + @Test public void testDeregisterDriverNull() throws Exception { Exception e = null; @@ -258,22 +233,15 @@ public class X4ODriverManagerTest { Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } - + @Test public void testDeregisterDriverNameNull() throws Exception { Exception e = null; try { X4ODriverManager.deregisterX4ODriver(new X4ODriver() { - @Override - public String[] getLanguageVersions() { - return new String[] { "1.0" }; - } - - @Override - public String getLanguageName() { - return null; - } - + @Override public String[] getLanguageVersions() { return new String[]{"1.0"}; } + @Override public String getLanguageName() { return null; } + }); } catch (Exception catchE) { e = catchE; @@ -282,21 +250,14 @@ public class X4ODriverManagerTest { Assertions.assertEquals(NullPointerException.class, e.getClass(), "Wrong exception class"); Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); } - + @Test public void testDeregisterDriverInstance() throws Exception { Exception e = null; try { X4ODriver driver = new X4ODriver() { - @Override - public String[] getLanguageVersions() { - return new String[] { "1.0" }; - } - - @Override - public String getLanguageName() { - return "junit-driver-test"; - } + @Override public String[] getLanguageVersions() { return new String[]{"1.0"}; } + @Override public String getLanguageName() { return "junit-driver-test"; } }; X4ODriverManager.registerX4ODriver(driver); Assertions.assertEquals(driver.hashCode(), X4ODriverManager.getX4ODriver("junit-driver-test").hashCode()); diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/conv/DefaultObjectConverterProviderTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/conv/DefaultObjectConverterProviderTest.java index 4e156ba..ba043d5 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/conv/DefaultObjectConverterProviderTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/conv/DefaultObjectConverterProviderTest.java @@ -40,19 +40,19 @@ import org.x4o.xml.lang.phase.X4OPhaseType; * @version 1.0 Jul 24, 2006 */ public class DefaultObjectConverterProviderTest { - + Locale locale = Locale.getDefault(); - + @Test public void testConverterClone() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); - for (ObjectConverter conv : p.getObjectConverters()) { + for (ObjectConverter conv:p.getObjectConverters()) { Assertions.assertNotNull(conv); ObjectConverter clone = conv.clone(); Assertions.assertNotNull(clone); } } - + @Test public void testConverterBoolean() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); @@ -60,14 +60,14 @@ public class DefaultObjectConverterProviderTest { Assertions.assertNotNull(conv); Object result = conv.convertTo("true", locale); Assertions.assertNotNull(result); - Assertions.assertEquals(Boolean.class, result.getClass(), "Result is not Boolean.class"); - Assertions.assertEquals(true, result, "Result is not true"); + Assertions.assertEquals(Boolean.class,result.getClass(), "Result is not Boolean.class"); + Assertions.assertEquals(true,result, "Result is not true"); Object resultBack = conv.convertBack(result, locale); Assertions.assertNotNull(resultBack); - Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class"); - Assertions.assertEquals("true", resultBack, "resultBack is not true"); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("true",resultBack, "resultBack is not true"); } - + @Test public void testConverterInteger() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); @@ -75,14 +75,14 @@ public class DefaultObjectConverterProviderTest { Assertions.assertNotNull(conv); Object result = conv.convertTo("123", locale); Assertions.assertNotNull(result); - Assertions.assertEquals(Integer.class, result.getClass(), "Result is not Integer.class"); - Assertions.assertEquals(123, result, "Result is not 123"); + Assertions.assertEquals(Integer.class,result.getClass(), "Result is not Integer.class"); + Assertions.assertEquals(123,result, "Result is not 123"); Object resultBack = conv.convertBack(result, locale); Assertions.assertNotNull(resultBack); - Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class"); - Assertions.assertEquals("123", resultBack, "resultBack is not 123"); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("123",resultBack, "resultBack is not 123"); } - + @Test public void testConverterFloat() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); @@ -90,14 +90,14 @@ public class DefaultObjectConverterProviderTest { Assertions.assertNotNull(conv); Object result = conv.convertTo("123.23", locale); Assertions.assertNotNull(result); - Assertions.assertEquals(Float.class, result.getClass(), "Result is not Float.class"); - Assertions.assertEquals(123.23F, result, "Result is not 123.23"); + Assertions.assertEquals(Float.class,result.getClass(), "Result is not Float.class"); + Assertions.assertEquals(123.23F,result, "Result is not 123.23"); Object resultBack = conv.convertBack(result, locale); Assertions.assertNotNull(resultBack); - Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class"); - Assertions.assertEquals("123.23", resultBack, "resultBack is not 123.23"); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("123.23",resultBack, "resultBack is not 123.23"); } - + @Test public void testConverterLong() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); @@ -105,14 +105,14 @@ public class DefaultObjectConverterProviderTest { Assertions.assertNotNull(conv); Object result = conv.convertTo("12323", locale); Assertions.assertNotNull(result); - Assertions.assertEquals(Long.class, result.getClass(), "Result is not Long.class"); - Assertions.assertEquals(12323L, result, "Result is not 12323"); + Assertions.assertEquals(Long.class,result.getClass(), "Result is not Long.class"); + Assertions.assertEquals(12323L,result, "Result is not 12323"); Object resultBack = conv.convertBack(result, locale); Assertions.assertNotNull(resultBack); - Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class"); - Assertions.assertEquals("12323", resultBack, "resultBack is not 12323"); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("12323",resultBack, "resultBack is not 12323"); } - + @Test public void testConverterDouble() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); @@ -120,14 +120,14 @@ public class DefaultObjectConverterProviderTest { Assertions.assertNotNull(conv); Object result = conv.convertTo("1232.3", locale); Assertions.assertNotNull(result); - Assertions.assertEquals(Double.class, result.getClass(), "Result is not Double.class"); - Assertions.assertEquals(1232.3D, result, "Result is not 1232.3"); + Assertions.assertEquals(Double.class,result.getClass(), "Result is not Double.class"); + Assertions.assertEquals(1232.3D,result, "Result is not 1232.3"); Object resultBack = conv.convertBack(result, locale); Assertions.assertNotNull(resultBack); - Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class"); - Assertions.assertEquals("1232.3", resultBack, "resultBack is not 1232.3"); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("1232.3",resultBack, "resultBack is not 1232.3"); } - + @Test public void testConverterUrl() throws Exception { DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true); @@ -135,14 +135,14 @@ public class DefaultObjectConverterProviderTest { Assertions.assertNotNull(conv); Object result = conv.convertTo("http://www.x4o.org", locale); Assertions.assertNotNull(result); - Assertions.assertEquals(URL.class, result.getClass(), "Result is not Url.class"); - Assertions.assertEquals(new URL("http://www.x4o.org"), result, "Result is not http://www.x4o.org"); + Assertions.assertEquals(URL.class,result.getClass(), "Result is not Url.class"); + Assertions.assertEquals(new URL("http://www.x4o.org"),result, "Result is not http://www.x4o.org"); Object resultBack = conv.convertBack(result, locale); Assertions.assertNotNull(resultBack); - Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class"); - Assertions.assertEquals("http://www.x4o.org", resultBack, "resultBack is not http://www.x4o.org"); + Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class"); + Assertions.assertEquals("http://www.x4o.org",resultBack, "resultBack is not http://www.x4o.org"); } - + @Test public void testConverterUrlException() throws Exception { URLConverter conv = new URLConverter(); @@ -158,7 +158,7 @@ public class DefaultObjectConverterProviderTest { Assertions.assertEquals(MalformedURLException.class, e.getCause().getClass()); Assertions.assertTrue(e.getMessage().contains("error"), "Error message string is missing error"); } - + @Test public void testConverterEnum() throws Exception { EnumConverter convOrg = new EnumConverter(); @@ -170,16 +170,16 @@ public class DefaultObjectConverterProviderTest { Object resultBack = conv.convertBack(result, locale); Assertions.assertEquals("XML_READ", resultBack.toString()); } - + @Test public void testConverterEnumError() throws Exception { EnumConverter convOrg = new EnumConverter(); convOrg.setEnumClass(X4OPhaseType.class.getName()); ObjectConverter conv = convOrg.clone(); - + Exception e = null; try { - conv.convertTo("nonEnumError", locale); + conv.convertTo("nonEnumError", locale); } catch (Exception catchE) { e = catchE; } @@ -187,13 +187,13 @@ public class DefaultObjectConverterProviderTest { Assertions.assertEquals(ObjectConverterException.class, e.getClass()); Assertions.assertTrue(e.getMessage().contains("EnumError")); } - + @Test public void testConverterEnumNullError() throws Exception { EnumConverter conv = new EnumConverter(); Exception e = null; try { - conv.convertTo("nonEnumError", locale); + conv.convertTo("nonEnumError", locale); } catch (Exception catchE) { e = catchE; } @@ -201,7 +201,7 @@ public class DefaultObjectConverterProviderTest { Assertions.assertEquals(ObjectConverterException.class, e.getClass()); Assertions.assertTrue(e.getMessage().contains("enumClass")); } - + @Test public void testConverterClass() throws Exception { ClassConverter classOrg = new ClassConverter(); @@ -212,12 +212,12 @@ public class DefaultObjectConverterProviderTest { Object resultBack = conv.convertBack(result, locale); Assertions.assertEquals("java.lang.Object", resultBack.toString()); } - + @Test public void testConverterClassError() throws Exception { ClassConverter classOrg = new ClassConverter(); ObjectConverter conv = classOrg.clone(); - + Exception e = null; try { conv.convertTo("java.lang.ObjectError", locale); diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/AttributeBeanTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/AttributeBeanTest.java index 4612b91..cf65990 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/AttributeBeanTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/AttributeBeanTest.java @@ -40,63 +40,63 @@ import org.x4o.xml.test.models.TestObjectRoot; * @version 1.0 Jul 24, 2006 */ public class AttributeBeanTest { - + @Test public void testBeanBody() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); - + TestObjectRoot root = reader.readResource("tests/attributes/test-body.xml"); Assertions.assertNotNull(root); List childs = root.getTestObjectChilds(); - Assertions.assertEquals(2, childs.size()); + Assertions.assertEquals(2,childs.size()); TestObjectChild child0 = childs.get(0); TestObjectChild child1 = childs.get(1); - Assertions.assertEquals("attr-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕", child0.getName()); - Assertions.assertEquals("body-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕", child1.getName()); + Assertions.assertEquals("attr-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕",child0.getName()); + Assertions.assertEquals("body-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕",child1.getName()); } - + @Test public void testBeanProperties() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); - + TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml"); Assertions.assertNotNull(root); Assertions.assertNotNull(root.getTestBeans()); Assertions.assertEquals(2, root.getTestBeans().size()); TestBean b = root.getTestBeans().get(0); TestBean beanPublic = root.getTestBeans().get(1); - - Assertions.assertEquals(123, 0 + b.getPrivateIntegerTypeField()); - Assertions.assertEquals(123, 0 + b.getPrivateIntegerObjectField()); - - Assertions.assertEquals(123l, 0 + b.getPrivateLongTypeField()); - Assertions.assertEquals(123l, 0 + b.getPrivateLongObjectField()); - - Assertions.assertEquals(123.45d, 0 + b.getPrivateDoubleTypeField()); - Assertions.assertEquals(123.45d, 0 + b.getPrivateDoubleObjectField()); - - Assertions.assertEquals(123.45f, 0 + b.getPrivateFloatTypeField()); - Assertions.assertEquals(123.45f, 0 + b.getPrivateFloatObjectField()); - - Assertions.assertEquals(67, 0 + b.getPrivateByteTypeField()); - Assertions.assertEquals(67, 0 + b.getPrivateByteObjectField()); - - Assertions.assertEquals(true, b.isPrivateBooleanTypeField()); - Assertions.assertEquals(new Boolean(true), b.getPrivateBooleanObjectField()); - - Assertions.assertEquals('W', 0 + b.getPrivateCharTypeField()); - Assertions.assertEquals('C', 0 + b.getPrivateCharObjectField()); - - Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕", b.getPrivateStringObjectField()); - // Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,b.getPrivateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ()); // SAX fails - Assertions.assertEquals("x4o-仙上主天", b.getPrivateStringObjectFieldUnicode仙上主天()); - - // TODO: add again: assertEquals(true ,null!=b.getPrivateDateObjectField()); - - Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕", beanPublic.publicStringObjectField); - // Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,beanPublic.publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ); // SAX fails - Assertions.assertEquals("x4o-仙上主天", beanPublic.publicStringObjectFieldUnicode仙上主天); + + Assertions.assertEquals(123 ,0+ b.getPrivateIntegerTypeField()); + Assertions.assertEquals(123 ,0+ b.getPrivateIntegerObjectField()); + + Assertions.assertEquals(123l ,0+ b.getPrivateLongTypeField()); + Assertions.assertEquals(123l ,0+ b.getPrivateLongObjectField()); + + Assertions.assertEquals(123.45d ,0+ b.getPrivateDoubleTypeField()); + Assertions.assertEquals(123.45d ,0+ b.getPrivateDoubleObjectField()); + + Assertions.assertEquals(123.45f ,0+ b.getPrivateFloatTypeField()); + Assertions.assertEquals(123.45f ,0+ b.getPrivateFloatObjectField()); + + Assertions.assertEquals(67 ,0+ b.getPrivateByteTypeField()); + Assertions.assertEquals(67 ,0+ b.getPrivateByteObjectField()); + + Assertions.assertEquals(true, b.isPrivateBooleanTypeField()); + Assertions.assertEquals(new Boolean(true), b.getPrivateBooleanObjectField()); + + Assertions.assertEquals('W' ,0+ b.getPrivateCharTypeField()); + Assertions.assertEquals('C' ,0+ b.getPrivateCharObjectField()); + + Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕" ,b.getPrivateStringObjectField()); + //Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,b.getPrivateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ()); // SAX fails + Assertions.assertEquals("x4o-仙上主天" ,b.getPrivateStringObjectFieldUnicode仙上主天()); + + //TODO: add again: assertEquals(true ,null!=b.getPrivateDateObjectField()); + + Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕" ,beanPublic.publicStringObjectField); + //Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,beanPublic.publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ); // SAX fails + Assertions.assertEquals("x4o-仙上主天" ,beanPublic.publicStringObjectFieldUnicode仙上主天); } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/EmptyXmlTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/EmptyXmlTest.java index 7549d7d..46c8290 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/EmptyXmlTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/EmptyXmlTest.java @@ -39,7 +39,7 @@ import org.xml.sax.SAXException; * @version 1.0 Jul 24, 2006 */ public class EmptyXmlTest { - + @Test public void testFileNotFound() throws Exception { X4ODriver driver = TestDriver.getInstance(); @@ -50,9 +50,9 @@ public class EmptyXmlTest { Assertions.assertEquals(true, e.getMessage().contains("non-excisting-file.xml")); return; } - Assertions.assertEquals(true, false); + Assertions.assertEquals(true,false); } - + @Test public void testResourceNotFound() throws Exception { X4ODriver driver = TestDriver.getInstance(); @@ -60,25 +60,25 @@ public class EmptyXmlTest { try { reader.readResource("tests/empty-xml/non-excisting-resource.xml"); } catch (NullPointerException e) { - Assertions.assertEquals(true, e.getMessage().contains("Could not find resource")); + Assertions.assertEquals(true,e.getMessage().contains("Could not find resource")); return; } - Assertions.assertEquals(true, false); + Assertions.assertEquals(true,false); } - + @Test public void testResourceParsing() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); try { - reader.readResource("tests/empty-xml/empty-test.xml"); + reader.readResource("tests/empty-xml/empty-test.xml"); } catch (SAXException e) { // Assertions.assertEquals("No ElementNamespace found for empty namespace.", e.getMessage()); return; } - Assertions.assertEquals(true, false); + Assertions.assertEquals(true,false); } - + @Test public void testResourceEmptyReal() throws Exception { X4ODriver driver = TestDriver.getInstance(); @@ -86,12 +86,12 @@ public class EmptyXmlTest { try { reader.readResource("tests/empty-xml/empty-real.xml"); } catch (SAXException e) { - Assertions.assertEquals(true, e.getMessage().contains("Premature end of file.")); + Assertions.assertEquals(true,e.getMessage().contains("Premature end of file.")); return; } - Assertions.assertEquals(true, false); + Assertions.assertEquals(true,false); } - + @Test public void testResourceEmptyXml() throws Exception { X4ODriver driver = TestDriver.getInstance(); @@ -100,29 +100,29 @@ public class EmptyXmlTest { reader.readResource("tests/empty-xml/empty-xml.xml"); } catch (SAXException e) { boolean hasError = e.getMessage().contains("Premature end of file."); // java6+ sax message - if (hasError == false) { + if (hasError==false) { hasError = e.getMessage().contains("A well-formed document requires a root element."); // xercesImpl sax message } - Assertions.assertEquals(true, hasError); + Assertions.assertEquals(true,hasError); return; } - Assertions.assertEquals(true, false); + Assertions.assertEquals(true,false); } - + @Test public void testEmptyX40() throws Exception { X4ODriver driver = TestDriver.getInstance(); Assertions.assertNotNull(driver); - + X4OReader reader = driver.createReader(); Assertions.assertNotNull(reader); - + TestObjectRoot root = reader.readResource("tests/empty-xml/empty-x4o.xml"); Assertions.assertNotNull(root); - - Assertions.assertEquals(true, root.getTestBeans().isEmpty()); - Assertions.assertEquals(true, root.getTestObjectChilds().isEmpty()); - Assertions.assertEquals(true, root.getTestObjectParents().isEmpty()); - Assertions.assertEquals(true, root.getTestObjects().isEmpty()); + + Assertions.assertEquals(true,root.getTestBeans().isEmpty()); + Assertions.assertEquals(true,root.getTestObjectChilds().isEmpty()); + Assertions.assertEquals(true,root.getTestObjectParents().isEmpty()); + Assertions.assertEquals(true,root.getTestObjects().isEmpty()); } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/NamespaceUriTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/NamespaceUriTest.java index 11813cf..0cfef08 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/NamespaceUriTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/NamespaceUriTest.java @@ -38,7 +38,7 @@ import org.x4o.xml.test.models.TestObjectRoot; * @version 1.0 May 1, 2011 */ public class NamespaceUriTest { - + @Test public void testSimpleUri() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -46,10 +46,10 @@ public class NamespaceUriTest { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try (X4OLanguageSession session = reader.createLanguageSession()) { reader.readResourceSession(session, "tests/namespace/uri-simple.xml"); - Assertions.assertEquals(true, session.getRootElement().getChilderen().size() == 1); + Assertions.assertEquals(true,session.getRootElement().getChilderen().size()==1); } } - + @Test public void testEmptyUri() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -58,10 +58,10 @@ public class NamespaceUriTest { reader.setProperty(DefaultX4OReader.DOC_EMPTY_NAMESPACE_URI, "http://test.junit.x4o.org/xml/ns/junit-test-lang"); try (X4OLanguageSession session = reader.createLanguageSession()) { reader.readResourceSession(session, "tests/namespace/uri-empty.xml"); - Assertions.assertEquals(true, session.getRootElement().getChilderen().size() == 1); + Assertions.assertEquals(true,session.getRootElement().getChilderen().size()==1); } } - + @Test public void testSchemaUri() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -69,7 +69,7 @@ public class NamespaceUriTest { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try (X4OLanguageSession session = reader.createLanguageSession()) { reader.readResourceSession(session, "tests/namespace/uri-schema.xml"); - Assertions.assertEquals(true, session.getRootElement().getChilderen().size() == 1); + Assertions.assertEquals(true,session.getRootElement().getChilderen().size()==1); } } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4ODebugWriterTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4ODebugWriterTest.java index 2a886f7..d5e44b5 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4ODebugWriterTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4ODebugWriterTest.java @@ -52,15 +52,15 @@ import org.x4o.xml.test.models.TestObjectRoot; * @version 1.0 Aug 26, 2012 */ public class X4ODebugWriterTest { - + private File createDebugFile() throws IOException { File debugFile = File.createTempFile("test-debug", ".xml"); debugFile.deleteOnExit(); return debugFile; } - + static public String readFile(File file) throws IOException { - BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8"))); + BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),Charset.forName("UTF-8"))); try { StringBuilder sb = new StringBuilder(); String line = br.readLine(); @@ -70,13 +70,13 @@ public class X4ODebugWriterTest { line = br.readLine(); } String out = sb.toString(); - // System.out.println(out); + //System.out.println(out); return out; } finally { br.close(); } } - + @Test public void testDebugOutputReader() throws Exception { File debugFile = createDebugFile(); @@ -89,18 +89,18 @@ public class X4ODebugWriterTest { reader.readResource("tests/attributes/test-bean.xml"); } } - + Assertions.assertTrue(debugFile.exists(), "Debug file does not exists."); String debug = readFile(debugFile); Assertions.assertNotNull(debug); - Assertions.assertFalse(debug.length() == 0, "no debug content"); - Assertions.assertTrue(debug.length() > 20, "debug content to small"); - - // System.out.println("=================== Reader Output ======================"); - // System.out.println(debug); + Assertions.assertFalse(debug.length()==0, "no debug content"); + Assertions.assertTrue(debug.length()>20, "debug content to small"); + + //System.out.println("=================== Reader Output ======================"); + //System.out.println(debug); debugFile.delete(); } - + @Test public void testDebugOutputWriter() throws Exception { File debugFile = createDebugFile(); @@ -109,20 +109,20 @@ public class X4ODebugWriterTest { X4OReader reader = driver.createReader(); X4OWriter writer = driver.createWriter(); TestObjectRoot object = reader.readResource("tests/attributes/test-bean.xml"); - + try (OutputStream out = new FileOutputStream(debugFile)) { writer.setProperty(DefaultX4OWriter.DEBUG_OUTPUT_STREAM, out); writer.writeFile(object, writeFile); } - + Assertions.assertTrue(debugFile.exists(), "Debug file does not exists."); String debug = readFile(debugFile); Assertions.assertNotNull(debug); - Assertions.assertFalse(debug.length() == 0, "no debug content"); - Assertions.assertTrue(debug.length() > 20, "debug content to small"); - - // System.out.println("=================== Writer Output ======================"); - // System.out.println(debug); + Assertions.assertFalse(debug.length()==0, "no debug content"); + Assertions.assertTrue(debug.length()>20, "debug content to small"); + + //System.out.println("=================== Writer Output ======================"); + //System.out.println(debug); debugFile.delete(); } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java index 1efda37..b42e998 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java @@ -47,12 +47,12 @@ import org.xml.sax.SAXException; * @version 1.0 Aug 27, 2012 */ public class X4OEntityResolverTest { - + @Test public void testElementLangugeNull() throws Exception { Exception e = null; try { - new X4OEntityResolver(null, null); + new X4OEntityResolver(null,null); } catch (Exception catchE) { e = catchE; } @@ -60,7 +60,7 @@ public class X4OEntityResolverTest { Assertions.assertEquals(NullPointerException.class, e.getClass()); Assertions.assertTrue(e.getMessage().contains("null")); } - + @Test public void testResolve() throws Exception { X4ODriver driver = new CelDriver(); @@ -68,19 +68,19 @@ public class X4OEntityResolverTest { try (X4OLanguageSession session = language.createLanguageSession()) { X4OLanguageLocal.class.cast(language).init(session); X4OEntityResolver resolver = new X4OEntityResolver(session, DefaultX4OReader.DEFAULT_PROPERTY_CONFIG); - InputSource input = resolver.resolveEntity("", "http://cel.x4o.org/xml/ns/cel-root-1.0.xsd"); + InputSource input = resolver.resolveEntity("","http://cel.x4o.org/xml/ns/cel-root-1.0.xsd"); Assertions.assertNotNull(input); } } - + @Test public void testResolveMissing() throws Exception { X4ODriver driver = new TestDriver(); // NOTE: this session is not inited, see fix code above. - X4OEntityResolver resolver = new X4OEntityResolver(driver.createLanguage().createLanguageSession(), DefaultX4OReader.DEFAULT_PROPERTY_CONFIG); + X4OEntityResolver resolver = new X4OEntityResolver(driver.createLanguage().createLanguageSession(),DefaultX4OReader.DEFAULT_PROPERTY_CONFIG); Exception e = null; try { - resolver.resolveEntity("", "http://cel.x4o.org/xml/ns/cel-root-1.0.xsd-missing-resource"); + resolver.resolveEntity("","http://cel.x4o.org/xml/ns/cel-root-1.0.xsd-missing-resource"); } catch (Exception catchE) { e = catchE; } @@ -88,35 +88,35 @@ public class X4OEntityResolverTest { Assertions.assertEquals(SAXException.class, e.getClass()); Assertions.assertTrue(e.getMessage().contains("missing-resource")); } - + @Test public void testResolveProperty() throws Exception { X4ODriver driver = new TestDriver(); X4OLanguageSession language = driver.createLanguage().createLanguageSession(); - SAX3PropertyConfig conf = new SAX3PropertyConfig(DefaultX4OReader.DEFAULT_PROPERTY_CONFIG, SAX3PropertyConfig.X4O_PROPERTIES_PREFIX + "reader/x4o/"); + SAX3PropertyConfig conf = new SAX3PropertyConfig(DefaultX4OReader.DEFAULT_PROPERTY_CONFIG,SAX3PropertyConfig.X4O_PROPERTIES_PREFIX+"reader/x4o/"); conf.setProperty(DefaultX4OReader.SAX_ENTITY_RESOLVER, new TestEntityResolver()); - X4OEntityResolver resolver = new X4OEntityResolver(language, conf); + X4OEntityResolver resolver = new X4OEntityResolver(language,conf); Exception e = null; InputSource input = null; try { - input = resolver.resolveEntity("", "http://cel.x4o.org/xml/ns/cel-root-1.0.xsd"); + input = resolver.resolveEntity("","http://cel.x4o.org/xml/ns/cel-root-1.0.xsd"); } catch (Exception catchE) { e = catchE; } Assertions.assertNull(e); Assertions.assertNotNull(input); } - + @Test public void testResolvePropertyNull() throws Exception { X4ODriver driver = new TestDriver(); X4OLanguageSession language = driver.createLanguage().createLanguageSession(); - SAX3PropertyConfig conf = new SAX3PropertyConfig(DefaultX4OReader.DEFAULT_PROPERTY_CONFIG, SAX3PropertyConfig.X4O_PROPERTIES_PREFIX + "reader/x4o/"); + SAX3PropertyConfig conf = new SAX3PropertyConfig(DefaultX4OReader.DEFAULT_PROPERTY_CONFIG,SAX3PropertyConfig.X4O_PROPERTIES_PREFIX+"reader/x4o/"); conf.setProperty(DefaultX4OReader.SAX_ENTITY_RESOLVER, new TestEntityResolver()); - X4OEntityResolver resolver = new X4OEntityResolver(language, conf); + X4OEntityResolver resolver = new X4OEntityResolver(language,conf); Exception e = null; try { - resolver.resolveEntity("", "http://cel.x4o.org/xml/ns/cel-root-1.0.xsd-null"); + resolver.resolveEntity("","http://cel.x4o.org/xml/ns/cel-root-1.0.xsd-null"); } catch (Exception catchE) { e = catchE; } @@ -124,7 +124,7 @@ public class X4OEntityResolverTest { Assertions.assertEquals(SAXException.class, e.getClass()); Assertions.assertTrue(e.getMessage().contains("null")); } - + public class TestEntityResolver implements EntityResolver { public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { @@ -134,6 +134,6 @@ public class X4OEntityResolverTest { return new InputSource(); } } - + } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OParserConfigurationTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OParserConfigurationTest.java index 9faa67b..b73cb1a 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OParserConfigurationTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OParserConfigurationTest.java @@ -38,31 +38,31 @@ import org.x4o.xml.test.TestDriver; * @version 1.0 Jan 20, 2012 */ public class X4OParserConfigurationTest { - + static TestDriver driver; static X4OLanguageConfiguration config; - + @BeforeAll public static void setUp() throws Exception { driver = TestDriver.getInstance(); config = driver.createLanguage().getLanguageConfiguration(); } - + @Test public void testParserConfigurationLanguage() { - Assertions.assertEquals("test", driver.getLanguageName()); - Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_MODULES_FILE, config.getLanguageResourceModulesFileName()); - Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_PATH_PREFIX, config.getLanguageResourcePathPrefix()); + Assertions.assertEquals("test",driver.getLanguageName()); + Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_MODULES_FILE,config.getLanguageResourceModulesFileName()); + Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_PATH_PREFIX,config.getLanguageResourcePathPrefix()); } - + @Test public void testParserConfigurationElement() { Assertions.assertNotNull(config.getDefaultElement()); Assertions.assertTrue(Element.class.isAssignableFrom(config.getDefaultElement()), "No Element Interface"); - + Assertions.assertNotNull(config.getDefaultElementClass()); Assertions.assertTrue(ElementClass.class.isAssignableFrom(config.getDefaultElementClass()), "No ElementClass Interface"); - + Assertions.assertNotNull(config.getDefaultElementClassAttribute()); Assertions.assertTrue(ElementClassAttribute.class.isAssignableFrom(config.getDefaultElementClassAttribute()), "No ElementClassAttribute Interface"); } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OPhaseManagerTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OPhaseManagerTest.java index 883e0f2..19c6b1c 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OPhaseManagerTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OPhaseManagerTest.java @@ -35,41 +35,50 @@ import org.x4o.xml.lang.phase.X4OPhaseType; import org.x4o.xml.test.TestDriver; /** - * Tests some code for testing x4o phases. * - * + * Tests some code for testing x4o phases. + * * * @author Willem Cazander * @version 1.0 Jan 15, 2009 */ public class X4OPhaseManagerTest { - + static boolean phaseRunned = false; - + @BeforeAll public static void setUp() throws Exception { phaseRunned = false; } - + @Test public void testPhases() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OLanguageSession context = driver.createLanguage().createLanguageSession(); - DefaultX4OPhaseManager manager = (DefaultX4OPhaseManager) context.getLanguage().getPhaseManager(); + DefaultX4OPhaseManager manager = (DefaultX4OPhaseManager)context.getLanguage().getPhaseManager(); Collection phasesAll = manager.getAllPhases(); List phases = manager.getOrderedPhases(X4OPhaseType.XML_READ); Assertions.assertNotNull(phases); Assertions.assertFalse(phases.isEmpty()); Assertions.assertNotNull(phasesAll); Assertions.assertFalse(phasesAll.isEmpty()); - for (X4OPhase phase : phases) { + for (X4OPhase phase:phases) { Assertions.assertNotNull(phase); Assertions.assertNotNull(phase.getId()); } } - + /* - * public void testPhaseManager() throws Exception { TestDriver driver = TestDriver.getInstance(); ElementLanguage context = driver.createLanguageSession(); - * X4OPhaseManager manager = context.getLanguage().getPhaseManager(); - * - * Exception e = null; try { manager.addX4OPhaseHandler(null); } catch (NullPointerException ee) { e = ee; } Assertions.assertEquals(true, e!=null ); } - */ + public void testPhaseManager() throws Exception { + TestDriver driver = TestDriver.getInstance(); + ElementLanguage context = driver.createLanguageSession(); + X4OPhaseManager manager = context.getLanguage().getPhaseManager(); + + Exception e = null; + try { + manager.addX4OPhaseHandler(null); + } catch (NullPointerException ee) { + e = ee; + } + Assertions.assertEquals(true, e!=null ); + } + */ } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/EldValidatingTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/EldValidatingTest.java index c019158..0617ada 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/EldValidatingTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/EldValidatingTest.java @@ -36,14 +36,14 @@ import org.x4o.xml.test.models.TestObjectRoot; * @version 1.0 Aug 22, 2012 */ public class EldValidatingTest { - + @Test public void testValidation() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); - // reader.getContentConfig().setProperty("",true); + //reader.getContentConfig().setProperty("",true); reader.setProperty(DefaultX4OReader.VALIDATION_INPUT_DOC, true); - // parser.setProperty(DefaultX4OReader.VALIDATION_SCHEMA_PATH, "/tmp"); + //parser.setProperty(DefaultX4OReader.VALIDATION_SCHEMA_PATH, "/tmp"); try { // TODO: reader.readResource("META-INF/eld/eld-lang.eld"); } finally { diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java index 6c1d1fb..461a754 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java @@ -36,54 +36,66 @@ import org.x4o.xml.lang.task.run.X4OTaskRunner; import org.x4o.xml.test.TestDriver; /** - * Test for eld doc generation + * Test for eld doc generation * * @author Willem Cazander * @version 1.0 Aug 26, 2010 */ public class X4OWriteLanguageDocExecutorTest { - + private File createOutputPath(String dir) throws Exception { - File result = new File("target/tests" + File.separator + dir); - if (result.exists() == false) { + File result = new File("target/tests"+File.separator+dir); + if (result.exists()==false) { result.mkdirs(); } return result; } - - public void testDoc(String language, String outputPostfix) throws Exception { + + public void testDoc(String language,String outputPostfix) throws Exception { X4ODriver driver = X4ODriverManager.getX4ODriver(language); X4OLanguageTask task = driver.getLanguageTask(EldDocLanguageTask.TASK_ID); SAX3PropertyConfig config = task.createTaskConfig(); File outputPath = createOutputPath(outputPostfix); - config.setProperty(EldDocWriter.OUTPUT_PATH, outputPath); + config.setProperty(EldDocWriter.OUTPUT_PATH,outputPath); X4OTaskRunner.runTaskLanguage(task, driver.createLanguage(), config); Assertions.assertTrue(outputPath.exists()); - Assertions.assertTrue(outputPath.list() != null); - Assertions.assertTrue(outputPath.list().length > 2); + Assertions.assertTrue(outputPath.list()!=null); + Assertions.assertTrue(outputPath.list().length>2); } - + @Test public void testCelDoc() throws Exception { - testDoc(CelDriver.LANGUAGE_NAME, "junit-doc-cel"); + testDoc(CelDriver.LANGUAGE_NAME,"junit-doc-cel"); } - + @Test public void testEldDoc() throws Exception { - testDoc(EldDriver.LANGUAGE_NAME, "junit-doc-eld"); + testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); } - + @Test public void testUnitDoc() throws Exception { - testDoc(TestDriver.LANGUAGE_NAME, "junit-doc-test"); + testDoc(TestDriver.LANGUAGE_NAME,"junit-doc-test"); } - /* - * @Test public void testSwiXml2Doc() throws Exception { testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); EldDocLanguageTask writer = new - * EldDocLanguageTask(); writer.setBasePath(createOutputTargetPath("junit-swixml2")); writer.setLanguageName(SwiXmlDriver.LANGUAGE_NAME); - * writer.setLanguageVersion(SwiXmlDriver.LANGUAGE_VERSION_2); writer.execute(); } - * - * @Test public void testSwiXml3Doc() throws Exception { testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); EldDocLanguageTask writer = new - * EldDocLanguageTask(); writer.setBasePath(createOutputTargetPath("junit-swixml3")); writer.setLanguageName(SwiXmlDriver.LANGUAGE_NAME); - * writer.setLanguageVersion(SwiXmlDriver.LANGUAGE_VERSION_3); writer.execute(); } - */ +/* + @Test + public void testSwiXml2Doc() throws Exception { + testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); + EldDocLanguageTask writer = new EldDocLanguageTask(); + writer.setBasePath(createOutputTargetPath("junit-swixml2")); + writer.setLanguageName(SwiXmlDriver.LANGUAGE_NAME); + writer.setLanguageVersion(SwiXmlDriver.LANGUAGE_VERSION_2); + writer.execute(); + } + + @Test + public void testSwiXml3Doc() throws Exception { + testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); + EldDocLanguageTask writer = new EldDocLanguageTask(); + writer.setBasePath(createOutputTargetPath("junit-swixml3")); + writer.setLanguageName(SwiXmlDriver.LANGUAGE_NAME); + writer.setLanguageVersion(SwiXmlDriver.LANGUAGE_VERSION_3); + writer.execute(); + } + */ } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java index b791ce5..1f9a3f2 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java @@ -49,72 +49,72 @@ import org.x4o.xml.test.swixml.SwiXmlDriver; public class EldXsdLanguageTaskTest { private File createOutputPath(String dir) throws Exception { - File result = new File("target/tests" + File.separator + dir); - if (result.exists() == false) { + File result = new File("target/tests"+File.separator+dir); + if (result.exists()==false) { result.mkdirs(); } return result; } - + @Test - private File testSchema(String language, String outputPostfix, Map props) throws Exception { + private File testSchema(String language,String outputPostfix,Map props) throws Exception { X4ODriver driver = X4ODriverManager.getX4ODriver(language); X4OLanguageTask task = driver.getLanguageTask(EldXsdLanguageTask.TASK_ID); SAX3PropertyConfig config = task.createTaskConfig(); - File outputPath = createOutputPath(outputPostfix); - config.setProperty(EldXsdWriter.OUTPUT_PATH, outputPath); - config.setProperty(EldXsdWriter.OUTPUT_DOCUMENTATION, false); - config.setProperty(SAX3WriterXml.PROLOG_LICENCE_FILE, new File("../licence.txt")); - config.setProperty(SAX3WriterXml.PROLOG_USER_COMMENT, "Generated by junit-test-run in class: " + this.getClass().getSimpleName()); - if (props != null) { - for (String key : props.keySet()) { + File outputPath = createOutputPath(outputPostfix); + config.setProperty(EldXsdWriter.OUTPUT_PATH,outputPath); + config.setProperty(EldXsdWriter.OUTPUT_DOCUMENTATION,false); + config.setProperty(SAX3WriterXml.PROLOG_LICENCE_FILE,new File("../licence.txt")); + config.setProperty(SAX3WriterXml.PROLOG_USER_COMMENT,"Generated by junit-test-run in class: "+this.getClass().getSimpleName()); + if (props!=null) { + for (String key:props.keySet()) { Object value = props.get(key); config.setProperty(key, value); } } X4OTaskRunner.runTaskLanguage(task, driver.createLanguage(), config); Assertions.assertTrue(outputPath.exists()); - Assertions.assertTrue(outputPath.list() != null); + Assertions.assertTrue(outputPath.list()!=null); return outputPath; } - + @Test public void testEldSchema() throws Exception { - File outputPath = testSchema(EldDriver.LANGUAGE_NAME, "junit-xsd-eld", null); - Assertions.assertTrue(outputPath.list().length > 2); + File outputPath = testSchema(EldDriver.LANGUAGE_NAME,"junit-xsd-eld",null); + Assertions.assertTrue(outputPath.list().length>2); } - + @Test public void testEldCoreSchema() throws Exception { - File outputPath = testSchema(CelDriver.LANGUAGE_NAME, "junit-xsd-cel", null); - Assertions.assertTrue(outputPath.list().length > 1); + File outputPath = testSchema(CelDriver.LANGUAGE_NAME,"junit-xsd-cel",null); + Assertions.assertTrue(outputPath.list().length>1); } - + @Test public void testSwiXmlSchema() throws Exception { - File outputPath = testSchema(SwiXmlDriver.LANGUAGE_NAME, "junit-xsd-swixml", null); - Assertions.assertTrue(outputPath.list().length > 1); + File outputPath = testSchema(SwiXmlDriver.LANGUAGE_NAME,"junit-xsd-swixml",null); + Assertions.assertTrue(outputPath.list().length>1); } - + @Test public void testFilterNamespace() throws Exception { - Map props = new HashMap(); + Map props = new HashMap(); props.put(EldXsdWriter.FILTER_NAMESPACE, EldModuleLoaderCore.CEL_ROOT_URI); - File outputPath = testSchema(CelDriver.LANGUAGE_NAME, "junit-one-ns", props); - Assertions.assertTrue(outputPath.list().length == 1); + File outputPath = testSchema(CelDriver.LANGUAGE_NAME,"junit-one-ns",props); + Assertions.assertTrue(outputPath.list().length==1); } - + @Test public void testFilterElement() throws Exception { - Map props = new HashMap(); + Map props = new HashMap(); props.put(EldXsdWriter.FILTER_NAMESPACE, EldModuleLoaderCore.CEL_CORE_URI); props.put(EldXsdWriter.FILTER_ELEMENT, "elementInterface"); props.put(EldXsdWriter.PROLOG_GENERATED_ENABLE, false); props.put(EldXsdWriter.PROLOG_XMLNS_INFO_ENABLE, false); - props.put(SAX3WriterXml.PROLOG_LICENCE_ENABLE, false); - File outputPath = testSchema(CelDriver.LANGUAGE_NAME, "junit-one-element", props); - Assertions.assertTrue(outputPath.list().length == 1); - + props.put(SAX3WriterXml.PROLOG_LICENCE_ENABLE,false); + File outputPath = testSchema(CelDriver.LANGUAGE_NAME,"junit-one-element",props); + Assertions.assertTrue(outputPath.list().length==1); + String text = X4OWriterTest.readFile(new File("target/tests/junit-one-element/cel-core-1.0.xsd")); Assertions.assertNotNull(text); Assertions.assertTrue(text.contains("elementInterface")); @@ -122,7 +122,7 @@ public class EldXsdLanguageTaskTest { Assertions.assertFalse(text.contains("attributeAlias")); Assertions.assertFalse(text.contains("bindingHandler")); Assertions.assertFalse(text.contains("classConverter")); - - Assertions.assertTrue(text.length() < 10000); + + Assertions.assertTrue(text.length()<10000); } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/element/DefaultElementObjectPropertyValueTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/element/DefaultElementObjectPropertyValueTest.java index 72324db..6e8899d 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/element/DefaultElementObjectPropertyValueTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/element/DefaultElementObjectPropertyValueTest.java @@ -38,62 +38,62 @@ import org.x4o.xml.test.models.TestObjectChild; * @version 1.0 Jul 24, 2006 */ public class DefaultElementObjectPropertyValueTest { - + DefaultElementObjectPropertyValue helper = new DefaultElementObjectPropertyValue(); - + @BeforeAll public static void setUp() throws Exception { // enable all logs InputStream loggingProperties = DefaultElementObjectPropertyValueTest.class.getResourceAsStream("/META-INF/logging.properties"); - LogManager.getLogManager().readConfiguration(loggingProperties); + LogManager.getLogManager().readConfiguration( loggingProperties ); loggingProperties.close(); } - + @Test public void testNullValue() throws Exception { TestObjectChild obj = new TestObjectChild(); obj.setName("test"); - + Assertions.assertEquals("test", obj.getName()); // test org value Assertions.assertEquals("test", helper.getProperty(obj, "name")); // test null get value - + helper.setProperty(obj, "name", null); - + Assertions.assertEquals(null, obj.getName()); // test null value Assertions.assertEquals(null, helper.getProperty(obj, "name")); // test null get value } - + @Test public void testIntegerValue() throws Exception { TestObjectChild obj = new TestObjectChild(); helper.setProperty(obj, "price", 666); - - Assertions.assertEquals(666, helper.getProperty(obj, "price")); + + Assertions.assertEquals(666,helper.getProperty(obj, "price")); } - + @Test public void testException() throws Exception { TestObjectChild obj = new TestObjectChild(); helper.setProperty(obj, "price", 666); - + boolean error = false; try { helper.getProperty(obj, "price2"); } catch (ElementObjectPropertyValueException not) { error = true; } - Assertions.assertEquals(true, error); + Assertions.assertEquals(true,error); } - + @Test public void testChinees() throws Exception { TestBean obj = new TestBean(); - + helper.setProperty(obj, "privateStringObjectField", "foo"); - Assertions.assertEquals("foo", helper.getProperty(obj, "privateStringObjectField")); - + Assertions.assertEquals("foo",helper.getProperty(obj, "privateStringObjectField")); + helper.setProperty(obj, "privateStringObjectFieldUnicode仙上主天", "bar"); - Assertions.assertEquals("bar", helper.getProperty(obj, "privateStringObjectFieldUnicode仙上主天")); + Assertions.assertEquals("bar",helper.getProperty(obj, "privateStringObjectFieldUnicode仙上主天")); } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OConnectionTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OConnectionTest.java index b6db99c..914f6c1 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OConnectionTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OConnectionTest.java @@ -35,7 +35,7 @@ import org.x4o.xml.test.models.TestObjectRoot; * @version 1.0 Apr 28, 2013 */ public class X4OConnectionTest { - + @Test public void testReaderPropertyFailRead() throws Exception { Exception e = null; @@ -51,7 +51,7 @@ public class X4OConnectionTest { Assertions.assertTrue(e.getMessage().contains("key"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("No"), "Wrong exception message"); } - + @Test public void testReaderPropertyFail() throws Exception { Exception e = null; @@ -67,7 +67,7 @@ public class X4OConnectionTest { Assertions.assertTrue(e.getMessage().contains("key"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("No"), "Wrong exception message"); } - + @Test public void testWriterPropertyFail() throws Exception { Exception e = null; diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderSessionTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderSessionTest.java index 548da49..691d7d3 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderSessionTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderSessionTest.java @@ -42,7 +42,7 @@ import org.x4o.xml.test.models.TestObjectRoot; * @version 1.0 Apr 15, 2013 */ public class X4OReaderSessionTest { - + private File copyResourceToTempFile() throws IOException { File tempFile = File.createTempFile("test-resource", ".xml"); tempFile.deleteOnExit(); @@ -56,7 +56,7 @@ public class X4OReaderSessionTest { } return tempFile; } - + @Test public void testReadFileName() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -64,11 +64,11 @@ public class X4OReaderSessionTest { File xmlFile = copyResourceToTempFile(); TestObjectRoot root = reader.readFile(xmlFile.getAbsolutePath()); Assertions.assertNotNull(root); - Assertions.assertTrue(root.getTestBeans().size() > 0); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); Assertions.assertNotNull(bean); } - + @Test public void testReadFileNameNull() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -85,7 +85,7 @@ public class X4OReaderSessionTest { Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("fileName"), "Wrong exception message"); } - + @Test public void testReadFile() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -93,11 +93,11 @@ public class X4OReaderSessionTest { File xmlFile = copyResourceToTempFile(); TestObjectRoot root = reader.readFile(xmlFile); Assertions.assertNotNull(root); - Assertions.assertTrue(root.getTestBeans().size() > 0); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); Assertions.assertNotNull(bean); } - + @Test public void testReadFileNull() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -114,7 +114,7 @@ public class X4OReaderSessionTest { Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("file"), "Wrong exception message"); } - + @Test public void testReadFileNotExists() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -132,7 +132,7 @@ public class X4OReaderSessionTest { Assertions.assertTrue(e.getMessage().contains("exists"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("File"), "Wrong exception message"); } - + @Test public void testReadFileNotReadable() throws Exception { if (File.separatorChar != '/') { @@ -151,7 +151,7 @@ public class X4OReaderSessionTest { Assertions.assertTrue(e.getMessage().contains("exists"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("read"), "Wrong exception message"); } - + @Test public void testReadResource() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -159,7 +159,7 @@ public class X4OReaderSessionTest { TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml"); Assertions.assertNotNull(root); } - + @Test public void testReadResourceNull() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -175,21 +175,24 @@ public class X4OReaderSessionTest { Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("resourceName"), "Wrong exception message"); } - + @Test public void testReadString() throws Exception { TestDriver driver = TestDriver.getInstance(); X4OReaderSession reader = driver.createReaderSession(); - TestObjectRoot root = reader.readString("" - + "" - + "" + ""); + TestObjectRoot root = reader.readString( + ""+ + ""+ + ""+ + "" + ); Assertions.assertNotNull(root); - Assertions.assertTrue(root.getTestBeans().size() > 0); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); Assertions.assertNotNull(bean); - Assertions.assertEquals("987654321", "" + bean.getPrivateIntegerTypeField()); + Assertions.assertEquals("987654321", ""+bean.getPrivateIntegerTypeField()); } - + @Test public void testReadStringNull() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -205,7 +208,7 @@ public class X4OReaderSessionTest { Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("string"), "Wrong exception message"); } - + @Test public void testReadUrl() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -213,11 +216,11 @@ public class X4OReaderSessionTest { URL xmlUrl = Thread.currentThread().getContextClassLoader().getResource("tests/attributes/test-bean.xml"); TestObjectRoot root = reader.readUrl(xmlUrl); Assertions.assertNotNull(root); - Assertions.assertTrue(root.getTestBeans().size() > 0); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); Assertions.assertNotNull(bean); } - + @Test public void testReadUrlNull() throws Exception { TestDriver driver = TestDriver.getInstance(); diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderTest.java index 2d713c4..881eead 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderTest.java @@ -42,7 +42,7 @@ import org.x4o.xml.test.models.TestObjectRoot; * @version 1.0 Apr 15, 2013 */ public class X4OReaderTest { - + private File copyResourceToTempFile() throws IOException { File tempFile = File.createTempFile("test-resource", ".xml"); tempFile.deleteOnExit(); @@ -56,7 +56,7 @@ public class X4OReaderTest { } return tempFile; } - + @Test public void testReadInputStream() throws Exception { TestDriver driver = TestDriver.getInstance(); @@ -71,11 +71,11 @@ public class X4OReaderTest { inputStream.close(); } Assertions.assertNotNull(root); - Assertions.assertTrue(root.getTestBeans().size() > 0); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); Assertions.assertNotNull(bean); } - + @Test public void testReadResource() throws Exception { X4ODriver driver = TestDriver.getInstance(); @@ -83,7 +83,7 @@ public class X4OReaderTest { TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml"); Assertions.assertNotNull(root); } - + @Test public void testReadResourceNull() throws Exception { Exception e = null; @@ -99,21 +99,24 @@ public class X4OReaderTest { Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("resourceName"), "Wrong exception message"); } - + @Test public void testReadString() throws Exception { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); - TestObjectRoot root = reader.readString("" - + "" - + "" + ""); + TestObjectRoot root = reader.readString( + ""+ + ""+ + ""+ + "" + ); Assertions.assertNotNull(root); - Assertions.assertTrue(root.getTestBeans().size() > 0); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); Assertions.assertNotNull(bean); - Assertions.assertEquals("987654321", "" + bean.getPrivateIntegerTypeField()); + Assertions.assertEquals("987654321", ""+bean.getPrivateIntegerTypeField()); } - + @Test public void testReadStringNull() throws Exception { Exception e = null; @@ -129,7 +132,7 @@ public class X4OReaderTest { Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("string"), "Wrong exception message"); } - + @Test public void testReadUrl() throws Exception { X4ODriver driver = TestDriver.getInstance(); @@ -137,11 +140,11 @@ public class X4OReaderTest { URL xmlUrl = Thread.currentThread().getContextClassLoader().getResource("tests/attributes/test-bean.xml"); TestObjectRoot root = reader.readUrl(xmlUrl); Assertions.assertNotNull(root); - Assertions.assertTrue(root.getTestBeans().size() > 0); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); Assertions.assertNotNull(bean); } - + @Test public void testReadUrlNull() throws Exception { Exception e = null; @@ -157,7 +160,7 @@ public class X4OReaderTest { Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("url"), "Wrong exception message"); } - + @Test public void testReadFileName() throws Exception { X4ODriver driver = TestDriver.getInstance(); @@ -165,11 +168,11 @@ public class X4OReaderTest { File xmlFile = copyResourceToTempFile(); TestObjectRoot root = reader.readFile(xmlFile.getAbsolutePath()); Assertions.assertNotNull(root); - Assertions.assertTrue(root.getTestBeans().size() > 0); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); Assertions.assertNotNull(bean); } - + @Test public void testReadFileNameNull() throws Exception { Exception e = null; @@ -186,7 +189,7 @@ public class X4OReaderTest { Assertions.assertTrue(e.getMessage().contains("null"), "Wrong exception message"); Assertions.assertTrue(e.getMessage().contains("fileName"), "Wrong exception message"); } - + @Test public void testReadFile() throws Exception { X4ODriver driver = TestDriver.getInstance(); @@ -194,11 +197,11 @@ public class X4OReaderTest { File xmlFile = copyResourceToTempFile(); TestObjectRoot root = reader.readFile(xmlFile); Assertions.assertNotNull(root); - Assertions.assertTrue(root.getTestBeans().size() > 0); + Assertions.assertTrue(root.getTestBeans().size()>0); TestBean bean = root.getTestBeans().get(0); Assertions.assertNotNull(bean); } - + @Test public void testReadFileNull() throws Exception { Exception e = null; diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterSessionTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterSessionTest.java index b83ecde..db2f989 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterSessionTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterSessionTest.java @@ -43,13 +43,13 @@ import org.xml.sax.SAXException; * @version 1.0 Apr 28, 2013 */ public class X4OWriterSessionTest { - + private File createOutputFile() throws IOException { File outputFile = File.createTempFile("test-writer-context", ".xml"); outputFile.deleteOnExit(); return outputFile; } - + private X4OLanguageSession createContext() throws SAXException, X4OConnectionException, IOException { X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); @@ -57,7 +57,7 @@ public class X4OWriterSessionTest { X4OLanguageSession context = driver.createLanguage().createLanguageSession(); Element rootElement = null; try { - rootElement = (Element) context.getLanguage().getLanguageConfiguration().getDefaultElement().newInstance(); + rootElement = (Element)context.getLanguage().getLanguageConfiguration().getDefaultElement().newInstance(); } catch (InstantiationException e) { throw new SAXException(e); } catch (IllegalAccessException e) { @@ -67,7 +67,7 @@ public class X4OWriterSessionTest { context.setRootElement(rootElement); return context; } - + @Test public void testWriteFile() throws Exception { File outputFile = createOutputFile(); @@ -75,7 +75,7 @@ public class X4OWriterSessionTest { X4OWriterSession writer = driver.createWriterSession(); writer.writeFileSession(createContext(), outputFile); - String text = X4OWriterTest.readFile(outputFile); + String text = X4OWriterTest.readFile( outputFile ); outputFile.delete(); Assertions.assertTrue(text.startsWith("")); @@ -83,7 +83,7 @@ public class X4OWriterSessionTest { Assertions.assertTrue(text.contains("")); Assertions.assertTrue(text.contains(" driver = TestDriver.getInstance(); X4OWriterSession writer = driver.createWriterSession(); - + writer.writeFileSession(createContext(), outputFile.getAbsolutePath()); - String text = X4OWriterTest.readFile(outputFile); + String text = X4OWriterTest.readFile( outputFile ); outputFile.delete(); Assertions.assertTrue(text.startsWith("")); @@ -116,7 +116,7 @@ public class X4OWriterSessionTest { Assertions.assertTrue(text.contains("")); Assertions.assertTrue(text.contains(" driver = TestDriver.getInstance(); X4OWriterSession writer = driver.createWriterSession(); - + OutputStream outputStream = new FileOutputStream(outputFile); try { - writer.writeSession(createContext(), outputStream); + writer.writeSession(createContext(),outputStream); } finally { outputStream.close(); } - String text = X4OWriterTest.readFile(outputFile); + String text = X4OWriterTest.readFile( outputFile ); outputFile.delete(); Assertions.assertTrue(text.startsWith("")); diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterTest.java index 515dde6..d142da7 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterTest.java @@ -48,15 +48,15 @@ import org.x4o.xml.test.swixml.SwingEngine; * @version 1.0 Apr 28, 2013 */ public class X4OWriterTest { - + private File createOutputFile() throws IOException { File outputFile = File.createTempFile("test-writer", ".xml"); outputFile.deleteOnExit(); return outputFile; } - + static public String readFile(File file) throws IOException { - BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8"))); + BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),Charset.forName("UTF-8"))); try { StringBuilder sb = new StringBuilder(); String line = br.readLine(); @@ -66,48 +66,48 @@ public class X4OWriterTest { line = br.readLine(); } String out = sb.toString(); - // System.out.println(out); + //System.out.println(out); return out; } finally { br.close(); } } - + @Test public void testWriterSwiXmlOutput() throws Exception { Accelerator3 ac3 = new Accelerator3(false); SwingEngine engine = new SwingEngine(ac3); - + File outputFile = createOutputFile(); X4ODriver driver = SwiXmlDriver.getInstance(); X4OReader reader = driver.createReader(); X4OWriter writer = driver.createWriter(SwiXmlDriver.LANGUAGE_VERSION_3); - - // reader.setProperty(key, value); - // writer.setProperty(key, value); - + + //reader.setProperty(key, value); + //writer.setProperty(key, value); + reader.addELBeanInstance(SwiXmlDriver.LANGUAGE_EL_SWING_ENGINE, engine); Component root = reader.readResource("tests/swixml/swixml-accelerator-3.0.xml"); writer.writeFile(root, outputFile); - + Assertions.assertTrue(outputFile.exists(), "Debug file does not exists."); - - // String text = new Scanner( outputFile ).useDelimiter("\\A").next(); - // System.out.println("Output: '\n"+text+"\n' end in "+outputFile.getAbsolutePath()); - + + //String text = new Scanner( outputFile ).useDelimiter("\\A").next(); + //System.out.println("Output: '\n"+text+"\n' end in "+outputFile.getAbsolutePath()); + outputFile.delete(); } - + @Test public void testWriteFile() throws Exception { File outputFile = createOutputFile(); X4ODriver driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); X4OWriter writer = driver.createWriter(); - + TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml"); writer.writeFile(root, outputFile); - String text = readFile(outputFile); + String text = readFile( outputFile ); outputFile.delete(); Assertions.assertTrue(text.startsWith("")); @@ -115,17 +115,17 @@ public class X4OWriterTest { Assertions.assertTrue(text.contains("")); Assertions.assertTrue(text.contains(" driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); X4OWriter writer = driver.createWriter(); - + TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml"); writer.writeFile(root, outputFile.getAbsolutePath()); - String text = readFile(outputFile); + String text = readFile( outputFile ); outputFile.delete(); Assertions.assertTrue(text.startsWith("")); @@ -133,24 +133,24 @@ public class X4OWriterTest { Assertions.assertTrue(text.contains("")); Assertions.assertTrue(text.contains(" driver = TestDriver.getInstance(); X4OReader reader = driver.createReader(); X4OWriter writer = driver.createWriter(); - + TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml"); OutputStream outputStream = new FileOutputStream(outputFile); try { - writer.write(root, outputStream); + writer.write(root,outputStream); } finally { outputStream.close(); } - + writer.writeFile(root, outputFile.getAbsolutePath()); - String text = readFile(outputFile); + String text = readFile( outputFile ); outputFile.delete(); Assertions.assertTrue(text.startsWith("")); diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/DefaultX4OLanguageLoaderTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/DefaultX4OLanguageLoaderTest.java index 87049f6..03b002f 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/DefaultX4OLanguageLoaderTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/DefaultX4OLanguageLoaderTest.java @@ -45,16 +45,16 @@ public class DefaultX4OLanguageLoaderTest { static X4OLanguageLocal language; static X4OLanguageSession session; static DefaultX4OLanguageLoader loader; - + @BeforeAll public static void setUp() throws Exception { driver = TestDriver.getInstance(); - language = (X4OLanguageLocal) driver.createLanguage(); + language = (X4OLanguageLocal)driver.createLanguage(); session = language.createLanguageSession(); language.init(session); - loader = (DefaultX4OLanguageLoader) language.getLanguageConfiguration().getDefaultLanguageLoader().newInstance(); + loader = (DefaultX4OLanguageLoader)language.getLanguageConfiguration().getDefaultLanguageLoader().newInstance(); } - + @Test public void testLoadingDuplicate() throws Exception { Exception e = null; @@ -66,75 +66,75 @@ public class DefaultX4OLanguageLoaderTest { Assertions.assertNotNull(e, "no duplicate module exception"); Assertions.assertTrue(e.getMessage().contains("test"), "wrong module id."); } - + @Test public void testModulesSimple() throws Exception { - InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-simple.xml"); + InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-simple.xml"); Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-simple.xml"); Assertions.assertNotNull(result); Assertions.assertFalse(result.isEmpty()); - Assertions.assertTrue(result.size() == 1, "Simple test returned non-one result: " + result.size()); + Assertions.assertTrue(result.size()==1, "Simple test returned non-one result: "+result.size()); } - + @Test public void testModulesFull() throws Exception { - InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-full.xml"); + InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-full.xml"); Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-full.xml"); Assertions.assertNotNull(result); Assertions.assertFalse(result.isEmpty()); VersionedResources vr = result.get(0); - Assertions.assertTrue(vr.eldResources.size() > 1); - Assertions.assertTrue(vr.moduleLoaders.size() > 1); - Assertions.assertTrue(vr.elbResources.size() > 1); - Assertions.assertTrue(vr.siblingLoaders.size() == 1); + Assertions.assertTrue(vr.eldResources.size()>1); + Assertions.assertTrue(vr.moduleLoaders.size()>1); + Assertions.assertTrue(vr.elbResources.size()>1); + Assertions.assertTrue(vr.siblingLoaders.size()==1); } - + @Test public void testModulesDuplicateLoaderNoError() throws Exception { - InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml"); + InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml"); Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-err-loader.xml"); Assertions.assertNotNull(result); Assertions.assertFalse(result.isEmpty()); } - + @Test public void testModulesDuplicateLoader() throws Exception { - InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml"); + InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml"); Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-err-loader.xml"); Assertions.assertNotNull(result); Assertions.assertFalse(result.isEmpty()); - - Exception e = null; + + Exception e=null; try { loader.validateModules(result); } catch (Exception ee) { - e = ee; + e=ee; } Assertions.assertNotNull(e); - Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: " + e.getMessage()); - Assertions.assertTrue(e.getMessage().contains("module-loader"), "No 'module-loader' found in message: " + e.getMessage()); + Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: "+e.getMessage()); + Assertions.assertTrue(e.getMessage().contains("module-loader"), "No 'module-loader' found in message: "+e.getMessage()); } - + @Test public void testModulesDuplicateSiblingLoader() throws Exception { - InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-sibling.xml"); + InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-sibling.xml"); Assertions.assertNotNull(in); List result = loader.loadLanguageModulesXml(in, "test-modules-err-sibling.xml"); Assertions.assertNotNull(result); Assertions.assertFalse(result.isEmpty()); - - Exception e = null; + + Exception e=null; try { loader.validateModules(result); } catch (Exception ee) { - e = ee; + e=ee; } Assertions.assertNotNull(e); - Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: " + e.getMessage()); - Assertions.assertTrue(e.getMessage().contains("sibling-loader"), "No 'sibling-loader' found in message: " + e.getMessage()); + Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: "+e.getMessage()); + Assertions.assertTrue(e.getMessage().contains("sibling-loader"), "No 'sibling-loader' found in message: "+e.getMessage()); } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguageClassLoaderTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguageClassLoaderTest.java index ba02399..4a014d3 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguageClassLoaderTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/X4OLanguageClassLoaderTest.java @@ -32,14 +32,14 @@ import org.junit.jupiter.api.Test; * @version 1.0 Aug 27, 2012 */ public class X4OLanguageClassLoaderTest { - + @Test public void testLoadObject() throws Exception { Object o = X4OLanguageClassLoader.newInstance("java.lang.Object"); Assertions.assertNotNull(o); Assertions.assertEquals(Object.class, o.getClass()); } - + @Test public void tesNullThread() throws Exception { ClassLoader cl = Thread.currentThread().getContextClassLoader(); diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java index 8beb206..7cc7079 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java @@ -28,19 +28,19 @@ import org.x4o.xml.X4ODriverManager; public class MTestDriver extends X4ODriver { public static final String LANGUAGE_NAME = "mtest"; - public static final String[] LANGUAGE_VERSIONS = new String[] { X4ODriver.DEFAULT_LANGUAGE_VERSION }; - + public static final String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION}; + @Override public String getLanguageName() { return LANGUAGE_NAME; } - + @Override public String[] getLanguageVersions() { return LANGUAGE_VERSIONS; } - + static public MTestDriver getInstance() { - return (MTestDriver) X4ODriverManager.getX4ODriver(LANGUAGE_NAME); + return (MTestDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME); } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java index c200876..3682889 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java @@ -39,7 +39,7 @@ import org.x4o.xml.lang.phase.X4OPhaseLanguageRead; * @version 1.0 Apr 15, 2012 */ public class ParentObjectTest { - + @Test public void testParentElement() throws Exception { MTestDriver driver = new MTestDriver(); @@ -47,35 +47,35 @@ public class ParentObjectTest { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try (X4OLanguageSession session = reader.createLanguageSession()) { reader.readResourceSession(session, "junit/test-meta-parent-element.xml"); - Assertions.assertEquals(1, session.getRootElement().getChilderen().size()); + Assertions.assertEquals(1,session.getRootElement().getChilderen().size()); Element childElement = session.getRootElement().getChilderen().get(0); - JLabel test = (JLabel) childElement.getElementObject(); - Assertions.assertEquals("parentTest", test.getText()); + JLabel test = (JLabel)childElement.getElementObject(); + Assertions.assertEquals("parentTest",test.getText()); } } - + @Test public void testParentObjectElement() throws Exception { DefaultElement ep = new DefaultElement(); ParentObjectElement e = new ParentObjectElement(); Object o; - + // test non parent o = e.getElementObject(); Assertions.assertNull(o); e.setElementObject("test"); o = e.getElementObject(); Assertions.assertNull(o); - + // test parent e.setParent(ep); o = e.getElementObject(); Assertions.assertNull(o); e.setElementObject("test"); o = e.getElementObject(); - Assertions.assertEquals("test", o); + Assertions.assertEquals("test",o); o = ep.getElementObject(); - Assertions.assertEquals("test", o); - Assertions.assertEquals(e.getElementObject(), ep.getElementObject()); + Assertions.assertEquals("test",o); + Assertions.assertEquals(e.getElementObject(),ep.getElementObject()); } } diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java index b38262a..571371b 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java @@ -37,7 +37,7 @@ import org.x4o.xml.lang.phase.X4OPhaseLanguageRead; * @version 1.0 Jul 24, 2006 */ public class ReferenceStoreTest { - + @Test public void testMetaGeneric() throws Exception { MTestDriver driver = new MTestDriver(); @@ -45,10 +45,10 @@ public class ReferenceStoreTest { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try (X4OLanguageSession session = reader.createLanguageSession()) { reader.readResourceSession(session, "junit/test-meta-generic.xml"); - Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); } } - + @Test public void testLoadClass() throws Exception { MTestDriver driver = new MTestDriver(); @@ -56,10 +56,10 @@ public class ReferenceStoreTest { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try (X4OLanguageSession session = reader.createLanguageSession()) { reader.readResourceSession(session, "junit/test-meta-reference.xml"); - Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); } } - + @Test public void testStoreRef() throws Exception { MTestDriver driver = new MTestDriver(); @@ -67,10 +67,10 @@ public class ReferenceStoreTest { reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE); try (X4OLanguageSession session = reader.createLanguageSession()) { reader.readResourceSession(session, "junit/test-meta-reference.xml"); - Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); - Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(1).getElementObject().getClass().getName()); - Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(2).getElementObject().getClass().getName()); - Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(3).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(1).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(2).getElementObject().getClass().getName()); + Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(3).getElementObject().getClass().getName()); } } }