Clear up some warnings
diff --git a/reference-testhelpers/pom.xml b/reference-testhelpers/pom.xml
index e885e9c..c92146b 100644
--- a/reference-testhelpers/pom.xml
+++ b/reference-testhelpers/pom.xml
@@ -34,7 +34,6 @@
<dependency>
<groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/BlueReference.java b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/BlueReference.java
index f59dedf..5eabe9d 100644
--- a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/BlueReference.java
+++ b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/BlueReference.java
@@ -74,6 +74,7 @@
* Fakes a de-reference operation, returning a byte stream over the string
* data.
*/
+ @Override
public InputStream openStream(ReferenceContext arg0) {
try {
return new ByteArrayInputStream(this.contents
@@ -115,6 +116,7 @@
return "blue{" + contents + "}";
}
+ @Override
public Long getApproximateSizeInBytes() {
return new Long(contents.getBytes().length);
}
diff --git a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenBuilder.java b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenBuilder.java
index 14e9d63..6a11546 100644
--- a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenBuilder.java
+++ b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenBuilder.java
@@ -54,6 +54,7 @@
* if there are any issues building the new GreenReference
* (which there won't be)
*/
+ @Override
public GreenReference createReference(InputStream is,
ReferenceContext context)
throws ExternalReferenceConstructionException {
@@ -80,6 +81,7 @@
*
* @return <code>1.5f</code>
*/
+ @Override
public float getConstructionCost() {
return 1.5f;
}
@@ -87,6 +89,7 @@
/**
* @return <code>{@link net.sf.taverna.t2referencetest.GreenReference GreenReference}.class</code>
*/
+ @Override
public Class<GreenReference> getReferenceType() {
return GreenReference.class;
}
@@ -96,6 +99,7 @@
*
* @return <code>true</code>
*/
+ @Override
public boolean isEnabled(ReferenceContext arg0) {
return true;
}
diff --git a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenReference.java b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenReference.java
index 93d89f2..e01f604 100644
--- a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenReference.java
+++ b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenReference.java
@@ -74,6 +74,7 @@
* Fakes a de-reference operation, returning a byte stream over the string
* data.
*/
+ @Override
public InputStream openStream(ReferenceContext arg0) {
try {
return new ByteArrayInputStream(this.contents
@@ -115,6 +116,7 @@
return "green{" + contents + "}";
}
+ @Override
public Long getApproximateSizeInBytes() {
return new Long(contents.getBytes().length);
}
diff --git a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenToRed.java b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenToRed.java
index 52d9eb1..8c673d6 100644
--- a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenToRed.java
+++ b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/GreenToRed.java
@@ -26,6 +26,7 @@
public class GreenToRed implements
ExternalReferenceTranslatorSPI<GreenReference, RedReference> {
+ @Override
public RedReference createReference(GreenReference ref,
ReferenceContext context) {
RedReference newReference = new RedReference();
@@ -41,18 +42,22 @@
return newReference;
}
+ @Override
public Class<GreenReference> getSourceReferenceType() {
return GreenReference.class;
}
+ @Override
public Class<RedReference> getTargetReferenceType() {
return RedReference.class;
}
+ @Override
public float getTranslationCost() {
return 0.4f;
}
+ @Override
public boolean isEnabled(ReferenceContext arg0) {
return true;
}
diff --git a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/RedReference.java b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/RedReference.java
index 74eaddf..0c21c72 100644
--- a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/RedReference.java
+++ b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/RedReference.java
@@ -74,6 +74,7 @@
* Fakes a de-reference operation, returning a byte stream over the string
* data.
*/
+ @Override
public InputStream openStream(ReferenceContext arg0) {
try {
return new ByteArrayInputStream(this.contents
@@ -115,6 +116,7 @@
return "red{" + contents + "}";
}
+ @Override
public Long getApproximateSizeInBytes() {
return new Long(contents.getBytes().length);
}
diff --git a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/YellowReference.java b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/YellowReference.java
index 73ac9c9..b276f58 100644
--- a/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/YellowReference.java
+++ b/reference-testhelpers/src/main/java/net/sf/taverna/t2referencetest/YellowReference.java
@@ -75,6 +75,7 @@
* Fakes a de-reference operation, returning a byte stream over the string
* data.
*/
+ @Override
public InputStream openStream(ReferenceContext arg0) {
try {
return new ByteArrayInputStream(this.contents
@@ -116,6 +117,7 @@
return "yellow{" + contents + "}";
}
+ @Override
public Long getApproximateSizeInBytes() {
return new Long(contents.getBytes().length);
}
diff --git a/workflowmodel-api/pom.xml b/workflowmodel-api/pom.xml
index 0d8d9c5..8b22fa0 100644
--- a/workflowmodel-api/pom.xml
+++ b/workflowmodel-api/pom.xml
@@ -37,17 +37,15 @@
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
- <version>${jdom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/workflowmodel-impl/pom.xml b/workflowmodel-impl/pom.xml
index beb9c6d..c2c6851 100644
--- a/workflowmodel-impl/pom.xml
+++ b/workflowmodel-impl/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
- <version>${jdom.version}</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
@@ -57,15 +56,14 @@
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
