From c77809a8fd331c0b0f9f713e107cba057c942a9e Mon Sep 17 00:00:00 2001
From: Gunnar Morling <gunnar.morling@googlemail.com>
Date: Sun, 26 Jan 2014 12:21:47 +0100
Subject: [PATCH] #109 Removing package cycle around
 AnnotationProcessingException

---
 processor/src/main/java/org/mapstruct/ap/MappingProcessor.java | 1 +
 .../src/main/java/org/mapstruct/ap/model/TypeFactory.java      | 2 +-
 .../src/main/java/org/mapstruct/ap/model/source/Mapping.java   | 3 ++-
 .../org/mapstruct/ap/processor/MethodRetrievalProcessor.java   | 2 +-
 .../mapstruct/ap/{ => util}/AnnotationProcessingException.java | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename processor/src/main/java/org/mapstruct/ap/{ => util}/AnnotationProcessingException.java (98%)

diff --git a/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java b/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java
index d01bf3aa6..776d71b1d 100644
--- a/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java
@@ -53,6 +53,7 @@ import org.mapstruct.ap.option.ReportingPolicy;
 import org.mapstruct.ap.processor.DefaultModelElementProcessorContext;
 import org.mapstruct.ap.processor.ModelElementProcessor;
 import org.mapstruct.ap.processor.ModelElementProcessor.ProcessorContext;
+import org.mapstruct.ap.util.AnnotationProcessingException;
 
 /**
  * A JSR 269 annotation {@link Processor} which generates the implementations for mapper interfaces (interfaces
diff --git a/processor/src/main/java/org/mapstruct/ap/model/TypeFactory.java b/processor/src/main/java/org/mapstruct/ap/model/TypeFactory.java
index cfe9b745f..b76d4ec32 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/TypeFactory.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/TypeFactory.java
@@ -45,8 +45,8 @@ import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 
-import org.mapstruct.ap.AnnotationProcessingException;
 import org.mapstruct.ap.MappingTargetPrism;
+import org.mapstruct.ap.util.AnnotationProcessingException;
 
 /**
  * Factory creating {@link Type} instances.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java b/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java
index 78562366b..6369ec553 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java
@@ -22,13 +22,14 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 
-import org.mapstruct.ap.AnnotationProcessingException;
 import org.mapstruct.ap.MappingPrism;
 import org.mapstruct.ap.MappingsPrism;
+import org.mapstruct.ap.util.AnnotationProcessingException;
 
 /**
  * Represents a property mapping as configured via {@code @Mapping}.
diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java b/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java
index 1c5a4b59d..9aeda8d03 100644
--- a/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java
@@ -34,7 +34,6 @@ import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.tools.Diagnostic.Kind;
 
-import org.mapstruct.ap.AnnotationProcessingException;
 import org.mapstruct.ap.IterableMappingPrism;
 import org.mapstruct.ap.MapMappingPrism;
 import org.mapstruct.ap.MapperPrism;
@@ -47,6 +46,7 @@ import org.mapstruct.ap.model.source.IterableMapping;
 import org.mapstruct.ap.model.source.MapMapping;
 import org.mapstruct.ap.model.source.Mapping;
 import org.mapstruct.ap.model.source.Method;
+import org.mapstruct.ap.util.AnnotationProcessingException;
 
 /**
  * A {@link ModelElementProcessor} which retrieves a list of {@link Method}s
diff --git a/processor/src/main/java/org/mapstruct/ap/AnnotationProcessingException.java b/processor/src/main/java/org/mapstruct/ap/util/AnnotationProcessingException.java
similarity index 98%
rename from processor/src/main/java/org/mapstruct/ap/AnnotationProcessingException.java
rename to processor/src/main/java/org/mapstruct/ap/util/AnnotationProcessingException.java
index 771ed4cac..f9ad43151 100644
--- a/processor/src/main/java/org/mapstruct/ap/AnnotationProcessingException.java
+++ b/processor/src/main/java/org/mapstruct/ap/util/AnnotationProcessingException.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap;
+package org.mapstruct.ap.util;
 
 import javax.annotation.processing.Messager;
 import javax.lang.model.element.AnnotationMirror;