From c550af2529f8bcb6a62087878c51744913eb90f2 Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Tue, 24 Jun 2014 22:15:47 +0200 Subject: [PATCH] #227 Formatting; Getting rid of some warnings --- .../assignment/GetterCollectionOrMapWrapper.java | 2 +- .../model/assignment/NewCollectionOrMapWrapper.java | 5 +++-- .../assignment/SetterCollectionOrMapWrapper.java | 9 +++++---- .../org/mapstruct/ap/test/collection/TestList.java | 8 ++++---- .../org/mapstruct/ap/test/collection/TestMap.java | 12 +++++------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/GetterCollectionOrMapWrapper.java b/processor/src/main/java/org/mapstruct/ap/model/assignment/GetterCollectionOrMapWrapper.java index f54170388..2bcf383d2 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/GetterCollectionOrMapWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/model/assignment/GetterCollectionOrMapWrapper.java @@ -36,7 +36,7 @@ import org.mapstruct.ap.model.Assignment; public class GetterCollectionOrMapWrapper extends AssignmentWrapper { - public GetterCollectionOrMapWrapper( Assignment decoratedAssignment ) { + public GetterCollectionOrMapWrapper(Assignment decoratedAssignment) { super( decoratedAssignment ); } diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/NewCollectionOrMapWrapper.java b/processor/src/main/java/org/mapstruct/ap/model/assignment/NewCollectionOrMapWrapper.java index 6aa149473..935e8fb5b 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/NewCollectionOrMapWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/model/assignment/NewCollectionOrMapWrapper.java @@ -20,6 +20,7 @@ package org.mapstruct.ap.model.assignment; import java.util.HashSet; import java.util.Set; + import org.mapstruct.ap.model.Assignment; import org.mapstruct.ap.model.common.Type; @@ -32,12 +33,12 @@ public class NewCollectionOrMapWrapper extends AssignmentWrapper { private final Set implementationTypes; - public NewCollectionOrMapWrapper( Assignment decoratedAssignment, Set implementationTypes ) { + public NewCollectionOrMapWrapper(Assignment decoratedAssignment, Set implementationTypes) { super( decoratedAssignment ); this.implementationTypes = implementationTypes; } - @Override + @Override public Set getImportTypes() { Set imported = new HashSet(); imported.addAll( getAssignment().getImportTypes() ); diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/SetterCollectionOrMapWrapper.java b/processor/src/main/java/org/mapstruct/ap/model/assignment/SetterCollectionOrMapWrapper.java index f3f23d571..a62313abd 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/SetterCollectionOrMapWrapper.java +++ b/processor/src/main/java/org/mapstruct/ap/model/assignment/SetterCollectionOrMapWrapper.java @@ -20,6 +20,7 @@ package org.mapstruct.ap.model.assignment; import java.util.HashSet; import java.util.Set; + import org.mapstruct.ap.model.Assignment; import org.mapstruct.ap.model.common.Type; @@ -40,11 +41,11 @@ public class SetterCollectionOrMapWrapper extends AssignmentWrapper { private final String targetGetterName; private final Assignment newCollectionOrMapAssignment; - public SetterCollectionOrMapWrapper( Assignment decoratedAssignment, - String targetSetterName, - Assignment newCollectionOrMapAssignment ) { + public SetterCollectionOrMapWrapper(Assignment decoratedAssignment, + String targetSetterName, + Assignment newCollectionOrMapAssignment) { super( decoratedAssignment ); - this.targetGetterName = "get" + targetSetterName.substring( 3 ); + this.targetGetterName = "get" + targetSetterName.substring( 3 ); this.newCollectionOrMapAssignment = newCollectionOrMapAssignment; } diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/TestList.java b/processor/src/test/java/org/mapstruct/ap/test/collection/TestList.java index d75e59164..0e891ba7d 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/TestList.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/TestList.java @@ -22,25 +22,25 @@ import java.util.ArrayList; import java.util.Collection; /** - * * @author Sjaak Derksen */ public class TestList extends ArrayList { + private static final long serialVersionUID = 1L; + private static boolean addAllCalled = false; public static boolean isAddAllCalled() { return addAllCalled; } - public static void setAddAllCalled( boolean addAllCalled ) { + public static void setAddAllCalled(boolean addAllCalled) { TestList.addAllCalled = addAllCalled; } @Override - public boolean addAll( Collection c ) { + public boolean addAll(Collection c) { addAllCalled = true; return super.addAll( c ); } - } diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/TestMap.java b/processor/src/test/java/org/mapstruct/ap/test/collection/TestMap.java index 91ddd69c8..323c1f2a8 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/TestMap.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/TestMap.java @@ -22,27 +22,25 @@ import java.util.HashMap; import java.util.Map; /** - * * @author Sjaak Derksen */ public class TestMap extends HashMap { + private static final long serialVersionUID = 1L; + private static boolean puttAllCalled = false; public static boolean isPuttAllCalled() { return puttAllCalled; } - public static void setPuttAllCalled( boolean puttAllCalled ) { + public static void setPuttAllCalled(boolean puttAllCalled) { TestMap.puttAllCalled = puttAllCalled; } @Override - public void putAll( Map m ) { + public void putAll(Map m) { puttAllCalled = true; - super.putAll( m ); //To change body of generated methods, choose Tools | Templates. + super.putAll( m ); } - - - }