You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/12/25 03:32:54 UTC
[commons-vfs] 04/20: moved PackageFilter to config package,
moved AccessModifier to model package
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to annotated tag japicmp-base-0.1.0
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
commit 414ccbb864c2ad3911ee924ef80c2254d1a0e424
Author: siom79 <ma...@googlemail.com>
AuthorDate: Sat Nov 16 17:40:19 2013 +0100
moved PackageFilter to config package, moved AccessModifier to model package
---
.../japicmp-test/src/test/java/japicmp/test/ModifierTest.java | 2 +-
.../japicmp-test/src/test/java/japicmp/test/PackageFilterTest.java | 2 +-
japicmp/src/main/java/japicmp/cli/CliParser.java | 4 ++--
japicmp/src/main/java/japicmp/cmp/ClassComparator.java | 5 +----
japicmp/src/main/java/japicmp/cmp/ClassesComparator.java | 1 +
japicmp/src/main/java/japicmp/cmp/JarArchiveComparator.java | 1 +
japicmp/src/main/java/japicmp/cmp/JarArchiveComparatorOptions.java | 3 +++
japicmp/src/main/java/japicmp/config/Options.java | 3 +--
japicmp/src/main/java/japicmp/{cmp => config}/PackageFilter.java | 2 +-
japicmp/src/main/java/japicmp/{cmp => model}/AccessModifier.java | 2 +-
japicmp/src/main/java/japicmp/model/JApiClass.java | 1 -
japicmp/src/main/java/japicmp/model/JApiMethod.java | 1 -
japicmp/src/main/java/japicmp/util/ModifierHelper.java | 2 +-
japicmp/src/test/java/japicmp/cmp/PackageFilterTest.java | 1 +
japicmp/src/test/java/japicmp/util/ModifierHelperTest.java | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/ModifierTest.java b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/ModifierTest.java
index f939228..2cd6a5e 100644
--- a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/ModifierTest.java
+++ b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/ModifierTest.java
@@ -1,6 +1,6 @@
package japicmp.test;
-import japicmp.cmp.AccessModifier;
+import japicmp.model.AccessModifier;
import japicmp.cmp.JarArchiveComparator;
import japicmp.cmp.JarArchiveComparatorOptions;
import japicmp.model.JApiChangeStatus;
diff --git a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/PackageFilterTest.java b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/PackageFilterTest.java
index 7ee3c80..f86f856 100644
--- a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/PackageFilterTest.java
+++ b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/PackageFilterTest.java
@@ -2,7 +2,7 @@ package japicmp.test;
import japicmp.cmp.JarArchiveComparator;
import japicmp.cmp.JarArchiveComparatorOptions;
-import japicmp.cmp.PackageFilter;
+import japicmp.config.PackageFilter;
import japicmp.model.JApiClass;
import japicmp.test.packageOne.PackageOne;
import japicmp.test.packageTwo.PackageTwo;
diff --git a/japicmp/src/main/java/japicmp/cli/CliParser.java b/japicmp/src/main/java/japicmp/cli/CliParser.java
index 83ae01e..17c9889 100644
--- a/japicmp/src/main/java/japicmp/cli/CliParser.java
+++ b/japicmp/src/main/java/japicmp/cli/CliParser.java
@@ -1,8 +1,8 @@
package japicmp.cli;
import com.google.common.base.Optional;
-import japicmp.cmp.AccessModifier;
-import japicmp.cmp.PackageFilter;
+import japicmp.model.AccessModifier;
+import japicmp.config.PackageFilter;
import japicmp.config.Options;
import japicmp.exception.JApiCmpException;
import japicmp.util.StringArrayEnumeration;
diff --git a/japicmp/src/main/java/japicmp/cmp/ClassComparator.java b/japicmp/src/main/java/japicmp/cmp/ClassComparator.java
index 0bcb783..b600b13 100644
--- a/japicmp/src/main/java/japicmp/cmp/ClassComparator.java
+++ b/japicmp/src/main/java/japicmp/cmp/ClassComparator.java
@@ -1,10 +1,7 @@
package japicmp.cmp;
import com.google.common.base.Optional;
-import japicmp.model.JApiChangeStatus;
-import japicmp.model.JApiClass;
-import japicmp.model.JApiMethod;
-import japicmp.model.JApiParameter;
+import japicmp.model.*;
import japicmp.util.ModifierHelper;
import japicmp.util.SignatureParser;
import javassist.CtClass;
diff --git a/japicmp/src/main/java/japicmp/cmp/ClassesComparator.java b/japicmp/src/main/java/japicmp/cmp/ClassesComparator.java
index b8e2b48..bae4f86 100644
--- a/japicmp/src/main/java/japicmp/cmp/ClassesComparator.java
+++ b/japicmp/src/main/java/japicmp/cmp/ClassesComparator.java
@@ -1,6 +1,7 @@
package japicmp.cmp;
import com.google.common.base.Optional;
+import japicmp.model.AccessModifier;
import japicmp.model.JApiChangeStatus;
import japicmp.model.JApiClass;
import japicmp.util.ModifierHelper;
diff --git a/japicmp/src/main/java/japicmp/cmp/JarArchiveComparator.java b/japicmp/src/main/java/japicmp/cmp/JarArchiveComparator.java
index af1a0e0..1ac2478 100644
--- a/japicmp/src/main/java/japicmp/cmp/JarArchiveComparator.java
+++ b/japicmp/src/main/java/japicmp/cmp/JarArchiveComparator.java
@@ -1,5 +1,6 @@
package japicmp.cmp;
+import japicmp.config.PackageFilter;
import japicmp.model.JApiClass;
import japicmp.util.ModifierHelper;
import javassist.ClassPool;
diff --git a/japicmp/src/main/java/japicmp/cmp/JarArchiveComparatorOptions.java b/japicmp/src/main/java/japicmp/cmp/JarArchiveComparatorOptions.java
index d30d03e..ff69634 100644
--- a/japicmp/src/main/java/japicmp/cmp/JarArchiveComparatorOptions.java
+++ b/japicmp/src/main/java/japicmp/cmp/JarArchiveComparatorOptions.java
@@ -1,5 +1,8 @@
package japicmp.cmp;
+import japicmp.config.PackageFilter;
+import japicmp.model.AccessModifier;
+
import java.util.LinkedList;
import java.util.List;
diff --git a/japicmp/src/main/java/japicmp/config/Options.java b/japicmp/src/main/java/japicmp/config/Options.java
index b4e46b8..09414e6 100644
--- a/japicmp/src/main/java/japicmp/config/Options.java
+++ b/japicmp/src/main/java/japicmp/config/Options.java
@@ -1,8 +1,7 @@
package japicmp.config;
import com.google.common.base.Optional;
-import japicmp.cmp.AccessModifier;
-import japicmp.cmp.PackageFilter;
+import japicmp.model.AccessModifier;
import java.util.LinkedList;
import java.util.List;
diff --git a/japicmp/src/main/java/japicmp/cmp/PackageFilter.java b/japicmp/src/main/java/japicmp/config/PackageFilter.java
similarity index 94%
rename from japicmp/src/main/java/japicmp/cmp/PackageFilter.java
rename to japicmp/src/main/java/japicmp/config/PackageFilter.java
index 0045c22..add49b2 100644
--- a/japicmp/src/main/java/japicmp/cmp/PackageFilter.java
+++ b/japicmp/src/main/java/japicmp/config/PackageFilter.java
@@ -1,4 +1,4 @@
-package japicmp.cmp;
+package japicmp.config;
import java.util.regex.Pattern;
diff --git a/japicmp/src/main/java/japicmp/cmp/AccessModifier.java b/japicmp/src/main/java/japicmp/model/AccessModifier.java
similarity index 91%
rename from japicmp/src/main/java/japicmp/cmp/AccessModifier.java
rename to japicmp/src/main/java/japicmp/model/AccessModifier.java
index 8f9ffec..0e7fc64 100644
--- a/japicmp/src/main/java/japicmp/cmp/AccessModifier.java
+++ b/japicmp/src/main/java/japicmp/model/AccessModifier.java
@@ -1,4 +1,4 @@
-package japicmp.cmp;
+package japicmp.model;
public enum AccessModifier {
PUBLIC(3), PACKAGE(2), PROTECTED(1), PRIVATE(0);
diff --git a/japicmp/src/main/java/japicmp/model/JApiClass.java b/japicmp/src/main/java/japicmp/model/JApiClass.java
index 242b6c3..46c2eaf 100644
--- a/japicmp/src/main/java/japicmp/model/JApiClass.java
+++ b/japicmp/src/main/java/japicmp/model/JApiClass.java
@@ -1,7 +1,6 @@
package japicmp.model;
import com.google.common.base.Optional;
-import japicmp.cmp.AccessModifier;
import javassist.CtClass;
import javax.xml.bind.annotation.XmlAttribute;
diff --git a/japicmp/src/main/java/japicmp/model/JApiMethod.java b/japicmp/src/main/java/japicmp/model/JApiMethod.java
index b23c44a..eff5662 100644
--- a/japicmp/src/main/java/japicmp/model/JApiMethod.java
+++ b/japicmp/src/main/java/japicmp/model/JApiMethod.java
@@ -1,7 +1,6 @@
package japicmp.model;
import com.google.common.base.Optional;
-import japicmp.cmp.AccessModifier;
import javassist.CtMethod;
import javax.xml.bind.annotation.XmlAttribute;
diff --git a/japicmp/src/main/java/japicmp/util/ModifierHelper.java b/japicmp/src/main/java/japicmp/util/ModifierHelper.java
index 416888e..d3f8e66 100644
--- a/japicmp/src/main/java/japicmp/util/ModifierHelper.java
+++ b/japicmp/src/main/java/japicmp/util/ModifierHelper.java
@@ -1,6 +1,6 @@
package japicmp.util;
-import japicmp.cmp.AccessModifier;
+import japicmp.model.AccessModifier;
import java.lang.reflect.Modifier;
diff --git a/japicmp/src/test/java/japicmp/cmp/PackageFilterTest.java b/japicmp/src/test/java/japicmp/cmp/PackageFilterTest.java
index 8bffab9..916bcb2 100644
--- a/japicmp/src/test/java/japicmp/cmp/PackageFilterTest.java
+++ b/japicmp/src/test/java/japicmp/cmp/PackageFilterTest.java
@@ -1,5 +1,6 @@
package japicmp.cmp;
+import japicmp.config.PackageFilter;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/japicmp/src/test/java/japicmp/util/ModifierHelperTest.java b/japicmp/src/test/java/japicmp/util/ModifierHelperTest.java
index 4f0b95f..6f666a2 100644
--- a/japicmp/src/test/java/japicmp/util/ModifierHelperTest.java
+++ b/japicmp/src/test/java/japicmp/util/ModifierHelperTest.java
@@ -1,6 +1,6 @@
package japicmp.util;
-import japicmp.cmp.AccessModifier;
+import japicmp.model.AccessModifier;
import javassist.Modifier;
import org.junit.Test;