Flatten the pattern package

The class EditPattern is renamed to EditClass and is moved to the
preliminary package because there is no use outside of it. Unfortunately
it cannot be removed easily because the preliminary would need many
changes.

Author: ibbem

src/main/java/org/variantsync/diffdetective/analysis/AnalysisResult.java

@@ -5,7 +5,7 @@
 import org.variantsync.diffdetective.metadata.ElementaryPatternCount;
 import org.variantsync.diffdetective.metadata.ExplainedFilterSummary;
 import org.variantsync.diffdetective.metadata.Metadata;
-import org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns;
+import org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns;
 import org.variantsync.functjonal.Functjonal;
 import org.variantsync.functjonal.category.InplaceMonoid;
 import org.variantsync.functjonal.category.InplaceSemigroup;

src/main/java/org/variantsync/diffdetective/analysis/ElementaryPatternCount.java

@@ -1,7 +1,7 @@
 package org.variantsync.diffdetective.analysis;
 
-import org.variantsync.diffdetective.pattern.elementary.ElementaryPattern;
-import org.variantsync.diffdetective.pattern.elementary.ElementaryPatternCatalogue;
+import org.variantsync.diffdetective.pattern.ElementaryPattern;
+import org.variantsync.diffdetective.pattern.ElementaryPatternCatalogue;
 import org.variantsync.diffdetective.util.CSV;
 
 import java.util.HashMap;

src/main/java/org/variantsync/diffdetective/analysis/PatchStatistics.java

@@ -1,7 +1,7 @@
 package org.variantsync.diffdetective.analysis;
 
 import org.variantsync.diffdetective.diff.PatchDiff;
-import org.variantsync.diffdetective.pattern.elementary.ElementaryPatternCatalogue;
+import org.variantsync.diffdetective.pattern.ElementaryPatternCatalogue;
 import org.variantsync.diffdetective.util.CSV;
 
 /**

src/main/java/org/variantsync/diffdetective/diff/difftree/filter/DiffTreeFilter.java

@@ -3,7 +3,7 @@
 import org.variantsync.diffdetective.diff.difftree.DiffNode;
 import org.variantsync.diffdetective.diff.difftree.DiffTree;
 
-import static org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns.*;
+import static org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns.*;
 
 /**
  * A filter on DiffTrees that is equipped with some metadata T (e.g., for debugging or logging).
@@ -66,9 +66,9 @@ public static TaggedPredicate<String, DiffTree> consistent() {
      * Returns a tagged predicate that returns true iff
      * the DiffTree has at least one artifact node ({@link DiffNode#isArtifact()})
      * that does not match any pattern of
-     * {@link org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns#AddToPC},
-     * {@link org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns#RemFromPC},
-     * {@link org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns#Untouched}.
+     * {@link org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns#AddToPC},
+     * {@link org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns#RemFromPC},
+     * {@link org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns#Untouched}.
      * The predicate is tagged with a String description of the predicate.
      */
     public static TaggedPredicate<String, DiffTree> hasAtLeastOneEditToVariability() {

src/main/java/org/variantsync/diffdetective/diff/difftree/transform/CollapseElementaryPatterns.java

@@ -2,7 +2,7 @@
 
 import org.variantsync.diffdetective.diff.difftree.DiffNode;
 import org.variantsync.diffdetective.diff.difftree.DiffTree;
-import org.variantsync.diffdetective.pattern.elementary.ElementaryPatternCatalogue;
+import org.variantsync.diffdetective.pattern.ElementaryPatternCatalogue;
 
 import java.util.List;
 

src/main/java/org/variantsync/diffdetective/metadata/ElementaryPatternCount.java

@@ -1,9 +1,9 @@
 package org.variantsync.diffdetective.metadata;
 
 import org.variantsync.diffdetective.diff.CommitDiff;
-import org.variantsync.diffdetective.pattern.elementary.ElementaryPattern;
-import org.variantsync.diffdetective.pattern.elementary.ElementaryPatternCatalogue;
-import org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns;
+import org.variantsync.diffdetective.pattern.ElementaryPattern;
+import org.variantsync.diffdetective.pattern.ElementaryPatternCatalogue;
+import org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns;
 import org.variantsync.diffdetective.util.Assert;
 import org.variantsync.functjonal.Functjonal;
 import org.variantsync.functjonal.category.InplaceSemigroup;

src/main/java/org/variantsync/diffdetective/mining/MiningTask.java

@@ -11,8 +11,8 @@
 import org.variantsync.diffdetective.diff.difftree.transform.DiffTreeTransformer;
 import org.variantsync.diffdetective.diff.result.CommitDiffResult;
 import org.variantsync.diffdetective.metadata.ExplainedFilterSummary;
-import org.variantsync.diffdetective.pattern.elementary.ElementaryPattern;
-import org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns;
+import org.variantsync.diffdetective.pattern.ElementaryPattern;
+import org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns;
 import org.variantsync.diffdetective.util.Clock;
 import org.variantsync.diffdetective.util.FileUtils;
 

src/main/java/org/variantsync/diffdetective/mining/RWCompositePatternNodeFormat.java

@@ -2,7 +2,7 @@
 
 import org.variantsync.diffdetective.diff.difftree.DiffNode;
 import org.variantsync.diffdetective.mining.formats.DebugMiningDiffNodeFormat;
-import org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns;
+import org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns;
 
 public class RWCompositePatternNodeFormat extends DebugMiningDiffNodeFormat {
     @Override

src/main/java/org/variantsync/diffdetective/mining/formats/DebugMiningDiffNodeFormat.java

@@ -3,8 +3,8 @@
 import org.variantsync.diffdetective.diff.difftree.NodeType;
 import org.variantsync.diffdetective.diff.difftree.DiffNode;
 import org.variantsync.diffdetective.diff.difftree.DiffType;
-import org.variantsync.diffdetective.pattern.elementary.ElementaryPattern;
-import org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns;
+import org.variantsync.diffdetective.pattern.ElementaryPattern;
+import org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns;
 import org.variantsync.functjonal.Pair;
 
 import java.util.Arrays;

src/main/java/org/variantsync/diffdetective/mining/formats/ReleaseMiningDiffNodeFormat.java

@@ -3,8 +3,8 @@
 import org.variantsync.diffdetective.diff.difftree.NodeType;
 import org.variantsync.diffdetective.diff.difftree.DiffNode;
 import org.variantsync.diffdetective.diff.difftree.DiffType;
-import org.variantsync.diffdetective.pattern.elementary.ElementaryPattern;
-import org.variantsync.diffdetective.pattern.elementary.proposed.ProposedElementaryPatterns;
+import org.variantsync.diffdetective.pattern.ElementaryPattern;
+import org.variantsync.diffdetective.pattern.proposed.ProposedElementaryPatterns;
 import org.variantsync.diffdetective.util.Assert;
 import org.variantsync.functjonal.Pair;