You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ha...@apache.org on 2013/03/03 04:48:51 UTC

[2/2] git commit: Fix minor issues considered errors by eclipse

Updated Branches:
  refs/heads/master b982c5d39 -> 548020cbd


Fix minor issues considered errors by eclipse


Project: http://git-wip-us.apache.org/repos/asf/ode-jacob/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-jacob/commit/548020cb
Tree: http://git-wip-us.apache.org/repos/asf/ode-jacob/tree/548020cb
Diff: http://git-wip-us.apache.org/repos/asf/ode-jacob/diff/548020cb

Branch: refs/heads/master
Commit: 548020cbd20deb5a94f02249fd137a535247fb54
Parents: 9571120
Author: Hadrian Zbarcea <hz...@gmail.com>
Authored: Sat Mar 2 22:48:34 2013 -0500
Committer: Hadrian Zbarcea <hz...@gmail.com>
Committed: Sat Mar 2 22:48:34 2013 -0500

----------------------------------------------------------------------
 .gitignore                                         |    1 +
 pom.xml                                            |    1 +
 .../soup/jackson/JacobTypeResolverBuilder.java     |    4 ----
 .../apache/ode/jacob/vpu/ExecutionQueueImpl.java   |    3 ---
 .../ode/jacob/examples/helloworld/HelloWorld.java  |    2 --
 .../ode/jacob/examples/synch/SynchPrinter.java     |    1 -
 .../ode/jacob/vpu/ProxyConstructorTimingTest.java  |    3 ---
 7 files changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/548020cb/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index e34dbcc..afd9057 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 *~
 .classpath
 .project
+.settings
 .metadata
 bin
 target

http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/548020cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 92abc18..b3b1f97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
 
 <project>
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.apache.ode</groupId>
   <artifactId>jacob</artifactId>
   <version>2.0-SNAPSHOT</version>

http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/548020cb/src/main/java/org/apache/ode/jacob/soup/jackson/JacobTypeResolverBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/ode/jacob/soup/jackson/JacobTypeResolverBuilder.java b/src/main/java/org/apache/ode/jacob/soup/jackson/JacobTypeResolverBuilder.java
index bb1153a..a01d13e 100644
--- a/src/main/java/org/apache/ode/jacob/soup/jackson/JacobTypeResolverBuilder.java
+++ b/src/main/java/org/apache/ode/jacob/soup/jackson/JacobTypeResolverBuilder.java
@@ -111,7 +111,6 @@ public class JacobTypeResolverBuilder extends StdTypeResolverBuilder {
             delegate = new ClassNameIdResolver(baseType, typeFactory);
         }
 
-        @Override
         public String idFromValue(Object value) {
             if (value instanceof ChannelProxy) {
                 return "<<channelproxy>>";
@@ -119,12 +118,10 @@ public class JacobTypeResolverBuilder extends StdTypeResolverBuilder {
             return delegate.idFromValue(value);
         }
 
-        @Override
         public String idFromValueAndType(Object value, Class<?> suggestedType) {
             return delegate.idFromValueAndType(value, suggestedType);
         }
 
-        @Override
         public JavaType typeFromId(String id) {
             if ("<<channelproxy>>".equals(id)) {
                 return null; // force jackson to use default impl
@@ -132,7 +129,6 @@ public class JacobTypeResolverBuilder extends StdTypeResolverBuilder {
             return delegate.typeFromId(id);
         }
 
-        @Override
         public Id getMechanism() {
             return Id.CUSTOM;
         }

http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/548020cb/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java b/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
index 362be0c..c95cfb3 100644
--- a/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
+++ b/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
@@ -461,7 +461,6 @@ public class ExecutionQueueImpl implements ExecutionQueue {
         public String description;
 
         // Used for deserialization
-        @SuppressWarnings("unused")
         public ChannelFrame() {
         }
 
@@ -572,7 +571,6 @@ public class ExecutionQueueImpl implements ExecutionQueue {
         ChannelListener _continuation;
 
         // Used for deserialization
-        @SuppressWarnings("unused")
         public ObjectFrame() {
         }
 
@@ -754,7 +752,6 @@ public class ExecutionQueueImpl implements ExecutionQueue {
         }
 
         // Used for deserialization
-        @SuppressWarnings("unused")
         public ChannelRef() {
         }
 

http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/548020cb/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java b/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
index d755789..84708dd 100644
--- a/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
+++ b/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
@@ -57,7 +57,6 @@ public class HelloWorld extends JacobRunnable {
             object(true, new ReceiveProcess() {
                 private static final long serialVersionUID = 1L;
             }.setChannel(in).setReceiver(new Callback<String, Synch>(){
-                @Override
                 public void invoke(String value, Synch callback) {
                     System.out.println(value);
                     callback.ret();
@@ -81,7 +80,6 @@ public class HelloWorld extends JacobRunnable {
             object(new ReceiveProcess() {
                 private static final long serialVersionUID = 1L;
             }.setChannel(callback).setReceiver(new Synch() {
-                @Override
                 public void ret() {
                     System.out.println(str + " ACKed");
                 }

http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/548020cb/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
index b6a4942..37c2183 100644
--- a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
+++ b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
@@ -109,7 +109,6 @@ public class SynchPrinter {
                 run();
             }
 
-            @Override
             public void run() {
                 if (message != null) {
                     object(receive(printer.print(message), new Synch() {

http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/548020cb/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java b/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
index 623e2ca..110baf9 100644
--- a/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
+++ b/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
@@ -79,7 +79,6 @@ public class ProxyConstructorTimingTest extends TestCase {
 
     public void manualTestProxyTiming() throws Exception {
         timedRepeatedExecution("direct invocation", new TestExecution() {
-            @Override
             public void execute() throws Exception {
                 // Create new instance every time
                 new GreeterImpl2().hello("World");
@@ -87,7 +86,6 @@ public class ProxyConstructorTimingTest extends TestCase {
         });
 
         timedRepeatedExecution("newProxyInstance", new TestExecution() {
-            @Override
             public void execute() throws Exception {
                 Greeter gp = (Greeter) Proxy.newProxyInstance(Greeter.class.getClassLoader(),
                     new Class<?>[] {Greeter.class}, new GreeterInvocationHandler(new GreeterImpl2()));
@@ -97,7 +95,6 @@ public class ProxyConstructorTimingTest extends TestCase {
 
         final ProxyConstructor<Greeter> helper = new ProxyConstructor<Greeter>(Greeter.class);
         timedRepeatedExecution("ProxyConstructor", new TestExecution() {
-            @Override
             public void execute() throws Exception {
                 Greeter gp = (Greeter) helper.newInstance(new GreeterInvocationHandler(new GreeterImpl2()));
                 gp.hello("World");