[wsmx-commits] components/core/src/main/ie/deri/wsmx/wrapper JavaSpaceTransport.java,1.1.2.5,1.1.2.6

[Thomas H. <has...@us...>]

Update of /cvsroot/wsmx/components/core/src/main/ie/deri/wsmx/wrapper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19540/core/src/main/ie/deri/wsmx/wrapper

Modified Files:
      Tag: core_wrappers
	JavaSpaceTransport.java 
Log Message:
Transport implementations may now take advantage of modifiers.

Index: JavaSpaceTransport.java
===================================================================
RCS file: /cvsroot/wsmx/components/core/src/main/ie/deri/wsmx/wrapper/Attic/JavaSpaceTransport.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** JavaSpaceTransport.java	26 Feb 2005 03:22:09 -0000	1.1.2.5
--- JavaSpaceTransport.java	27 Feb 2005 18:54:12 -0000	1.1.2.6
***************
*** 56,63 ****
  
      JavaSpace space;
-     String type;
  	static Logger logger = Logger.getLogger(JavaSpaceTransport.class);
  
!     public JavaSpaceTransport(JavaSpace space, String type) {
          super();
          this.space =space;
--- 56,62 ----
  
      JavaSpace space;
  	static Logger logger = Logger.getLogger(JavaSpaceTransport.class);
  
!     public JavaSpaceTransport(JavaSpace space) {
          super();
          this.space =space;
***************
*** 67,75 ****
       * @see ie.deri.wsmx.infomodel.Transport#send(ie.deri.wsmx.nonwsmodatamodel.Event)
       */
!     public void send(Event event) {
!         try {
! 	        space.write(new EventEntry(event.getType(), event.getPayload()),
! 	                	null,
! 	                	Long.MAX_VALUE);
          } catch(TransactionException te) {
              logger.debug("Tuplespace write operation failed.", te);
--- 66,74 ----
       * @see ie.deri.wsmx.infomodel.Transport#send(ie.deri.wsmx.nonwsmodatamodel.Event)
       */
!     public void send(Event event, Object ... modifiers) throws IllegalArgumentException {
!         EventEntry entry = new EventEntry(event.getType(), event.getPayload());
!         logger.debug("Writing entry " + entry);
!     	try {
! 	        space.write(entry, null, Long.MAX_VALUE);
          } catch(TransactionException te) {
              logger.debug("Tuplespace write operation failed.", te);
***************
*** 82,88 ****
       * @see ie.deri.wsmx.infomodel.Transport#receive()
       */
!     public Event receive() {
!         Entry template = new EventEntry(type, null);
          EventEntry result = null;
          try {
              result = (EventEntry)space.take(template, null, Long.MAX_VALUE);
--- 81,95 ----
       * @see ie.deri.wsmx.infomodel.Transport#receive()
       */
!     public Event receive(Object ... modifiers) throws IllegalArgumentException {
!     	if (modifiers != null &&
!     			modifiers[0] != null &&
!     			!(modifiers[0] instanceof String))
!     		throw new IllegalArgumentException("JavaSpaces Transport expects a String modifier.");
!     	Entry template = null;
!     	if (modifiers != null &&
!     			modifiers[0] != null)    		
!     		template = new EventEntry((String)modifiers[0], null);
          EventEntry result = null;
+         logger.debug("Attempting to take an entry for template " + template);
          try {
              result = (EventEntry)space.take(template, null, Long.MAX_VALUE);
***************
*** 98,113 ****
          return (Event)result.getPayload();
      }
! 	/**
! 	 * @return Returns the type.
! 	 */
! 	public String getType() {
! 		return type;
! 	}
! 	
! 	/**
! 	 * @param type The type to set.
! 	 */
! 	public void setType(String type) {
! 		this.type = type;
! 	}
  }
--- 105,108 ----
          return (Event)result.getPayload();
      }
! 
  }