[jboss-svn-commits] JBL Code SVN: r6370 - in labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss: internal/soa/esb/message/format/serialized internal/soa/esb/message/format/xml soa/esb/message
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 22 11:20:12 EDT 2006
Author: estebanschifman
Date: 2006-09-22 11:20:07 -0400 (Fri, 22 Sep 2006)
New Revision: 6370
Modified:
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/AttachmentImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/PropertiesImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/Properties.java
Log:
add/fix equals(Object) method for Attachment and Properties
add size() method for Properties interface
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/AttachmentImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/AttachmentImpl.java 2006-09-22 15:19:03 UTC (rev 6369)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/AttachmentImpl.java 2006-09-22 15:20:07 UTC (rev 6370)
@@ -22,8 +22,10 @@
package org.jboss.internal.soa.esb.message.format.serialized;
import org.jboss.soa.esb.message.Attachment;
+
import java.util.ArrayList;
import java.util.Hashtable;
+import java.util.Map;
import java.io.Serializable;
/**
@@ -106,8 +108,45 @@
.append(" Unnamed:").append(_list.toString())
.toString();
}
+
+ @Override
+ public boolean equals(Object arg)
+ {
+ if (! (arg instanceof Attachment))
+ return false;
+ Attachment other = (Attachment)arg;
+ if (other.getNamedCount() != _table.size())
+ return false;
+ for(Map.Entry<String,Serializable>oCurr : _table.entrySet())
+ {
+ Object val = other.get(oCurr.getKey());
+ if (null==oCurr.getValue())
+ if (null==val)
+ continue;
+ else
+ return false;
+ if (!oCurr.getValue().equals(val))
+ return false;
+ }
+ if (other.getUnnamedCount() != _list.size())
+ return false;
+ int index = 0;
+ for (Serializable oCurr : _list)
+ {
+ Object val = other.itemAt(index++);
+ if (null==oCurr)
+ if (null==val)
+ continue;
+ else
+ return false;
+ if (!oCurr.equals(val))
+ return false;
+ }
+ return true;
+ }
+
ArrayList<Serializable> _list = new ArrayList<Serializable>();
Hashtable<String,Serializable> _table = new Hashtable<String,Serializable>();
}
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/PropertiesImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/PropertiesImpl.java 2006-09-22 15:19:03 UTC (rev 6369)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/serialized/PropertiesImpl.java 2006-09-22 15:20:07 UTC (rev 6370)
@@ -53,6 +53,8 @@
{
return _table.remove(name);
}
+
+ public int size() {return _table.size(); }
public String[] getNames()
{
@@ -70,8 +72,7 @@
if (! (arg instanceof Properties))
return false;
Properties other = (Properties)arg;
- String[] saOther = other.getNames();
- if (saOther.length != _table.size())
+ if (other.size() != _table.size())
return false;
for(Map.Entry<String,Serializable>oCurr : _table.entrySet())
{
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java 2006-09-22 15:19:03 UTC (rev 6369)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java 2006-09-22 15:20:07 UTC (rev 6370)
@@ -227,7 +227,44 @@
}
}
+ @Override
+ public boolean equals(Object arg)
+ {
+ if (! (arg instanceof Attachment))
+ return false;
+ Attachment other = (Attachment)arg;
+
+ if (other.getNamedCount() != _table.size())
+ return false;
+ for(Map.Entry<String,Serializable>oCurr : _table.entrySet())
+ {
+ Object val = other.get(oCurr.getKey());
+ if (null==oCurr.getValue())
+ if (null==val)
+ continue;
+ else
+ return false;
+ if (!oCurr.getValue().equals(val))
+ return false;
+ }
+
+ if (other.getUnnamedCount() != _list.size())
+ return false;
+ int index = 0;
+ for (Serializable oCurr : _list)
+ {
+ Object val = other.itemAt(index++);
+ if (null==oCurr)
+ if (null==val)
+ continue;
+ else
+ return false;
+ if (!oCurr.equals(val))
+ return false;
+ }
+ return true;
+ }
+
ArrayList<Serializable> _list = new ArrayList<Serializable>();
-
Hashtable<String, Serializable> _table = new Hashtable<String, Serializable>();
}
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java 2006-09-22 15:19:03 UTC (rev 6369)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/PropertiesImpl.java 2006-09-22 15:20:07 UTC (rev 6370)
@@ -56,6 +56,8 @@
return _table.remove(name);
}
+ public int size() {return _table.size(); }
+
public String[] getNames()
{
return _table.keySet().toArray(new String[_table.size()]);
@@ -138,8 +140,7 @@
if (! (arg instanceof Properties))
return false;
Properties other = (Properties)arg;
- String[] saOther = other.getNames();
- if (saOther.length != _table.size())
+ if (other.size() != _table.size())
return false;
for(Map.Entry<String,Serializable>oCurr : _table.entrySet())
{
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/Properties.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/Properties.java 2006-09-22 15:19:03 UTC (rev 6369)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/Properties.java 2006-09-22 15:20:07 UTC (rev 6370)
@@ -55,6 +55,11 @@
*/
public Object remove(String name);
/**
+ * size()
+ * @return int - Returns the number of properties in this object
+ */
+ public int size();
+ /**
* getNames()
* @return String[] - containing the names of all properties
*/
More information about the jboss-svn-commits
mailing list