svn commit: r725314 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model: InOnlyType.java InOutType.java SendType.java ToType.java

[jstrachan]

Author: jstrachan
Date: Wed Dec 10 07:43:35 2008
New Revision: 725314

URL: http://svn.apache.org/viewvc?rev=725314&view=rev
Log:
minor refactor to simplify the code a little for CAMEL-1171

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java?rev=725314&r1=725313&r2=725314&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java
 Wed Dec 10 07:43:35 2008
@@ -32,10 +32,6 @@
 @XmlRootElement(name = "inOnly")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class InOnlyType extends SendType<InOnlyType> {
-    @XmlAttribute(required = false)
-    private String uri;
-    @XmlAttribute(required = false)
-    private String ref;
 
     public InOnlyType() {
     }
@@ -64,21 +60,4 @@
     }
 
 
-    @Override
-    public String getRef() {
-        return ref;
-    }
-
-    public void setRef(String ref) {
-        this.ref = ref;
-    }
-
-    @Override
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
 }
\ No newline at end of file

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java?rev=725314&r1=725313&r2=725314&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
 Wed Dec 10 07:43:35 2008
@@ -32,10 +32,6 @@
 @XmlRootElement(name = "inOut")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class InOutType extends SendType<InOutType> {
-    @XmlAttribute(required = false)
-    private String uri;
-    @XmlAttribute(required = false)
-    private String ref;
 
     public InOutType() {
     }
@@ -62,23 +58,4 @@
     public ExchangePattern getPattern() {
         return ExchangePattern.InOut;
     }
-
-
-    @Override
-    public String getRef() {
-        return ref;
-    }
-
-    public void setRef(String ref) {
-        this.ref = ref;
-    }
-
-    @Override
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
 }
\ No newline at end of file

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java?rev=725314&r1=725313&r2=725314&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java
 Wed Dec 10 07:43:35 2008
@@ -40,6 +40,10 @@
 //@XmlType(name = "sendType")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SendType<Type extends ProcessorType> extends ProcessorType<Type> {
+    @XmlAttribute(required = false)
+    private String uri;
+    @XmlAttribute(required = false)
+    private String ref;
     @XmlTransient
     private Endpoint endpoint;
 
@@ -58,12 +62,20 @@
 
     // Properties
     // -----------------------------------------------------------------------
+    public String getRef() {
+        return ref;
+    }
+
+    public void setRef(String ref) {
+        this.ref = ref;
+    }
+
     public String getUri() {
-        return null;
+        return uri;
     }
 
-    public String getRef() {
-        return null;
+    public void setUri(String uri) {
+        this.uri = uri;
     }
 
     public Endpoint getEndpoint() {

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java?rev=725314&r1=725313&r2=725314&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
 Wed Dec 10 07:43:35 2008
@@ -41,10 +41,6 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ToType extends SendType<ToType> {
     @XmlAttribute(required = false)
-    private String uri;
-    @XmlAttribute(required = false)
-    private String ref;
-    @XmlAttribute(required = false)
     private ExchangePattern pattern;
 
     public ToType() {
@@ -79,22 +75,4 @@
     public void setPattern(ExchangePattern pattern) {
         this.pattern = pattern;
     }
-
-    @Override
-    public String getRef() {
-        return ref;
-    }
-
-    public void setRef(String ref) {
-        this.ref = ref;
-    }
-
-    @Override
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
 }