You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2006/01/23 11:26:35 UTC
svn commit: r371514 - in /incubator/woden/java:
src/org/apache/woden/internal/util/ComponentModelBuilder.java
src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java
Author: jkaputin
Date: Mon Jan 23 02:26:18 2006
New Revision: 371514
URL: http://svn.apache.org/viewcvs?rev=371514&view=rev
Log:
Changed the names of some non-API public methods in
DescriptionImpl to clarify their purpose. I changed
the addAllXXXX methods to addToAllXXXX. For example:
addAllServices(service) is now addToAllServices(service).
These methods are used to populate the Description
component with its flattened properties when the
Component model is initialized.
Also refactored these method name changes into the two
dependent classes - ComponentModelBuilder and
WSDLComponentValidatorTest.
Modified:
incubator/woden/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
incubator/woden/java/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java
Modified: incubator/woden/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java?rev=371514&r1=371513&r2=371514&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/util/ComponentModelBuilder.java Mon Jan 23 02:26:18 2006
@@ -193,7 +193,7 @@
ed.setSystem(typeSystemURI);
ed.setContentModel(Constants.API_APACHE_WS_XS);
ed.setContent(elementTable.getItem(qname));
- fDesc.addAllElementDeclarations(ed);
+ fDesc.addToAllElementDeclarations(ed);
}
}
}
@@ -220,7 +220,7 @@
td.setSystem(typeSystemURI);
td.setContentModel(Constants.API_APACHE_WS_XS);
td.setContent(typeTable.getItem(qname));
- fDesc.addAllTypeDefinitions(td);
+ fDesc.addToAllTypeDefinitions(td);
}
}
}
@@ -238,7 +238,7 @@
InterfaceImpl intImpl = (InterfaceImpl)interfaceEls[i];
if(!fInterfacesDone.contains(intImpl))
{
- fDesc.addAllInterfaces(intImpl);
+ fDesc.addToAllInterfaces(intImpl);
buildProperties(intImpl.getPropertyElements(), intImpl);
buildInterfaceFaults(intImpl);
buildInterfaceOperations(intImpl);
@@ -320,7 +320,7 @@
BindingImpl bindImpl = (BindingImpl)bindingEls[i];
if(!fBindingsDone.contains(bindImpl))
{
- fDesc.addAllBindings(bindImpl);
+ fDesc.addToAllBindings(bindImpl);
buildProperties(bindImpl.getPropertyElements(), bindImpl);
buildBindingFaults(bindImpl);
buildBindingOperations(bindImpl);
@@ -393,7 +393,7 @@
ServiceImpl service = (ServiceImpl)services[i];
if(!fServicesDone.contains(service))
{
- fDesc.addAllServices(service);
+ fDesc.addToAllServices(service);
fServicesDone.add(service);
}
}
Modified: incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java?rev=371514&r1=371513&r2=371514&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java Mon Jan 23 02:26:18 2006
@@ -454,35 +454,35 @@
//If we need to support programmatic creation/updating of the Component model,
//we will need to consider exposing these methods on the API.
- public void addAllInterfaces(Interface intface)
+ public void addToAllInterfaces(Interface intface)
{
if(intface != null) {
fAllInterfaces.add(intface);
}
}
- public void addAllBindings(Binding binding)
+ public void addToAllBindings(Binding binding)
{
if(binding != null) {
fAllBindings.add(binding);
}
}
- public void addAllServices(Service service)
+ public void addToAllServices(Service service)
{
if(service != null) {
fAllServices.add(service);
}
}
- public void addAllElementDeclarations(ElementDeclaration elDec)
+ public void addToAllElementDeclarations(ElementDeclaration elDec)
{
if(elDec != null) {
fAllElementDeclarations.add(elDec);
}
}
- public void addAllTypeDefinitions(TypeDefinition typeDef)
+ public void addToAllTypeDefinitions(TypeDefinition typeDef)
{
if(typeDef != null) {
fAllTypeDefinitions.add(typeDef);
Modified: incubator/woden/java/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java?rev=371514&r1=371513&r2=371514&view=diff
==============================================================================
--- incubator/woden/java/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java (original)
+++ incubator/woden/java/test/org/apache/woden/internal/wsdl20/validation/WSDLComponentValidatorTest.java Mon Jan 23 02:26:18 2006
@@ -1288,7 +1288,7 @@
DescriptionImpl desc = new DescriptionImpl();
TypeDefinitionImpl type = new TypeDefinitionImpl();
type.setName(new QName("http://www.sample.org", "myType"));
- desc.addTypeDefinition(type);
+ desc.addToAllTypeDefinitions(type);
PropertyImpl property = new PropertyImpl();
property.setHasValueToken(false);
property.setConstraintName(new QName("http://www.sample.org", "myType"));
@@ -1308,7 +1308,7 @@
DescriptionImpl desc = new DescriptionImpl();
TypeDefinitionImpl type = new TypeDefinitionImpl();
type.setName(new QName("http://www.sample.org", "myType"));
- desc.addTypeDefinition(type);
+ desc.addToAllTypeDefinitions(type);
PropertyImpl property = new PropertyImpl();
property.setHasValueToken(false);
property.setConstraintName(new QName("http://www.sample.org", "myType2"));
@@ -1328,7 +1328,7 @@
DescriptionImpl desc = new DescriptionImpl();
TypeDefinitionImpl type = new TypeDefinitionImpl();
type.setName(new QName("http://www.sample.org", "myType"));
- desc.addTypeDefinition(type);
+ desc.addToAllTypeDefinitions(type);
PropertyImpl property = new PropertyImpl();
property.setHasValueToken(false);
property.setConstraintName(null);
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org