From aebaaa8372de1632e4223f9d018982334aaa7dfe Mon Sep 17 00:00:00 2001 From: Vesa Martilla Date: Wed, 22 Sep 2010 12:10:54 +0000 Subject: [PATCH] ScalaMetaDataSerializer: Switched a for-loop to a foreach and java.util.HashSet to scala.collection.mutable.Set. --- .../query/scala/sql/ScalaMetaDataSerializer.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 bbbe1bf6c..161d61071 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 @@ -15,6 +15,7 @@ import java.io.IOException import scala.reflect.BeanProperty import scala.collection.JavaConversions._ +import scala.collection.mutable.Set class ScalaMetaDataSerializer(val namePrefix: String, val namingStrategy: NamingStrategy) extends Serializer { @@ -35,7 +36,7 @@ class ScalaMetaDataSerializer(val namePrefix: String, val namingStrategy: Naming // imports writer.importPackages("com.mysema.query.sql", "com.mysema.query.types.path"); - var importedClasses: Set[String] = getAnnotationTypes(model); + var importedClasses = getAnnotationTypes(model); importedClasses.add("java.util.Arrays"); if (model.hasLists()) { importedClasses.add(classOf[List[_]].getName); @@ -50,7 +51,7 @@ class ScalaMetaDataSerializer(val namePrefix: String, val namingStrategy: Naming writer.javadoc(simpleName + javadocSuffix); // header - for (annotation <- model.getAnnotations) { + model.getAnnotations foreach { annotation => writer.annotation(annotation); } @@ -168,9 +169,8 @@ class ScalaMetaDataSerializer(val namePrefix: String, val namingStrategy: Naming } def getAnnotationTypes(model: EntityType): Set[String] = { - val imports = new HashSet[String](); - imports.addAll(model.getAnnotations.map(_.annotationType.getName)) - imports; + val imports = Set(); + imports ++ (model.getAnnotations.map(_.annotationType.getName)) } } \ No newline at end of file