You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/03/17 00:34:25 UTC
svn commit: r924051 - in
/tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script:
ScriptImplementation.java impl/ScriptImplementationImpl.java
xml/ScriptImplementationProcessor.java
Author: rfeng
Date: Tue Mar 16 23:34:25 2010
New Revision: 924051
URL: http://svn.apache.org/viewvc?rev=924051&view=rev
Log:
Make sure the equals is overridden by ScriptImplementationImpl to avoid conflicts with ComponentTypeImpl
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java
tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java?rev=924051&r1=924050&r2=924051&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java Tue Mar 16 23:34:25 2010
@@ -43,8 +43,4 @@ public interface ScriptImplementation ex
String getLanguage();
- String getURI();
-
- void setURI(String uri);
-
}
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java?rev=924051&r1=924050&r2=924051&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java Tue Mar 16 23:34:25 2010
@@ -32,20 +32,20 @@ import org.apache.tuscany.sca.implementa
public class ScriptImplementationImpl extends ImplementationImpl implements ScriptImplementation {
public static final QName TYPE = new QName(Base.SCA11_TUSCANY_NS, "implementation.script");
- private String uri;
- private String language;
- private String location;
+ private String script; // Relative URI to the script
+ private String language; // Scripting lang
+ private String location; // Resolved location of the script
public ScriptImplementationImpl() {
super(TYPE);
}
public String getScript() {
- return uri;
+ return script;
}
- public void setScript(String uri) {
- this.uri = uri;
+ public void setScript(String script) {
+ this.script = script;
}
public String getLocation() {
@@ -64,16 +64,39 @@ public class ScriptImplementationImpl ex
return language;
}
- public String getURI() {
- return uri;
+ @Override
+ public String toString() {
+ return "Script : " + getScript();
}
- public void setURI(String uri) {
- this.uri = uri;
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result + ((language == null) ? 0 : language.hashCode());
+ result = prime * result + ((script == null) ? 0 : script.hashCode());
+ return result;
}
@Override
- public String toString() {
- return "Script : " + getURI();
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (!super.equals(obj))
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ ScriptImplementationImpl other = (ScriptImplementationImpl)obj;
+ if (language == null) {
+ if (other.language != null)
+ return false;
+ } else if (!language.equals(other.language))
+ return false;
+ if (script == null) {
+ if (other.script != null)
+ return false;
+ } else if (!script.equals(other.script))
+ return false;
+ return true;
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java?rev=924051&r1=924050&r2=924051&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java Tue Mar 16 23:34:25 2010
@@ -159,7 +159,7 @@ public class ScriptImplementationProcess
*/
private void error(Monitor monitor, String message, Object model, Object... messageParameters) {
if (monitor != null) {
- Problem problem = monitor.createProblem(this.getClass().getName(), "impl-widget-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+ Problem problem = monitor.createProblem(this.getClass().getName(), "impl-script-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
monitor.problem(problem);
}
}