cvs commit: spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io DOMMetaClassDeserializer.java MetaClassIOXml.java SAXMetaClassSerializer.java
Peter Donald <[email protected]>
| Newsgroups | gmane.comp.java.spice.cvs |
|---|---|
| Message-ID | <[email protected]> |
donaldp 03/10/29 02:34:14
Modified: sandbox/metaclass/src/java/org/realityforge/metaclass/io
DOMMetaClassDeserializer.java MetaClassIOXml.java
SAXMetaClassSerializer.java
Log:
Migrate constants for element/attribute names into MetaClassIOXml
Revision Changes Path
1.3 +24 -24 spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/DOMMetaClassDeserializer.java
Index: DOMMetaClassDeserializer.java
===================================================================
RCS file: /cvsroot/spice/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/DOMMetaClassDeserializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMMetaClassDeserializer.java 29 Oct 2003 10:30:12 -0000 1.2
+++ DOMMetaClassDeserializer.java 29 Oct 2003 10:34:12 -0000 1.3
@@ -21,16 +21,16 @@
/**
*
* @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
- * @version $Revision: 1.2 $ $Date: 2003/10/29 10:30:12 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/29 10:34:12 $
*/
public class DOMMetaClassDeserializer
{
public ClassDescriptor buildClassDescriptor( final Element element )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.CLASS_ELEMENT );
+ expectElement( element, MetaClassIOXml.CLASS_ELEMENT );
final String type =
- expectAttribute( element, SAXMetaClassSerializer.TYPE_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.TYPE_ATTRIBUTE );
Attribute[] attributes = Attribute.EMPTY_SET;
MethodDescriptor[] methods = MethodDescriptor.EMPTY_SET;
FieldDescriptor[] fields = FieldDescriptor.EMPTY_SET;
@@ -44,11 +44,11 @@
{
final Element child = (Element)node;
final String childName = child.getNodeName();
- if( childName.equals( SAXMetaClassSerializer.METHODS_ELEMENT ) )
+ if( childName.equals( MetaClassIOXml.METHODS_ELEMENT ) )
{
methods = buildMethods( child );
}
- else if( childName.equals( SAXMetaClassSerializer.FIELDS_ELEMENT ) )
+ else if( childName.equals( MetaClassIOXml.FIELDS_ELEMENT ) )
{
fields = buildFields( child );
}
@@ -68,7 +68,7 @@
MethodDescriptor[] buildMethods( final Element element )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.METHODS_ELEMENT );
+ expectElement( element, MetaClassIOXml.METHODS_ELEMENT );
final ArrayList methods = new ArrayList();
final NodeList nodes = element.getChildNodes();
@@ -91,11 +91,11 @@
MethodDescriptor buildMethod( final Element element )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.METHOD_ELEMENT );
+ expectElement( element, MetaClassIOXml.METHOD_ELEMENT );
final String name =
- expectAttribute( element, SAXMetaClassSerializer.NAME_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.NAME_ATTRIBUTE );
final String type =
- expectAttribute( element, SAXMetaClassSerializer.TYPE_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.TYPE_ATTRIBUTE );
Attribute[] attributes = Attribute.EMPTY_SET;
ParameterDescriptor[] parameters = ParameterDescriptor.EMPTY_SET;
final NodeList nodes = element.getChildNodes();
@@ -108,7 +108,7 @@
{
final Element child = (Element)node;
final String childName = child.getNodeName();
- if( childName.equals( SAXMetaClassSerializer.PARAMETERS_ELEMENT ) )
+ if( childName.equals( MetaClassIOXml.PARAMETERS_ELEMENT ) )
{
parameters = buildParameters( child );
}
@@ -124,7 +124,7 @@
ParameterDescriptor[] buildParameters( Element element )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.PARAMETERS_ELEMENT );
+ expectElement( element, MetaClassIOXml.PARAMETERS_ELEMENT );
final ArrayList parameters = new ArrayList();
final NodeList nodes = element.getChildNodes();
@@ -148,11 +148,11 @@
ParameterDescriptor buildParameter( final Element element )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.PARAMETER_ELEMENT );
+ expectElement( element, MetaClassIOXml.PARAMETER_ELEMENT );
final String name =
- expectAttribute( element, SAXMetaClassSerializer.NAME_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.NAME_ATTRIBUTE );
final String type =
- expectAttribute( element, SAXMetaClassSerializer.TYPE_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.TYPE_ATTRIBUTE );
return new ParameterDescriptor( name, type );
}
@@ -160,7 +160,7 @@
FieldDescriptor[] buildFields( final Element element )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.FIELDS_ELEMENT );
+ expectElement( element, MetaClassIOXml.FIELDS_ELEMENT );
final ArrayList fields = new ArrayList();
final NodeList nodes = element.getChildNodes();
@@ -183,11 +183,11 @@
FieldDescriptor buildField( final Element element )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.FIELD_ELEMENT );
+ expectElement( element, MetaClassIOXml.FIELD_ELEMENT );
final String name =
- expectAttribute( element, SAXMetaClassSerializer.NAME_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.NAME_ATTRIBUTE );
final String type =
- expectAttribute( element, SAXMetaClassSerializer.TYPE_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.TYPE_ATTRIBUTE );
Attribute[] attributes = Attribute.EMPTY_SET;
final NodeList nodes = element.getChildNodes();
final int length = nodes.getLength();
@@ -206,7 +206,7 @@
Attribute[] buildAttributes( final Element element )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.ATTRIBUTES_ELEMENT );
+ expectElement( element, MetaClassIOXml.ATTRIBUTES_ELEMENT );
final ArrayList attributes = new ArrayList();
final NodeList nodes = element.getChildNodes();
@@ -229,9 +229,9 @@
Attribute buildAttribute( final Element element )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.ATTRIBUTE_ELEMENT );
+ expectElement( element, MetaClassIOXml.ATTRIBUTE_ELEMENT );
final String name =
- expectAttribute( element, SAXMetaClassSerializer.NAME_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.NAME_ATTRIBUTE );
final StringBuffer sb = new StringBuffer();
final Properties parameters = new Properties();
@@ -277,11 +277,11 @@
final Properties parameters )
throws Exception
{
- expectElement( element, SAXMetaClassSerializer.PARAM_ELEMENT );
+ expectElement( element, MetaClassIOXml.PARAM_ELEMENT );
final String name =
- expectAttribute( element, SAXMetaClassSerializer.NAME_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.NAME_ATTRIBUTE );
final String value =
- expectAttribute( element, SAXMetaClassSerializer.VALUE_ATTRIBUTE );
+ expectAttribute( element, MetaClassIOXml.VALUE_ATTRIBUTE );
parameters.setProperty( name, value );
}
1.7 +71 -1 spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/MetaClassIOXml.java
Index: MetaClassIOXml.java
===================================================================
RCS file: /cvsroot/spice/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/MetaClassIOXml.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MetaClassIOXml.java 29 Oct 2003 10:28:02 -0000 1.6
+++ MetaClassIOXml.java 29 Oct 2003 10:34:13 -0000 1.7
@@ -28,7 +28,7 @@
* to a stream using the xml format outlined in documentation.
*
* @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
- * @version $Revision: 1.6 $ $Date: 2003/10/29 10:28:02 $
+ * @version $Revision: 1.7 $ $Date: 2003/10/29 10:34:13 $
*/
public class MetaClassIOXml
implements MetaClassIO
@@ -37,6 +37,76 @@
* The current version of ClassDescriptor XML format.
*/
static final String VERSION = "1.0";
+
+ /**
+ * Constant for name of class element.
+ */
+ static final String CLASS_ELEMENT = "class";
+
+ /**
+ * Constant for name of fields element.
+ */
+ static final String FIELDS_ELEMENT = "fields";
+
+ /**
+ * Constant for name of field element.
+ */
+ static final String FIELD_ELEMENT = "field";
+
+ /**
+ * Constant for name of methods element.
+ */
+ static final String METHODS_ELEMENT = "methods";
+
+ /**
+ * Constant for name of method element.
+ */
+ static final String METHOD_ELEMENT = "method";
+
+ /**
+ * Constant for name of method parameters group element.
+ */
+ static final String PARAMETERS_ELEMENT = "parameters";
+
+ /**
+ * Constant for name of method parameters element.
+ */
+ static final String PARAMETER_ELEMENT = "parameter";
+
+ /**
+ * Constant for name of attributes element.
+ */
+ static final String ATTRIBUTES_ELEMENT = "attributes";
+
+ /**
+ * Constant for name of attribute element.
+ */
+ static final String ATTRIBUTE_ELEMENT = "attribute";
+
+ /**
+ * Constant for name of attribute parameter element.
+ */
+ static final String PARAM_ELEMENT = "param";
+
+ /**
+ * Constant for name of name attribute.
+ */
+ static final String NAME_ATTRIBUTE = "name";
+
+ /**
+ * Constant for name of type attribute.
+ */
+ static final String TYPE_ATTRIBUTE = "type";
+
+ /**
+ * Constant for name of value attribute.
+ */
+ static final String VALUE_ATTRIBUTE = "value";
+
+ /**
+ * Constant for name of version attribute.
+ */
+ static final String VERSION_ATTRIBUTE = "version";
/**
* @see MetaClassIO#deserializeClass
1.9 +32 -102 spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/SAXMetaClassSerializer.java
Index: SAXMetaClassSerializer.java
===================================================================
RCS file: /cvsroot/spice/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/io/SAXMetaClassSerializer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SAXMetaClassSerializer.java 29 Oct 2003 10:19:15 -0000 1.8
+++ SAXMetaClassSerializer.java 29 Oct 2003 10:34:13 -0000 1.9
@@ -21,7 +21,7 @@
* to a SAX2 compliant ContentHandler.
*
* @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
- * @version $Revision: 1.8 $ $Date: 2003/10/29 10:19:15 $
+ * @version $Revision: 1.9 $ $Date: 2003/10/29 10:34:13 $
*/
public class SAXMetaClassSerializer
{
@@ -36,76 +36,6 @@
static final String EMPTY_NAMESPACE = "";
/**
- * Constant for name of class element.
- */
- static final String CLASS_ELEMENT = "class";
-
- /**
- * Constant for name of fields element.
- */
- static final String FIELDS_ELEMENT = "fields";
-
- /**
- * Constant for name of field element.
- */
- static final String FIELD_ELEMENT = "field";
-
- /**
- * Constant for name of methods element.
- */
- static final String METHODS_ELEMENT = "methods";
-
- /**
- * Constant for name of method element.
- */
- static final String METHOD_ELEMENT = "method";
-
- /**
- * Constant for name of method parameters group element.
- */
- static final String PARAMETERS_ELEMENT = "parameters";
-
- /**
- * Constant for name of method parameters element.
- */
- static final String PARAMETER_ELEMENT = "parameter";
-
- /**
- * Constant for name of attributes element.
- */
- static final String ATTRIBUTES_ELEMENT = "attributes";
-
- /**
- * Constant for name of attribute element.
- */
- static final String ATTRIBUTE_ELEMENT = "attribute";
-
- /**
- * Constant for name of attribute parameter element.
- */
- static final String PARAM_ELEMENT = "param";
-
- /**
- * Constant for name of name attribute.
- */
- static final String NAME_ATTRIBUTE = "name";
-
- /**
- * Constant for name of type attribute.
- */
- static final String TYPE_ATTRIBUTE = "type";
-
- /**
- * Constant for name of value attribute.
- */
- static final String VALUE_ATTRIBUTE = "value";
-
- /**
- * Constant for name of version attribute.
- */
- static final String VERSION_ATTRIBUTE = "version";
-
- /**
* Serialize the ClassDescriptor to as a Document to the
* specified ContentHandler.
*
@@ -134,13 +64,13 @@
throws SAXException
{
final AttributesImpl atts = new AttributesImpl();
- add( atts, TYPE_ATTRIBUTE, descriptor.getName() );
- add( atts, VERSION_ATTRIBUTE, MetaClassIOXml.VERSION );
- start( handler, CLASS_ELEMENT, atts );
+ add( atts, MetaClassIOXml.TYPE_ATTRIBUTE, descriptor.getName() );
+ add( atts, MetaClassIOXml.VERSION_ATTRIBUTE, MetaClassIOXml.VERSION );
+ start( handler, MetaClassIOXml.CLASS_ELEMENT, atts );
serializeFields( handler, descriptor.getFields() );
serializeMethods( handler, descriptor.getMethods() );
serializeAttributes( handler, descriptor.getAttributes() );
- end( handler, CLASS_ELEMENT );
+ end( handler, MetaClassIOXml.CLASS_ELEMENT );
}
/**
@@ -158,12 +88,12 @@
{
return;
}
- start( handler, FIELDS_ELEMENT );
+ start( handler, MetaClassIOXml.FIELDS_ELEMENT );
for( int i = 0; i < descriptors.length; i++ )
{
serializeField( handler, descriptors[ i ] );
}
- end( handler, FIELDS_ELEMENT );
+ end( handler, MetaClassIOXml.FIELDS_ELEMENT );
}
/**
@@ -178,11 +108,11 @@
throws SAXException
{
final AttributesImpl atts = new AttributesImpl();
- add( atts, NAME_ATTRIBUTE, descriptor.getName() );
- add( atts, TYPE_ATTRIBUTE, descriptor.getType() );
- start( handler, FIELD_ELEMENT, atts );
+ add( atts, MetaClassIOXml.NAME_ATTRIBUTE, descriptor.getName() );
+ add( atts, MetaClassIOXml.TYPE_ATTRIBUTE, descriptor.getType() );
+ start( handler, MetaClassIOXml.FIELD_ELEMENT, atts );
serializeAttributes( handler, descriptor.getAttributes() );
- end( handler, FIELD_ELEMENT );
+ end( handler, MetaClassIOXml.FIELD_ELEMENT );
}
/**
@@ -200,12 +130,12 @@
{
return;
}
- start( handler, METHODS_ELEMENT );
+ start( handler, MetaClassIOXml.METHODS_ELEMENT );
for( int i = 0; i < descriptors.length; i++ )
{
serializeMethod( handler, descriptors[ i ] );
}
- end( handler, METHODS_ELEMENT );
+ end( handler, MetaClassIOXml.METHODS_ELEMENT );
}
/**
@@ -220,12 +150,12 @@
throws SAXException
{
final AttributesImpl atts = new AttributesImpl();
- add( atts, NAME_ATTRIBUTE, descriptor.getName() );
- add( atts, TYPE_ATTRIBUTE, descriptor.getReturnType() );
- start( handler, METHOD_ELEMENT, atts );
+ add( atts, MetaClassIOXml.NAME_ATTRIBUTE, descriptor.getName() );
+ add( atts, MetaClassIOXml.TYPE_ATTRIBUTE, descriptor.getReturnType() );
+ start( handler, MetaClassIOXml.METHOD_ELEMENT, atts );
serializeParameters( handler, descriptor.getParameters() );
serializeAttributes( handler, descriptor.getAttributes() );
- end( handler, METHOD_ELEMENT );
+ end( handler, MetaClassIOXml.METHOD_ELEMENT );
}
/**
@@ -243,12 +173,12 @@
{
return;
}
- start( handler, PARAMETERS_ELEMENT );
+ start( handler, MetaClassIOXml.PARAMETERS_ELEMENT );
for( int i = 0; i < parameters.length; i++ )
{
serializeParameter( handler, parameters[ i ] );
}
- end( handler, PARAMETERS_ELEMENT );
+ end( handler, MetaClassIOXml.PARAMETERS_ELEMENT );
}
/**
@@ -263,10 +193,10 @@
throws SAXException
{
final AttributesImpl atts = new AttributesImpl();
- add( atts, NAME_ATTRIBUTE, parameter.getName() );
- add( atts, TYPE_ATTRIBUTE, parameter.getType() );
- start( handler, PARAMETER_ELEMENT, atts );
- end( handler, PARAMETER_ELEMENT );
+ add( atts, MetaClassIOXml.NAME_ATTRIBUTE, parameter.getName() );
+ add( atts, MetaClassIOXml.TYPE_ATTRIBUTE, parameter.getType() );
+ start( handler, MetaClassIOXml.PARAMETER_ELEMENT, atts );
+ end( handler, MetaClassIOXml.PARAMETER_ELEMENT );
}
/**
@@ -284,12 +214,12 @@
{
return;
}
- start( handler, ATTRIBUTES_ELEMENT );
+ start( handler, MetaClassIOXml.ATTRIBUTES_ELEMENT );
for( int i = 0; i < attributes.length; i++ )
{
serializeAttribute( handler, attributes[ i ] );
}
- end( handler, ATTRIBUTES_ELEMENT );
+ end( handler, MetaClassIOXml.ATTRIBUTES_ELEMENT );
}
/**
@@ -304,14 +234,14 @@
throws SAXException
{
final AttributesImpl atts = new AttributesImpl();
- add( atts, NAME_ATTRIBUTE, attribute.getName() );
+ add( atts, MetaClassIOXml.NAME_ATTRIBUTE, attribute.getName() );
- start( handler, ATTRIBUTE_ELEMENT, atts );
+ start( handler, MetaClassIOXml.ATTRIBUTE_ELEMENT, atts );
text( handler, attribute.getValue() );
serializeAttributeParams( handler, attribute );
- end( handler, ATTRIBUTE_ELEMENT );
+ end( handler, MetaClassIOXml.ATTRIBUTE_ELEMENT );
}
/**
@@ -348,10 +278,10 @@
throws SAXException
{
final AttributesImpl atts = new AttributesImpl();
- add( atts, NAME_ATTRIBUTE, name );
- add( atts, VALUE_ATTRIBUTE, value );
- start( handler, PARAM_ELEMENT, atts );
- end( handler, PARAM_ELEMENT );
+ add( atts, MetaClassIOXml.NAME_ATTRIBUTE, name );
+ add( atts, MetaClassIOXml.VALUE_ATTRIBUTE, value );
+ start( handler, MetaClassIOXml.PARAM_ELEMENT, atts );
+ end( handler, MetaClassIOXml.PARAM_ELEMENT );
}
/**
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/