From f612932ee1c175ee7f4abda1f2b7f92eabdd2a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 22 Sep 2010 18:08:34 +0000
Subject: [PATCH]

---
 .../com/mysema/query/scala/sql/ScalaBeanSerializer.scala    | 6 ++++--
 .../mysema/query/scala/sql/ScalaMetaDataSerializer.scala    | 6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/ScalaBeanSerializer.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/ScalaBeanSerializer.scala
index 11eea87c8..e1e81bf06 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/ScalaBeanSerializer.scala
+++ b/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/ScalaBeanSerializer.scala
@@ -25,13 +25,15 @@ class ScalaBeanSerializer extends Serializer {
     val simpleName = model.getSimpleName;
 
     // package
-    if (!model.getPackageName.isEmpty()) {
+    if (!model.getPackageName.isEmpty) {
       writer.packageDecl(model.getPackageName);
     }
 
     // imports
     val importedClasses = getAnnotationTypes(model);
-    importedClasses.add("scala.reflect.BeanProperty");
+    if (javaBeanSupport) {
+      importedClasses.add("scala.reflect.BeanProperty");    
+    }    
     if (model.hasLists()) {
       importedClasses.add(classOf[List[_]].getName);
     }
diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/ScalaMetaDataSerializer.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/ScalaMetaDataSerializer.scala
index 161d61071..828fa74db 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/ScalaMetaDataSerializer.scala
+++ b/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/ScalaMetaDataSerializer.scala
@@ -45,15 +45,13 @@ class ScalaMetaDataSerializer(val namePrefix: String, val namingStrategy: Naming
       importedClasses.add(classOf[Map[_, _]].getName);
     }
 
-    importedClasses.foreach({ writer.importClasses(_) })
+    writer.importClasses(importedClasses.toArray: _*);
 
     // javadoc        
     writer.javadoc(simpleName + javadocSuffix);
 
     // header
-    model.getAnnotations foreach { annotation =>
-      writer.annotation(annotation);
-    }
+    model.getAnnotations.foreach(writer.annotation(_));
 
     val queryType = typeMappings.getPathType(model, model, true);
     var modelName = writer.getRawName(model);