From 0481a76d8a39417ec2c67bfa1490777dcc36c615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Thu, 28 May 2009 14:14:44 +0000
Subject: [PATCH]

---
 .../src/main/java/com/mysema/query/apt/APTUtils.java        | 3 +--
 .../com/mysema/query/apt/general/DefaultDTOVisitor.java     | 6 +++---
 .../main/java/com/mysema/query/apt/jpa/JPAProcessor.java    | 6 ++----
 .../com/mysema/query/apt/general/GeneralProcessorTest.java  | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/APTUtils.java b/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/APTUtils.java
index befed8fc0..27f131499 100644
--- a/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/APTUtils.java
+++ b/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/APTUtils.java
@@ -15,8 +15,7 @@ import java.util.Map;
  */
 public class APTUtils {
 
-    public static String getString(Map<String, String> options, String key,
-            String defaultValue) {
+    public static String getString(Map<String, String> options, String key, String defaultValue) {
         String prefix = "-A" + key + "=";
         for (Map.Entry<String, String> entry : options.entrySet()) {
             if (entry.getKey().startsWith(prefix)) {
diff --git a/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/general/DefaultDTOVisitor.java b/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/general/DefaultDTOVisitor.java
index 40f4d0c6f..ff271d4c6 100644
--- a/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/general/DefaultDTOVisitor.java
+++ b/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/general/DefaultDTOVisitor.java
@@ -11,7 +11,7 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import com.mysema.query.codegen.ConstructorModel;
-import com.mysema.query.codegen.Parameter;
+import com.mysema.query.codegen.ParameterModel;
 import com.mysema.query.codegen.ClassModel;
 import com.sun.mirror.declaration.ClassDeclaration;
 import com.sun.mirror.declaration.ConstructorDeclaration;
@@ -42,12 +42,12 @@ public class DefaultDTOVisitor extends SimpleDeclarationVisitor {
 
     @Override
     public void visitConstructorDeclaration(ConstructorDeclaration d) {
-        List<Parameter> parameters = new ArrayList<Parameter>(d.getParameters()
+        List<ParameterModel> parameters = new ArrayList<ParameterModel>(d.getParameters()
                 .size());
         for (ParameterDeclaration pa : d.getParameters()) {
             String name = pa.getSimpleName();
             String typeName = new TypeHelper(pa.getType()).getFullName();
-            parameters.add(new Parameter(name, typeName));
+            parameters.add(new ParameterModel(name, typeName));
         }
         last.addConstructor(new ConstructorModel(parameters));
     }
diff --git a/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/jpa/JPAProcessor.java b/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/jpa/JPAProcessor.java
index a94564ac6..2e96339e5 100644
--- a/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/jpa/JPAProcessor.java
+++ b/querydsl-apt-jdk5/src/main/java/com/mysema/query/apt/jpa/JPAProcessor.java
@@ -37,16 +37,14 @@ public class JPAProcessor extends GeneralProcessor {
 
     private void createEmbeddableClasses() {
         DefaultEntityVisitor entityVisitor = new DefaultEntityVisitor();
-        AnnotationTypeDeclaration a = (AnnotationTypeDeclaration) env
-                .getTypeDeclaration(JPA_EMBEDDABLE);
+        AnnotationTypeDeclaration a = (AnnotationTypeDeclaration) env.getTypeDeclaration(JPA_EMBEDDABLE);
         for (Declaration typeDecl : env.getDeclarationsAnnotatedWith(a)) {
             typeDecl.accept(getDeclarationScanner(entityVisitor, NO_OP));
         }
 
         Map<String, ClassModel> entityTypes = entityVisitor.types;
         if (entityTypes.isEmpty()) {
-            env.getMessager().printNotice(
-                    "No class generation for embeddable types");
+            env.getMessager().printNotice("No class generation for embeddable types");
         } else {
             serializeAsOuterClasses(entityTypes.values(), Serializers.EMBEDDABLE);
         }
diff --git a/querydsl-apt-jdk5/src/test/java/com/mysema/query/apt/general/GeneralProcessorTest.java b/querydsl-apt-jdk5/src/test/java/com/mysema/query/apt/general/GeneralProcessorTest.java
index 30d8288a9..015bcadfd 100644
--- a/querydsl-apt-jdk5/src/test/java/com/mysema/query/apt/general/GeneralProcessorTest.java
+++ b/querydsl-apt-jdk5/src/test/java/com/mysema/query/apt/general/GeneralProcessorTest.java
@@ -16,7 +16,7 @@ import org.junit.Test;
 import com.mysema.query.codegen.ConstructorModel;
 import com.mysema.query.codegen.FieldModel;
 import com.mysema.query.codegen.FieldType;
-import com.mysema.query.codegen.Parameter;
+import com.mysema.query.codegen.ParameterModel;
 import com.mysema.query.codegen.Serializers;
 import com.mysema.query.codegen.ClassModel;
 
@@ -42,7 +42,7 @@ public class GeneralProcessorTest {
         FieldModel field = new FieldModel("field", null, "java.lang",
                 "java.lang.String", "String", FieldType.STRING);
         type.addField(field);
-        Parameter param = new Parameter("name", "java.lang.String");
+        ParameterModel param = new ParameterModel("name", "java.lang.String");
         type.addConstructor(new ConstructorModel(Collections.singleton(param)));
     }