[jboss-cvs] JBoss Messaging SVN: r4526 - trunk/src/main/org/jboss/messaging/jms/client.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2008-06-19 11:32:54 -0400 (Thu, 19 Jun 2008)
New Revision: 4526

Modified:
   trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
   trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java
   trunk/src/main/org/jboss/messaging/jms/client/JBossMessageProducer.java
   trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java
   trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
Log:
renamed methods getDelegate() in JBossXXX classes which return ClientXXX object
removed unused methods

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java	2008-06-19 15:32:20 UTC (rev 4525)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java	2008-06-19 15:32:54 UTC (rev 4526)
@@ -862,7 +862,7 @@
     
    // Public --------------------------------------------------------
    
-   public ClientMessage getCoreMessage()
+   public ClientMessage getDelegate()
    {
       return message;
    }

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java	2008-06-19 15:32:20 UTC (rev 4525)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java	2008-06-19 15:32:54 UTC (rev 4526)
@@ -168,11 +168,6 @@
       return noLocal;
    }
 
-   public ClientConsumer getConsumer()
-   {
-       return consumer;
-   }
-
    // Public --------------------------------------------------------
 
    public String toString()
@@ -188,7 +183,7 @@
    
    private void checkClosed() throws JMSException
    {
-      if (session.getCoreSession().isClosed())
+      if (session.getDelegate().isClosed())
       {
          throw new IllegalStateException("Consumer is closed");
       }
@@ -204,9 +199,9 @@
          
          if (message != null)
          {         
-            session.getCoreSession().acknowledge();
+            session.getDelegate().acknowledge();
                      
-            jbm = JBossMessage.createMessage(message, session.getCoreSession());
+            jbm = JBossMessage.createMessage(message, session.getDelegate());
             
             try
             {

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessageProducer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessageProducer.java	2008-06-19 15:32:20 UTC (rev 4525)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessageProducer.java	2008-06-19 15:32:54 UTC (rev 4526)
@@ -306,11 +306,6 @@
    
    // Public --------------------------------------------------------
 
-   public ClientProducer getDelegate()
-   {
-      return producer;
-   }
-
    public String toString()
    {
       return "JBossMessageProducer->" + producer;
@@ -444,7 +439,7 @@
 
       try
       {      	
-      	producer.send(address, jbm.getCoreMessage());      		      	
+      	producer.send(address, jbm.getDelegate());      		      	
       }
       catch (MessagingException e)
       {

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java	2008-06-19 15:32:20 UTC (rev 4525)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java	2008-06-19 15:32:54 UTC (rev 4526)
@@ -105,11 +105,6 @@
       return "JBossQueueBrowser->" + browser;
    }
 
-   public ClientBrowser getBrowser()
-   {
-      return browser;
-   }
-
    // Package protected ----------------------------------------------------------------------------
 
    // Protected ------------------------------------------------------------------------------------

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java	2008-06-19 15:32:20 UTC (rev 4525)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java	2008-06-19 15:32:54 UTC (rev 4526)
@@ -791,7 +791,7 @@
       return "JBossSession->" + session;
    }
    
-   public ClientSession getCoreSession()
+   public ClientSession getDelegate()
    {
       return session;
    }