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/07/30 22:21:05 UTC
svn commit: r561106 - in /incubator/tuscany/java/sca/modules:
assembly/src/main/java/org/apache/tuscany/sca/assembly/
assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/
core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/imp...
Author: jsdelfino
Date: Mon Jul 30 13:21:03 2007
New Revision: 561106
URL: http://svn.apache.org/viewvc?view=rev&rev=561106
Log:
Applied patch from JIRA TUSCANY-1485, removing Visitor and Visitable.
Removed:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java Mon Jul 30 13:21:03 2007
@@ -29,7 +29,7 @@
*
* @version $Rev$ $Date$
*/
-public interface Component extends Base, IntentAttachPoint, PolicySetAttachPoint, Visitable, Cloneable {
+public interface Component extends Base, IntentAttachPoint, PolicySetAttachPoint, Cloneable {
/**
* Returns the URI of the component.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java Mon Jul 30 13:21:03 2007
@@ -28,7 +28,7 @@
*
* @version $Rev$ $Date$
*/
-public interface Composite extends Implementation, Visitable, Cloneable {
+public interface Composite extends Implementation, Cloneable {
/**
* Returns the name of the composite.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java Mon Jul 30 13:21:03 2007
@@ -22,15 +22,13 @@
import java.util.List;
import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.assembly.Visitable;
-import org.apache.tuscany.sca.assembly.Visitor;
/**
* Convenience base class for assembly model objects.
*
* @version $Rev$ $Date$
*/
-public abstract class BaseImpl implements Base, Visitable {
+public abstract class BaseImpl implements Base {
private List<Object> extensions = new ArrayList<Object>();
private boolean unresolved;
@@ -52,7 +50,4 @@
this.unresolved = undefined;
}
- public boolean accept(Visitor visitor) {
- return visitor.visit(this);
- }
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java Mon Jul 30 13:21:03 2007
@@ -24,7 +24,6 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Callback;
-import org.apache.tuscany.sca.assembly.Visitor;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -53,10 +52,4 @@
return requiredIntents;
}
- public boolean accept(Visitor visitor) {
- if (!super.accept(visitor)) {
- return false;
- }
- return true;
- }
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java Mon Jul 30 13:21:03 2007
@@ -27,7 +27,6 @@
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Visitor;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -133,25 +132,5 @@
this.autowire = autowire;
}
- public boolean accept(Visitor visitor) {
- if (!super.accept(visitor)) {
- return false;
- }
- for (ComponentProperty property : properties) {
- if (!visitor.visit(property)) {
- return false;
- }
- }
- for (ComponentReference reference : references) {
- if (!visitor.visit(reference)) {
- return false;
- }
- }
- for (ComponentService service : services) {
- if (!visitor.visit(service)) {
- return false;
- }
- }
- return true;
- }
+
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java Mon Jul 30 13:21:03 2007
@@ -26,7 +26,6 @@
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.Visitor;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -103,28 +102,6 @@
public List<PolicySet> getPolicySets() {
return policySets;
- }
-
- public boolean accept(Visitor visitor) {
- if (!super.accept(visitor)) {
- return false;
- }
- for (Property property : properties) {
- if (!visitor.visit(property)) {
- return false;
- }
- }
- for (Reference reference : references) {
- if (!visitor.visit(reference)) {
- return false;
- }
- }
- for (Service service : services) {
- if (!visitor.visit(service)) {
- return false;
- }
- }
- return true;
}
@Override
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java Mon Jul 30 13:21:03 2007
@@ -26,7 +26,7 @@
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Visitor;
+
import org.apache.tuscany.sca.assembly.Wire;
public class CompositeImpl extends ComponentTypeImpl implements Composite, Cloneable {
@@ -92,26 +92,6 @@
public void setName(QName name) {
this.name = name;
- }
-
- @Override
- public boolean accept(Visitor visitor) {
- boolean result = super.accept(visitor);
- if (!result) {
- return false;
- }
-
- for (Component component: components) {
- if (!component.accept(visitor)) {
- return false;
- }
- }
-
- for (Wire wire: wires) {
- if (!visitor.visit(wire))
- return false;
- }
- return true;
}
@Override
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java Mon Jul 30 13:21:03 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.assembly.AbstractReference;
import org.apache.tuscany.sca.assembly.AbstractService;
import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Visitor;
+
import org.apache.tuscany.sca.policy.Intent;
/**
@@ -70,28 +70,6 @@
public List<Intent> getRequiredIntents() {
return requiredIntents;
- }
-
- public boolean accept(Visitor visitor) {
- if (!super.accept(visitor)) {
- return false;
- }
- for (AbstractProperty property : properties) {
- if (!visitor.visit(property)) {
- return false;
- }
- }
- for (AbstractReference reference : references) {
- if (!visitor.visit(reference)) {
- return false;
- }
- }
- for (AbstractService service : services) {
- if (!visitor.visit(service)) {
- return false;
- }
- }
- return true;
}
@Override
Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java Mon Jul 30 13:21:03 2007
@@ -27,7 +27,6 @@
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Visitor;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.PolicySet;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -187,25 +186,4 @@
this.unresolved = undefined;
}
- public boolean accept(Visitor visitor) {
- if (!visitor.visit(this)) {
- return false;
- }
- for (ComponentProperty property : properties) {
- if (!visitor.visit(property)) {
- return false;
- }
- }
- for (ComponentReference reference : references) {
- if (!visitor.visit(reference)) {
- return false;
- }
- }
- for (ComponentService service : services) {
- if (!visitor.visit(service)) {
- return false;
- }
- }
- return true;
- }
}
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java Mon Jul 30 13:21:03 2007
@@ -28,7 +28,7 @@
* and its support of various QoS policies
*
*/
-public interface ExtensionType /*extends Visitable*/ {
+public interface ExtensionType {
/**
* Returns the name of the extension type defined by this instance e.g. implementation.java, binding.ws
* @return the extension type QName
Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java?view=diff&rev=561106&r1=561105&r2=561106
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/SCADefinitions.java Mon Jul 30 13:21:03 2007
@@ -21,14 +21,12 @@
import java.net.URI;
import java.util.List;
-import javax.xml.namespace.QName;
-
/**
* Represents SCA Definitions.
*
*/
-public interface SCADefinitions /*extends Visitable*/ {
+public interface SCADefinitions {
/**
* Returns the target namespace for this SCA Definition
* @return the target namespace
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org