[hibernate-commits] Hibernate SVN: r10966 - in branches/Branch_3_2/HibernateExt/tools/src: java/org/hibernate/tool/hbm2x/pojo templates/pojo test/org/hibernate/tool/hbm2x

[hibernate-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2006-12-09 07:10:27 -0500 (Sat, 09 Dec 2006)
New Revision: 10966

Modified:
   branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/AnnotationBuilder.java
   branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/EntityPOJOClass.java
   branches/Branch_3_2/HibernateExt/tools/src/templates/pojo/Ejb3TypeDeclaration.ftl
   branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test.java
Log:
don't generate redundant {}'s for single element attributes.

Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/AnnotationBuilder.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/AnnotationBuilder.java	2006-12-09 12:00:48 UTC (rev 10965)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/AnnotationBuilder.java	2006-12-09 12:10:27 UTC (rev 10966)
@@ -67,13 +67,7 @@
 					}
 					String key = (String) element.getKey();
 					b.append(key).append("=");
-					if(s.length>1) {
-						b.append( "{" );
-					}
 					attributeToString( b, s );
-					if(s.length>1) {
-						b.append( "}" );
-					}
 					
 					addedBefore=true;
 				}
@@ -83,13 +77,22 @@
 		return b.toString();
 	}
 
-	private void attributeToString(StringBuffer buffer, String[] values) {				
+	private void attributeToString(StringBuffer buffer, String[] values) {
+		if(values.length>1) {
+			buffer.append( "{" );
+		}
+		
 		for (int i = 0; i < values.length; i++) {
 			buffer.append(values[i]);
 			if(i<values.length-1) {
 				buffer.append(", ");
 			}
 		}		
+		
+		if(values.length>1) {
+			buffer.append( "}" );
+		}
+		
 	}
 
 	public void addQuotedAttributes(String name, Iterator iterator) {

Modified: branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/EntityPOJOClass.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/EntityPOJOClass.java	2006-12-09 12:00:48 UTC (rev 10965)
+++ branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/EntityPOJOClass.java	2006-12-09 12:10:27 UTC (rev 10966)
@@ -521,7 +521,7 @@
 					}
 					String uniqueConstraint = generateAnnTableUniqueConstraint(table);
 					if ( uniqueConstraint.length() > 0 ) {
-						annotation.append(", uniqueConstraints={").append(uniqueConstraint).append("} ");
+						annotation.append(", uniqueConstraints=").append(uniqueConstraint);
 					}
 					annotation.append( ", joinColumns = { ");
 					buildArrayOfJoinColumnAnnotation(

Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/pojo/Ejb3TypeDeclaration.ftl
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/templates/pojo/Ejb3TypeDeclaration.ftl	2006-12-09 12:00:48 UTC (rev 10965)
+++ branches/Branch_3_2/HibernateExt/tools/src/templates/pojo/Ejb3TypeDeclaration.ftl	2006-12-09 12:10:27 UTC (rev 10966)
@@ -11,7 +11,7 @@
 </#if>
 <#assign uniqueConstraint=pojo.generateAnnTableUniqueConstraint()>
 <#if uniqueConstraint?has_content>
-    , uniqueConstraints = { ${uniqueConstraint} }
+    , uniqueConstraints = ${uniqueConstraint} 
 </#if>)
 </#if>
 </#if>
\ No newline at end of file

Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test.java
===================================================================
--- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test.java	2006-12-09 12:00:48 UTC (rev 10965)
+++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test.java	2006-12-09 12:10:27 UTC (rev 10966)
@@ -214,7 +214,7 @@
 		constraint.addAttribute( "single", "value" );
 		
 		String attribute = constraint.getAttributeAsString("columnNames");
-		assertEquals("\"first\", \"second\"", attribute);
+		assertEquals("{\"first\", \"second\"}", attribute);
 		
 		assertEquals("value", constraint.getAttributeAsString( "single" ));