[jboss-cvs] JBoss Messaging SVN: r1436 - trunk/src/main/org/jboss/jms/client/state
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 5 17:42:38 EDT 2006
Author: clebert.suconic at jboss.com
Date: 2006-10-05 17:42:34 -0400 (Thu, 05 Oct 2006)
New Revision: 1436
Modified:
trunk/src/main/org/jboss/jms/client/state/BrowserState.java
trunk/src/main/org/jboss/jms/client/state/ConnectionState.java
trunk/src/main/org/jboss/jms/client/state/ConsumerState.java
trunk/src/main/org/jboss/jms/client/state/HierarchicalState.java
trunk/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java
trunk/src/main/org/jboss/jms/client/state/ProducerState.java
trunk/src/main/org/jboss/jms/client/state/SessionState.java
Log:
JBMESSAGING-519 - just making relationships clearer on package state
Modified: trunk/src/main/org/jboss/jms/client/state/BrowserState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/BrowserState.java 2006-10-05 17:39:25 UTC (rev 1435)
+++ trunk/src/main/org/jboss/jms/client/state/BrowserState.java 2006-10-05 21:42:34 UTC (rev 1436)
@@ -23,6 +23,7 @@
import org.jboss.jms.delegate.BrowserDelegate;
import org.jboss.jms.server.Version;
+import org.jboss.jms.client.delegate.DelegateSupport;
/**
* State corresponding to a browser
@@ -35,14 +36,40 @@
*/
public class BrowserState extends HierarchicalStateSupport
{
+
+ private SessionState parent;
+ private BrowserDelegate delegate;
+
public BrowserState(SessionState parent, BrowserDelegate delegate)
{
- super(parent, delegate);
- }
-
+ super(parent, (DelegateSupport)delegate);
+ }
+
+
+
+ public DelegateSupport getDelegate()
+ {
+ return (DelegateSupport)delegate;
+ }
+ public void setDelegate(DelegateSupport delegate)
+ {
+ this.delegate=(BrowserDelegate)delegate;
+ }
+
+
public Version getVersionToUse()
{
return parent.getVersionToUse();
}
+
+ public void setParent(HierarchicalState parent)
+ {
+ this.parent=(SessionState)parent;
+ }
+ public HierarchicalState getParent()
+ {
+ return parent;
+ }
+
}
Modified: trunk/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/ConnectionState.java 2006-10-05 17:39:25 UTC (rev 1435)
+++ trunk/src/main/org/jboss/jms/client/state/ConnectionState.java 2006-10-05 21:42:34 UTC (rev 1436)
@@ -24,6 +24,7 @@
import java.util.HashSet;
import org.jboss.jms.client.remoting.JMSRemotingConnection;
+import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.delegate.ConnectionDelegate;
import org.jboss.jms.message.MessageIdGenerator;
import org.jboss.jms.server.Version;
@@ -55,13 +56,15 @@
private int serverID;
private Version versionToUse;
+
+ private ConnectionDelegate delegate;
public ConnectionState(int serverID, ConnectionDelegate delegate,
JMSRemotingConnection remotingConnection, Version versionToUse,
ResourceManager rm, MessageIdGenerator gen)
throws Exception
{
- super(null, delegate);
+ super(null, (DelegateSupport)delegate);
if (log.isTraceEnabled()) { log.trace("Creating connection state"); }
@@ -102,5 +105,28 @@
{
return serverID;
}
+
+
+ public DelegateSupport getDelegate()
+ {
+ return (DelegateSupport)delegate;
+ }
+
+ public void setDelegate(DelegateSupport delegate)
+ {
+ this.delegate=(ConnectionDelegate)delegate;
+ }
+
+ /** Connection doesn't have a parent */
+ public void setParent(HierarchicalState parent)
+ {
+ }
+
+ /** Connection doesn't have a parent */
+ public HierarchicalState getParent()
+ {
+ return null;
+ }
+
}
Modified: trunk/src/main/org/jboss/jms/client/state/ConsumerState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/ConsumerState.java 2006-10-05 17:39:25 UTC (rev 1435)
+++ trunk/src/main/org/jboss/jms/client/state/ConsumerState.java 2006-10-05 21:42:34 UTC (rev 1436)
@@ -26,6 +26,7 @@
import javax.jms.Destination;
import org.jboss.jms.client.remoting.MessageCallbackHandler;
+import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.delegate.ConsumerDelegate;
import org.jboss.jms.server.Version;
@@ -52,12 +53,16 @@
private MessageCallbackHandler messageCallbackHandler;
private int prefetchSize;
-
+
+ private SessionState parent;
+
+ private ConsumerDelegate delegate;
+
public ConsumerState(SessionState parent, ConsumerDelegate delegate, Destination dest,
String selector, boolean noLocal, int consumerID, boolean isCC,
int prefetchSize)
{
- super(parent, delegate);
+ super(parent, (DelegateSupport)delegate);
children = Collections.EMPTY_SET;
this.destination = dest;
this.selector = selector;
@@ -66,7 +71,19 @@
this.isConnectionConsumer = isCC;
this.prefetchSize = prefetchSize;
}
-
+
+
+ public DelegateSupport getDelegate()
+ {
+ return (DelegateSupport)delegate;
+ }
+
+ public void setDelegate(DelegateSupport delegate)
+ {
+ this.delegate = (ConsumerDelegate)delegate;
+ }
+
+
public Destination getDestination()
{
return destination;
@@ -111,7 +128,13 @@
{
return prefetchSize;
}
-
+ public HierarchicalState getParent() {
+ return parent;
+ }
+
+ public void setParent(HierarchicalState parent) {
+ this.parent=(SessionState)parent;
+ }
}
Modified: trunk/src/main/org/jboss/jms/client/state/HierarchicalState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/HierarchicalState.java 2006-10-05 17:39:25 UTC (rev 1435)
+++ trunk/src/main/org/jboss/jms/client/state/HierarchicalState.java 2006-10-05 21:42:34 UTC (rev 1436)
@@ -40,9 +40,10 @@
Set getChildren();
DelegateSupport getDelegate();
-
+ void setDelegate(DelegateSupport delegate);
+
HierarchicalState getParent();
-
+ void setParent(HierarchicalState parent);
+
Version getVersionToUse();
-
}
Modified: trunk/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java 2006-10-05 17:39:25 UTC (rev 1435)
+++ trunk/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java 2006-10-05 21:42:34 UTC (rev 1436)
@@ -47,18 +47,15 @@
protected Set children;
- protected HierarchicalState parent;
- protected DelegateSupport delegate;
-
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
- public HierarchicalStateSupport(HierarchicalState parent, Object delegate)
+ public HierarchicalStateSupport(HierarchicalState parent, DelegateSupport delegate)
{
- this.parent = parent;
- this.delegate = (DelegateSupport)delegate; // TODO - find a more elegant solution, delegate must implement an interface that has getID()
+ this.setParent(parent);
+ this.setDelegate(delegate); // TODO - find a more elegant solution, delegate must implement an interface that has getID()
if (parent != null)
{
parent.getChildren().add(this);
@@ -72,16 +69,7 @@
return children;
}
- public HierarchicalState getParent()
- {
- return parent;
- }
- public DelegateSupport getDelegate()
- {
- return delegate;
- }
-
// Public --------------------------------------------------------
// Protected ------------------------------------------------------
Modified: trunk/src/main/org/jboss/jms/client/state/ProducerState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/ProducerState.java 2006-10-05 17:39:25 UTC (rev 1435)
+++ trunk/src/main/org/jboss/jms/client/state/ProducerState.java 2006-10-05 21:42:34 UTC (rev 1436)
@@ -28,6 +28,7 @@
import org.jboss.jms.delegate.ProducerDelegate;
import org.jboss.jms.server.Version;
+import org.jboss.jms.client.delegate.DelegateSupport;
/**
* State corresponding to a producer. This state is acessible inside aspects/interceptors.
@@ -40,90 +41,116 @@
public class ProducerState extends HierarchicalStateSupport
{
private Destination destination;
-
+
private boolean disableMessageID = false;
-
+
private boolean disableMessageTimestamp = false;
-
+
private int priority = 4;
-
+
private long timeToLive = 0;
-
+
private int deliveryMode = DeliveryMode.PERSISTENT;
-
+
+ private SessionState parent;
+
+ private ProducerDelegate delegate;
+
public ProducerState(SessionState parent, ProducerDelegate delegate, Destination dest)
{
- super(parent, delegate);
+ super(parent, (DelegateSupport)delegate);
children = Collections.EMPTY_SET;
this.destination = dest;
}
-
+
public Destination getDestination()
{
return destination;
}
-
+
+
+ public DelegateSupport getDelegate()
+ {
+ return (DelegateSupport)delegate;
+ }
+
+ public void setDelegate(DelegateSupport delegate)
+ {
+ this.delegate=(ProducerDelegate)delegate;
+ }
+
+
+ public void setParent(HierarchicalState parent)
+ {
+ this.parent = (SessionState)parent;
+ }
+ public HierarchicalState getParent()
+ {
+ return parent;
+ }
+
+
public void setDestination(Destination dest)
{
this.destination = dest;
-
+
}
public boolean isDisableMessageID()
{
return disableMessageID;
}
-
+
public void setDisableMessageID(boolean disableMessageID)
{
this.disableMessageID = disableMessageID;
}
-
+
public boolean isDisableMessageTimestamp()
{
return disableMessageTimestamp;
}
-
+
public void setDisableMessageTimestamp(boolean disableMessageTimestamp)
{
this.disableMessageTimestamp = disableMessageTimestamp;
}
-
+
public int getPriority()
{
return priority;
}
-
+
public void setPriority(int priority)
{
this.priority = priority;
}
-
+
public long getTimeToLive()
{
return timeToLive;
}
-
+
public void setTimeToLive(long timeToLive)
{
this.timeToLive = timeToLive;
}
-
+
public int getDeliveryMode()
{
return deliveryMode;
}
-
+
public void setDeliveryMode(int deliveryMode)
{
this.deliveryMode = deliveryMode;
}
-
+
public Version getVersionToUse()
{
return parent.getVersionToUse();
}
-
-
+
+
}
Modified: trunk/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/SessionState.java 2006-10-05 17:39:25 UTC (rev 1435)
+++ trunk/src/main/org/jboss/jms/client/state/SessionState.java 2006-10-05 21:42:34 UTC (rev 1436)
@@ -28,6 +28,7 @@
import java.util.Map;
import org.jboss.jms.client.remoting.MessageCallbackHandler;
+import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.delegate.SessionDelegate;
import org.jboss.jms.server.Version;
import org.jboss.jms.tx.MessagingXAResource;
@@ -62,13 +63,16 @@
// List<AckInfo>
private List toAck;
+
+ private ConnectionState parent;
+ private SessionDelegate delegate;
private Map callbackHandlers;
public SessionState(ConnectionState parent, SessionDelegate delegate,
boolean transacted, int ackMode, boolean xa)
{
- super(parent, delegate);
+ super(parent, (DelegateSupport)delegate);
children = new HashSet();
this.acknowledgeMode = ackMode;
this.transacted = transacted;
@@ -98,6 +102,27 @@
callbackHandlers = new HashMap();
}
+
+ public void setParent(HierarchicalState parent)
+ {
+ this.parent = (ConnectionState)parent;
+ }
+ public HierarchicalState getParent()
+ {
+ return parent;
+ }
+
+ public DelegateSupport getDelegate()
+ {
+ return (DelegateSupport)delegate;
+ }
+
+ public void setDelegate(DelegateSupport delegate)
+ {
+ this.delegate=(SessionDelegate)delegate;
+ }
+
+
/**
* @return List<AckInfo>
*/
More information about the jboss-cvs-commits
mailing list