From 1a4131ccaf157007600926770f8769823a5e7d6d Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Wed, 19 Feb 2014 19:56:49 +0100 Subject: [PATCH] Moved the criterias package to the sse bundle --- .../sap/sailing/datamining/test/TestFilterCriterias.java | 6 +++--- .../src/com/sap/sailing/datamining/test/TestFilters.java | 2 +- .../datamining/test/util/StringRegexFilterCriteria.java | 2 +- .../com/sap/sailing/datamining/factories/FilterFactory.java | 4 ++-- .../impl/criterias/AndCompoundFilterCriteria.java | 3 +-- .../impl/criterias/DimensionRegexFilterCriteria.java | 2 +- .../impl/criterias/DimensionValuesFilterCriteria.java | 2 +- .../impl/criterias/NullaryFunctionFilterCriteria.java | 2 +- .../sse}/datamining/impl/criterias/RangeFilterCriteria.java | 2 +- .../sse}/datamining/impl/criterias/RegexFilterCriteria.java | 2 +- .../impl/criterias/SimpleRangeFilterCriteria.java | 2 +- 11 files changed, 14 insertions(+), 15 deletions(-) rename java/{com.sap.sailing.datamining/src/com/sap/sailing => com.sap.sse.datamining/src/com/sap/sse}/datamining/impl/criterias/AndCompoundFilterCriteria.java (77%) rename java/{com.sap.sailing.datamining/src/com/sap/sailing => com.sap.sse.datamining/src/com/sap/sse}/datamining/impl/criterias/DimensionRegexFilterCriteria.java (90%) rename java/{com.sap.sailing.datamining/src/com/sap/sailing => com.sap.sse.datamining/src/com/sap/sse}/datamining/impl/criterias/DimensionValuesFilterCriteria.java (94%) rename java/{com.sap.sailing.datamining/src/com/sap/sailing => com.sap.sse.datamining/src/com/sap/sse}/datamining/impl/criterias/NullaryFunctionFilterCriteria.java (94%) rename java/{com.sap.sailing.datamining/src/com/sap/sailing => com.sap.sse.datamining/src/com/sap/sse}/datamining/impl/criterias/RangeFilterCriteria.java (92%) rename java/{com.sap.sailing.datamining/src/com/sap/sailing => com.sap.sse.datamining/src/com/sap/sse}/datamining/impl/criterias/RegexFilterCriteria.java (91%) rename java/{com.sap.sailing.datamining/src/com/sap/sailing => com.sap.sse.datamining/src/com/sap/sse}/datamining/impl/criterias/SimpleRangeFilterCriteria.java (88%) diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestFilterCriterias.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestFilterCriterias.java index b8634a5beb7..973c6ee26f3 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestFilterCriterias.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestFilterCriterias.java @@ -10,9 +10,6 @@ import java.util.Collection; import org.junit.Test; -import com.sap.sailing.datamining.impl.criterias.AndCompoundFilterCriteria; -import com.sap.sailing.datamining.impl.criterias.NullaryFunctionFilterCriteria; -import com.sap.sailing.datamining.impl.criterias.SimpleRangeFilterCriteria; import com.sap.sailing.datamining.test.function.test_classes.DataTypeWithContext; import com.sap.sailing.datamining.test.function.test_classes.DataTypeWithContextImpl; import com.sap.sailing.datamining.test.util.FunctionTestsUtil; @@ -21,8 +18,11 @@ import com.sap.sse.datamining.components.FilterCriteria; import com.sap.sse.datamining.data.ClusterOfComparable; import com.sap.sse.datamining.factories.FunctionFactory; import com.sap.sse.datamining.functions.Function; +import com.sap.sse.datamining.impl.criterias.AndCompoundFilterCriteria; import com.sap.sse.datamining.impl.criterias.CompoundFilterCriteria; +import com.sap.sse.datamining.impl.criterias.NullaryFunctionFilterCriteria; import com.sap.sse.datamining.impl.criterias.OrCompoundFilterCriteria; +import com.sap.sse.datamining.impl.criterias.SimpleRangeFilterCriteria; import com.sap.sse.datamining.impl.data.ClusterOfComparableImpl; public class TestFilterCriterias { diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestFilters.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestFilters.java index e14d97c1ae0..85d8265df79 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestFilters.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/TestFilters.java @@ -8,10 +8,10 @@ import java.util.List; import org.junit.Test; -import com.sap.sailing.datamining.impl.criterias.SimpleRangeFilterCriteria; import com.sap.sailing.datamining.test.util.OpenDataReceiver; import com.sap.sse.datamining.components.FilterCriteria; import com.sap.sse.datamining.data.ClusterOfComparable; +import com.sap.sse.datamining.impl.criterias.SimpleRangeFilterCriteria; import com.sap.sse.datamining.impl.data.ClusterOfComparableImpl; import com.sap.sse.datamining.impl.workers.CriteriaFiltrationWorker; import com.sap.sse.datamining.workers.FiltrationWorker; diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/StringRegexFilterCriteria.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/StringRegexFilterCriteria.java index f45f727cc1e..4a70f418b23 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/StringRegexFilterCriteria.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/StringRegexFilterCriteria.java @@ -1,6 +1,6 @@ package com.sap.sailing.datamining.test.util; -import com.sap.sailing.datamining.impl.criterias.RegexFilterCriteria; +import com.sap.sse.datamining.impl.criterias.RegexFilterCriteria; public class StringRegexFilterCriteria extends RegexFilterCriteria { diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/FilterFactory.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/FilterFactory.java index a6f55a075a4..7c3bc36845d 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/FilterFactory.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/FilterFactory.java @@ -8,15 +8,15 @@ import java.util.concurrent.ThreadPoolExecutor; import com.sap.sailing.datamining.dimensions.DimensionManager; import com.sap.sailing.datamining.dimensions.DimensionManagerProvider; import com.sap.sailing.datamining.impl.NonFilteringFilter; -import com.sap.sailing.datamining.impl.criterias.AndCompoundFilterCriteria; -import com.sap.sailing.datamining.impl.criterias.DimensionValuesFilterCriteria; import com.sap.sailing.datamining.shared.DataTypes; import com.sap.sailing.datamining.shared.DimensionIdentifier; import com.sap.sse.datamining.components.FilterCriteria; import com.sap.sse.datamining.components.ParallelFilter; import com.sap.sse.datamining.data.Dimension; import com.sap.sse.datamining.impl.components.PartitioningParallelFilter; +import com.sap.sse.datamining.impl.criterias.AndCompoundFilterCriteria; import com.sap.sse.datamining.impl.criterias.CompoundFilterCriteria; +import com.sap.sse.datamining.impl.criterias.DimensionValuesFilterCriteria; import com.sap.sse.datamining.impl.workers.builders.FilterByCriteriaBuilder; import com.sap.sse.datamining.workers.FiltrationWorker; import com.sap.sse.datamining.workers.WorkerBuilder; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/AndCompoundFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/AndCompoundFilterCriteria.java similarity index 77% rename from java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/AndCompoundFilterCriteria.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/AndCompoundFilterCriteria.java index 2a1788bb2f9..c86e335dcb9 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/AndCompoundFilterCriteria.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/AndCompoundFilterCriteria.java @@ -1,7 +1,6 @@ -package com.sap.sailing.datamining.impl.criterias; +package com.sap.sse.datamining.impl.criterias; import com.sap.sse.datamining.components.FilterCriteria; -import com.sap.sse.datamining.impl.criterias.CompoundFilterCriteria; public class AndCompoundFilterCriteria extends CompoundFilterCriteria { diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/DimensionRegexFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/DimensionRegexFilterCriteria.java similarity index 90% rename from java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/DimensionRegexFilterCriteria.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/DimensionRegexFilterCriteria.java index 5965ae37c21..dbfecbc041d 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/DimensionRegexFilterCriteria.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/DimensionRegexFilterCriteria.java @@ -1,4 +1,4 @@ -package com.sap.sailing.datamining.impl.criterias; +package com.sap.sse.datamining.impl.criterias; import com.sap.sse.datamining.data.Dimension; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/DimensionValuesFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/DimensionValuesFilterCriteria.java similarity index 94% rename from java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/DimensionValuesFilterCriteria.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/DimensionValuesFilterCriteria.java index fc26d3ff4c3..d424fa12d6b 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/DimensionValuesFilterCriteria.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/DimensionValuesFilterCriteria.java @@ -1,4 +1,4 @@ -package com.sap.sailing.datamining.impl.criterias; +package com.sap.sse.datamining.impl.criterias; import java.util.Collection; import java.util.HashSet; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/NullaryFunctionFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/NullaryFunctionFilterCriteria.java similarity index 94% rename from java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/NullaryFunctionFilterCriteria.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/NullaryFunctionFilterCriteria.java index 3c589689a61..c36343965d9 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/NullaryFunctionFilterCriteria.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/NullaryFunctionFilterCriteria.java @@ -1,4 +1,4 @@ -package com.sap.sailing.datamining.impl.criterias; +package com.sap.sse.datamining.impl.criterias; import java.util.Collection; import java.util.HashSet; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/RangeFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/RangeFilterCriteria.java similarity index 92% rename from java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/RangeFilterCriteria.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/RangeFilterCriteria.java index 17c15bb45f4..c1fcc3aa6c4 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/RangeFilterCriteria.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/RangeFilterCriteria.java @@ -1,4 +1,4 @@ -package com.sap.sailing.datamining.impl.criterias; +package com.sap.sse.datamining.impl.criterias; import com.sap.sse.datamining.components.FilterCriteria; import com.sap.sse.datamining.data.ClusterOfComparable; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/RegexFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/RegexFilterCriteria.java similarity index 91% rename from java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/RegexFilterCriteria.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/RegexFilterCriteria.java index ef1050b9f66..5b8d03ed58d 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/RegexFilterCriteria.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/RegexFilterCriteria.java @@ -1,4 +1,4 @@ -package com.sap.sailing.datamining.impl.criterias; +package com.sap.sse.datamining.impl.criterias; import com.sap.sse.datamining.components.FilterCriteria; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/SimpleRangeFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/SimpleRangeFilterCriteria.java similarity index 88% rename from java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/SimpleRangeFilterCriteria.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/SimpleRangeFilterCriteria.java index 5f436371c33..cc7a5af326e 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/criterias/SimpleRangeFilterCriteria.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/criterias/SimpleRangeFilterCriteria.java @@ -1,4 +1,4 @@ -package com.sap.sailing.datamining.impl.criterias; +package com.sap.sse.datamining.impl.criterias; import com.sap.sse.datamining.data.ClusterOfComparable;