Author: nbubna
Date: Mon Aug 6 13:54:38 2007
New Revision: 563274
URL: http://svn.apache.org/viewvc?view=rev&rev=563274
Log:
treat the key for any Data as the identity of it, to allow them to be
accumulated in Sets
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Data.java
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Data.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Data.java?view=diff&rev=563274&r1=563273&r2=563274
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Data.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Data.java
Mon Aug 6 13:54:38 2007
@@ -250,6 +250,27 @@
return dc;
}
+ @Override
+ public int hashCode()
+ {
+ if (getKey() == null)
+ {
+ return super.hashCode();
+ }
+ return getKey().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (getKey() == null || !(obj instanceof Data))
+ {
+ return super.equals(obj);
+ }
+ return getKey().equals(((Data)obj).getKey());
+ }
+
+ @Override
public String toString()
{
StringBuilder out = new StringBuilder();
