openamf/src/java/org/openamf/io AMFSerializer.java,1.41,1.42

Update of /cvsroot/openamf/openamf/src/java/org/openamf/io
In directory sc8-pr-cvs1:/tmp/cvs-serv31137/src/java/org/openamf/io

Modified Files:
	AMFSerializer.java 
Log Message:
code reformat

Index: AMFSerializer.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/io/AMFSerializer.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** AMFSerializer.java	20 Aug 2003 01:36:28 -0000	1.41
--- AMFSerializer.java	20 Aug 2003 01:45:42 -0000	1.42
***************
*** 60,65 ****
  	protected DataOutputStream outputStream;
  
!   private Map storedObjects     = new IdentityHashMap();
!   private int storedObjectCount = 0;
  
  	/**
--- 60,65 ----
  	protected DataOutputStream outputStream;
  
! 	private Map storedObjects = new IdentityHashMap();
! 	private int storedObjectCount = 0;
  
  	/**
***************
*** 78,84 ****
  	 */
  	public void serializeMessage(AMFMessage message) throws IOException {
! 		if (log.isInfoEnabled()) log.info("Serializing Message, for more info turn on debug level");
  
!     clearStoredObjects();
  		outputStream.writeShort(message.getVersion());
  		// write header
--- 78,85 ----
  	 */
  	public void serializeMessage(AMFMessage message) throws IOException {
! 		if (log.isInfoEnabled())
! 			log.info("Serializing Message, for more info turn on debug level");
  
! 		clearStoredObjects();
  		outputStream.writeShort(message.getVersion());
  		// write header
***************
*** 165,199 ****
  		} else {
  
!         if (storedObjects.containsKey(value)) {
!           writeStoredObject(value);
!           return;
!         }
!         storeObject(value);
  
!         if (value instanceof Object[]) {
!         // write Object Array
!         writeArray((Object[]) value);
!       } else if (value instanceof Iterator) {
!         write((Iterator) value);
!       } else if (value instanceof Collection) {
!         write((Collection) value);
!       } else if (value instanceof Map) {
!         writeMap((Map) value);
!       } else if (value instanceof ResultSet) {
!         ASRecordSet asRecordSet = new ASRecordSet();
!         asRecordSet.populate((ResultSet) value);
!         writeData(asRecordSet);
!       } else if (value instanceof Document) {
!         write((Document) value);
!       } else {
!         /*
!         MM's gateway requires all objects to be marked with the
!         Serializable interface in order to be serialized
!         That should still be followed if possible, but there is
!         no good reason to inforce it.
!         */
!         writeObject(value);
!       }
!     }
  	}
  
--- 166,200 ----
  		} else {
  
! 			if (storedObjects.containsKey(value)) {
! 				writeStoredObject(value);
! 				return;
! 			}
! 			storeObject(value);
  
! 			if (value instanceof Object[]) {
! 				// write Object Array
! 				writeArray((Object[]) value);
! 			} else if (value instanceof Iterator) {
! 				write((Iterator) value);
! 			} else if (value instanceof Collection) {
! 				write((Collection) value);
! 			} else if (value instanceof Map) {
! 				writeMap((Map) value);
! 			} else if (value instanceof ResultSet) {
! 				ASRecordSet asRecordSet = new ASRecordSet();
! 				asRecordSet.populate((ResultSet) value);
! 				writeData(asRecordSet);
! 			} else if (value instanceof Document) {
! 				write((Document) value);
! 			} else {
! 				/*
! 				MM's gateway requires all objects to be marked with the
! 				Serializable interface in order to be serialized
! 				That should still be followed if possible, but there is
! 				no good reason to inforce it.
! 				*/
! 				writeObject(value);
! 			}
! 		}
  	}
  
***************
*** 205,213 ****
  	 */
  	protected void writeObject(Object object) throws IOException {
! 		if (log.isDebugEnabled()) log.debug("Writing Object");
  		String customClassName =
  			OpenAMFConfig.getInstance().getCustomClassName(
  				object.getClass().getName());
! 		if (log.isDebugEnabled()) log.debug("customClassName :" + customClassName);
  		if (customClassName == null) {
  			outputStream.writeByte(AMFBody.DATA_TYPE_OBJECT);
--- 206,216 ----
  	 */
  	protected void writeObject(Object object) throws IOException {
! 		if (log.isDebugEnabled())
! 			log.debug("Writing Object");
  		String customClassName =
  			OpenAMFConfig.getInstance().getCustomClassName(
  				object.getClass().getName());
! 		if (log.isDebugEnabled())
! 			log.debug("customClassName :" + customClassName);
  		if (customClassName == null) {
  			outputStream.writeByte(AMFBody.DATA_TYPE_OBJECT);
***************
*** 295,303 ****
  	protected void writeMap(Map map) throws IOException {
  		if (map instanceof ASObject && ((ASObject) map).getType() != null) {
! 			if (log.isDebugEnabled()) log.debug("Writing Custom Class: " + ((ASObject) map).getType());
  			outputStream.writeByte(AMFBody.DATA_TYPE_CUSTOM_CLASS);
  			outputStream.writeUTF(((ASObject) map).getType());
  		} else {
! 			if (log.isDebugEnabled()) log.debug("Writing Map");
  			outputStream.writeByte(AMFBody.DATA_TYPE_OBJECT);
  		}
--- 298,309 ----
  	protected void writeMap(Map map) throws IOException {
  		if (map instanceof ASObject && ((ASObject) map).getType() != null) {
! 			if (log.isDebugEnabled())
! 				log.debug(
! 					"Writing Custom Class: " + ((ASObject) map).getType());
  			outputStream.writeByte(AMFBody.DATA_TYPE_CUSTOM_CLASS);
  			outputStream.writeUTF(((ASObject) map).getType());
  		} else {
! 			if (log.isDebugEnabled())
! 				log.debug("Writing Map");
  			outputStream.writeByte(AMFBody.DATA_TYPE_OBJECT);
  		}
***************
*** 322,326 ****
  		Element docElement = document.getDocumentElement();
  		String xmlData = XMLUtils.convertDOMToString(docElement);
! 		if (log.isDebugEnabled()) log.debug("Writing xmlData: \n" + xmlData);
  		ByteArrayOutputStream baOutputStream = new ByteArrayOutputStream();
  		baOutputStream.write(xmlData.getBytes());
--- 328,333 ----
  		Element docElement = document.getDocumentElement();
  		String xmlData = XMLUtils.convertDOMToString(docElement);
! 		if (log.isDebugEnabled())
! 			log.debug("Writing xmlData: \n" + xmlData);
  		ByteArrayOutputStream baOutputStream = new ByteArrayOutputStream();
  		baOutputStream.write(xmlData.getBytes());
***************
*** 329,345 ****
  	}
  
!   private void writeStoredObject(Object obj) throws IOException {
!     if (log.isDebugEnabled()) log.debug("Writing object reference for " + obj);
!     outputStream.write(AMFBody.DATA_TYPE_REFERENCE_OBJECT);
!     outputStream.writeShort(((Integer) storedObjects.get(obj)).intValue());
!   }
  
!   private void storeObject(Object obj) {
!     storedObjects.put(obj, new Integer(storedObjectCount++));
!   }
  
!   private void clearStoredObjects() {
!     storedObjects.clear();
!   }
  
  }
--- 336,353 ----
  	}
  
! 	private void writeStoredObject(Object obj) throws IOException {
! 		if (log.isDebugEnabled())
! 			log.debug("Writing object reference for " + obj);
! 		outputStream.write(AMFBody.DATA_TYPE_REFERENCE_OBJECT);
! 		outputStream.writeShort(((Integer) storedObjects.get(obj)).intValue());
! 	}
  
! 	private void storeObject(Object obj) {
! 		storedObjects.put(obj, new Integer(storedObjectCount++));
! 	}
  
! 	private void clearStoredObjects() {
! 		storedObjects.clear();
! 	}
  
  }




-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0