You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/03/14 07:17:22 UTC
svn commit: r518037 - in
/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader:
BaseHandler.java ComponentTypeHandler.java CompositeHandler.java
ConstrainingTypeHandler.java ReadTestCase.java
Author: jsdelfino
Date: Tue Mar 13 23:17:21 2007
New Revision: 518037
URL: http://svn.apache.org/viewvc?view=rev&rev=518037
Log:
Minor cleanup, renamed load to read.
Modified:
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/BaseHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java
incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ReadTestCase.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/BaseHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/BaseHandler.java?view=diff&rev=518037&r1=518036&r2=518037
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/BaseHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/BaseHandler.java Tue Mar 13 23:17:21 2007
@@ -81,7 +81,7 @@
}
}
- protected void initAbstractProperty(AbstractProperty prop, Attributes attr) {
+ protected void readAbstractProperty(AbstractProperty prop, Attributes attr) {
prop.setName(getString(attr, "name"));
prop.setMany(getBoolean(attr, "many"));
prop.setMustSupply(getBoolean(attr, "mustSupply"));
@@ -96,17 +96,15 @@
// TODO handle default value
}
- protected void initProperty(Property prop, Attributes attr) {
- initAbstractProperty(prop, attr);
+ protected void readProperty(Property prop, Attributes attr) {
+ readAbstractProperty(prop, attr);
// TODO handle property value
}
- @Override
public void endPrefixMapping(String prefix) throws SAXException {
nsStack.endPrefixMapping(prefix);
}
- @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
nsStack.startPrefixMapping(prefix, uri);
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java?view=diff&rev=518037&r1=518036&r2=518037
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ComponentTypeHandler.java Tue Mar 13 23:17:21 2007
@@ -62,7 +62,7 @@
} else if ("property".equals(name)) {
property = factory.createProperty();
- initProperty(property, attr);
+ readProperty(property, attr);
}
}
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java?view=diff&rev=518037&r1=518036&r2=518037
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/CompositeHandler.java Tue Mar 13 23:17:21 2007
@@ -84,10 +84,10 @@
} else if ("property".equals(name)) {
if (component != null) {
componentProperty = factory.createComponentProperty();
- initProperty(componentProperty, attr);
+ readProperty(componentProperty, attr);
} else {
property = factory.createProperty();
- initProperty(property, attr);
+ readProperty(property, attr);
}
} else if ("component".equals(name)) {
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java?view=diff&rev=518037&r1=518036&r2=518037
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ConstrainingTypeHandler.java Tue Mar 13 23:17:21 2007
@@ -62,7 +62,7 @@
} else if ("property".equals(name)) {
abstractProperty = factory.createAbstractProperty();
- initAbstractProperty(abstractProperty, attr);
+ readAbstractProperty(abstractProperty, attr);
}
}
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ReadTestCase.java?view=diff&rev=518037&r1=518036&r2=518037
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ReadTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/scdl/src/test/java/org/apache/tuscany/assembly/reader/ReadTestCase.java Tue Mar 13 23:17:21 2007
@@ -25,7 +25,6 @@
import org.apache.tuscany.assembly.model.AssemblyFactory;
import org.apache.tuscany.assembly.model.impl.AssemblyFactoryImpl;
-import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
@@ -53,25 +52,28 @@
reader = null;
}
- public void testLoadComponentType() throws Exception {
+ public void testReadComponentType() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorImpl.componentType");
- ContentHandler handler = new ComponentTypeHandler(factory, reader);
+ ComponentTypeHandler handler = new ComponentTypeHandler(factory, reader);
reader.setContentHandler(handler);
reader.parse(new InputSource(is));
+ assertNotNull(handler.getComponentType());
}
- public void testLoadConstrainingType() throws Exception {
+ public void testReadConstrainingType() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("CalculatorComponent.constrainingType");
- ContentHandler handler = new ConstrainingTypeHandler(factory, reader);
+ ConstrainingTypeHandler handler = new ConstrainingTypeHandler(factory, reader);
reader.setContentHandler(handler);
reader.parse(new InputSource(is));
+ assertNotNull(handler.getConstrainingType());
}
- public void testLoadComposite() throws Exception {
+ public void testReadComposite() throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream("Calculator.composite");
- ContentHandler handler = new CompositeHandler(factory, reader);
+ CompositeHandler handler = new CompositeHandler(factory, reader);
reader.setContentHandler(handler);
reader.parse(new InputSource(is));
+ assertNotNull(handler.getComposite());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org