From d3e97d3c078c2c7cb2a5f43f60d8f9f9944c73fb Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Tue, 30 Sep 2014 20:05:26 +0200
Subject: [PATCH] Move ImportWrapper in a general package as it's just a
 utility class

---
 .../pmd/lang/java/rule/imports/DuplicateImportsRule.java        | 2 +-
 .../pmd/lang/java/rule/imports/UnusedImportsRule.java           | 2 +-
 .../lang/java/typeresolution/rules/imports/UnusedImports.java   | 2 +-
 .../pmd/lang/jsp/rule/basic/DuplicateJspImportsRule.java        | 2 +-
 .../net/sourceforge/pmd/lang/{java => }/rule/ImportWrapper.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename pmd/src/main/java/net/sourceforge/pmd/lang/{java => }/rule/ImportWrapper.java (96%)

diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DuplicateImportsRule.java b/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DuplicateImportsRule.java
index d8d1e7010d..a0f6d18a0c 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DuplicateImportsRule.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DuplicateImportsRule.java
@@ -9,7 +9,7 @@ import java.util.Set;
 import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
 import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
-import net.sourceforge.pmd.lang.java.rule.ImportWrapper;
+import net.sourceforge.pmd.lang.rule.ImportWrapper;
 
 public class DuplicateImportsRule extends AbstractJavaRule {
 
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnusedImportsRule.java b/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnusedImportsRule.java
index 8343b184a4..a3119ee6b8 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnusedImportsRule.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnusedImportsRule.java
@@ -18,7 +18,7 @@ import net.sourceforge.pmd.lang.java.ast.Comment;
 import net.sourceforge.pmd.lang.java.ast.DummyJavaNode;
 import net.sourceforge.pmd.lang.java.ast.FormalComment;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
-import net.sourceforge.pmd.lang.java.rule.ImportWrapper;
+import net.sourceforge.pmd.lang.rule.ImportWrapper;
 
 public class UnusedImportsRule extends AbstractJavaRule {
 
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/imports/UnusedImports.java b/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/imports/UnusedImports.java
index 7346364882..c89ad5dc2d 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/imports/UnusedImports.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/imports/UnusedImports.java
@@ -8,8 +8,8 @@ import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTName;
 import net.sourceforge.pmd.lang.java.ast.DummyJavaNode;
 import net.sourceforge.pmd.lang.java.ast.TypeNode;
-import net.sourceforge.pmd.lang.java.rule.ImportWrapper;
 import net.sourceforge.pmd.lang.java.rule.imports.UnusedImportsRule;
+import net.sourceforge.pmd.lang.rule.ImportWrapper;
 
 public class UnusedImports extends UnusedImportsRule {
 
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/DuplicateJspImportsRule.java b/pmd/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/DuplicateJspImportsRule.java
index 5e49c5fe50..7799ea7ed0 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/DuplicateJspImportsRule.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/DuplicateJspImportsRule.java
@@ -10,9 +10,9 @@ import java.util.StringTokenizer;
 
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.java.rule.ImportWrapper;
 import net.sourceforge.pmd.lang.jsp.ast.ASTJspDirectiveAttribute;
 import net.sourceforge.pmd.lang.jsp.rule.AbstractJspRule;
+import net.sourceforge.pmd.lang.rule.ImportWrapper;
 
 public class DuplicateJspImportsRule extends AbstractJspRule {
 
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/ImportWrapper.java b/pmd/src/main/java/net/sourceforge/pmd/lang/rule/ImportWrapper.java
similarity index 96%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/ImportWrapper.java
rename to pmd/src/main/java/net/sourceforge/pmd/lang/rule/ImportWrapper.java
index d23b00f271..b5b953a691 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/ImportWrapper.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/lang/rule/ImportWrapper.java
@@ -1,7 +1,7 @@
 /**
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
-package net.sourceforge.pmd.lang.java.rule;
+package net.sourceforge.pmd.lang.rule;
 
 import net.sourceforge.pmd.lang.ast.Node;