From 0bdc5ec2560537d8e41b9db1e6531a1e00bae79c Mon Sep 17 00:00:00 2001 From: Andi Huber Date: Thu, 7 Mar 2024 11:30:13 +0100 Subject: [PATCH] (#21): just moving classes --- .../manager/DitaModuleGdManager.java | 24 +++++++++---------- .../{ => food}/FoodParamsForClone.java | 2 +- ...AtGroupLevelForFacetDescriptorPathway.java | 2 +- ...cetSelectionForFacetDescriptorPathway.java | 2 +- .../{ => food}/Food_addStandardUnit.java | 3 ++- .../{ => food}/Food_cascadingDelete.java | 2 +- .../editing/{ => food}/Food_clone.java | 2 +- .../Food_effectiveFoodDescriptors.java | 2 +- ...GroupingUsedForFacetDescriptorPathway.java | 2 +- ...orPathwayForFoodGroupManager_addEntry.java | 2 +- ...ayForFoodGroupManager_fixDisplayOrder.java | 2 +- ...odGroupManager_shiftFacetDisplayOrder.java | 2 +- .../FoodBrandManager_addBrand.java | 2 +- .../FoodDescriptorManager_addDescriptor.java | 2 +- .../FoodSubgroupManager_addSubgroup.java | 2 +- ...Recipe_addQuantificationMethodPathway.java | 2 +- .../{ => recipe}/Recipe_addStandardUnit.java | 3 ++- 17 files changed, 30 insertions(+), 28 deletions(-) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => food}/FoodParamsForClone.java (99%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => food}/Food_addDescriptorsAtGroupLevelForFacetDescriptorPathway.java (99%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => food}/Food_addFoodFacetSelectionForFacetDescriptorPathway.java (98%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => food}/Food_addStandardUnit.java (96%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => food}/Food_cascadingDelete.java (99%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => food}/Food_clone.java (99%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => food}/Food_effectiveFoodDescriptors.java (98%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => food}/Food_effectiveGroupingUsedForFacetDescriptorPathway.java (97%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => other}/FacetDescriptorPathwayForFoodGroupManager_addEntry.java (99%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => other}/FacetDescriptorPathwayForFoodGroupManager_fixDisplayOrder.java (98%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => other}/FacetDescriptorPathwayForFoodGroupManager_shiftFacetDisplayOrder.java (98%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => other}/FoodBrandManager_addBrand.java (98%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => other}/FoodDescriptorManager_addDescriptor.java (98%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => other}/FoodSubgroupManager_addSubgroup.java (98%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => recipe}/Recipe_addQuantificationMethodPathway.java (98%) rename globodiet/manager/src/main/java/dita/globodiet/manager/editing/{ => recipe}/Recipe_addStandardUnit.java (96%) diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/DitaModuleGdManager.java b/globodiet/manager/src/main/java/dita/globodiet/manager/DitaModuleGdManager.java index 8a32994c..02a377e7 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/DitaModuleGdManager.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/DitaModuleGdManager.java @@ -50,18 +50,18 @@ import dita.commons.types.TabularData; import dita.globodiet.dom.params.DitaModuleGdParams; import dita.globodiet.manager.dashboard.Dashboard; -import dita.globodiet.manager.editing.FacetDescriptorPathwayForFoodGroupManager_addEntry; -import dita.globodiet.manager.editing.FacetDescriptorPathwayForFoodGroupManager_fixDisplayOrder; -import dita.globodiet.manager.editing.FacetDescriptorPathwayForFoodGroupManager_shiftFacetDisplayOrder; -import dita.globodiet.manager.editing.FoodBrandManager_addBrand; -import dita.globodiet.manager.editing.FoodDescriptorManager_addDescriptor; -import dita.globodiet.manager.editing.Food_addDescriptorsAtGroupLevelForFacetDescriptorPathway; -import dita.globodiet.manager.editing.Food_addFoodFacetSelectionForFacetDescriptorPathway; -import dita.globodiet.manager.editing.Food_addStandardUnit; -import dita.globodiet.manager.editing.Food_clone; -import dita.globodiet.manager.editing.Food_effectiveFoodDescriptors; -import dita.globodiet.manager.editing.Food_effectiveGroupingUsedForFacetDescriptorPathway; -import dita.globodiet.manager.editing.Recipe_addStandardUnit; +import dita.globodiet.manager.editing.food.Food_addDescriptorsAtGroupLevelForFacetDescriptorPathway; +import dita.globodiet.manager.editing.food.Food_addFoodFacetSelectionForFacetDescriptorPathway; +import dita.globodiet.manager.editing.food.Food_addStandardUnit; +import dita.globodiet.manager.editing.food.Food_clone; +import dita.globodiet.manager.editing.food.Food_effectiveFoodDescriptors; +import dita.globodiet.manager.editing.food.Food_effectiveGroupingUsedForFacetDescriptorPathway; +import dita.globodiet.manager.editing.other.FacetDescriptorPathwayForFoodGroupManager_addEntry; +import dita.globodiet.manager.editing.other.FacetDescriptorPathwayForFoodGroupManager_fixDisplayOrder; +import dita.globodiet.manager.editing.other.FacetDescriptorPathwayForFoodGroupManager_shiftFacetDisplayOrder; +import dita.globodiet.manager.editing.other.FoodBrandManager_addBrand; +import dita.globodiet.manager.editing.other.FoodDescriptorManager_addDescriptor; +import dita.globodiet.manager.editing.recipe.Recipe_addStandardUnit; import dita.globodiet.manager.editing.wip.FoodManager_addFood; import dita.globodiet.manager.help.DitaEntityDiagramPage; import dita.globodiet.manager.help.DitaEntityDiagramPage2; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodParamsForClone.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/FoodParamsForClone.java similarity index 99% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodParamsForClone.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/FoodParamsForClone.java index c24c9f5d..2d3de023 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodParamsForClone.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/FoodParamsForClone.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.food; import org.apache.causeway.applib.annotation.DependentDefaultsPolicy; import org.apache.causeway.applib.annotation.Optionality; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_addDescriptorsAtGroupLevelForFacetDescriptorPathway.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_addDescriptorsAtGroupLevelForFacetDescriptorPathway.java similarity index 99% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_addDescriptorsAtGroupLevelForFacetDescriptorPathway.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_addDescriptorsAtGroupLevelForFacetDescriptorPathway.java index 4ab2203d..5dc71779 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_addDescriptorsAtGroupLevelForFacetDescriptorPathway.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_addDescriptorsAtGroupLevelForFacetDescriptorPathway.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.food; import java.util.List; import java.util.Set; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_addFoodFacetSelectionForFacetDescriptorPathway.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_addFoodFacetSelectionForFacetDescriptorPathway.java similarity index 98% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_addFoodFacetSelectionForFacetDescriptorPathway.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_addFoodFacetSelectionForFacetDescriptorPathway.java index ab7657ab..3316568a 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_addFoodFacetSelectionForFacetDescriptorPathway.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_addFoodFacetSelectionForFacetDescriptorPathway.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.food; import java.util.List; import java.util.Set; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_addStandardUnit.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_addStandardUnit.java similarity index 96% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_addStandardUnit.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_addStandardUnit.java index f2709508..c8a7cc93 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_addStandardUnit.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_addStandardUnit.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.food; import java.util.List; import java.util.stream.IntStream; @@ -37,6 +37,7 @@ import dita.commons.services.lookup.ForeignKeyLookupService; import dita.globodiet.dom.params.food_list.Food; import dita.globodiet.dom.params.quantif.StandardUnitForFoodOrRecipe; +import dita.globodiet.manager.editing.recipe.Recipe_addStandardUnit; /** * @see Recipe_addStandardUnit diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_cascadingDelete.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_cascadingDelete.java similarity index 99% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_cascadingDelete.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_cascadingDelete.java index 0867f63a..699c88ef 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_cascadingDelete.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_cascadingDelete.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.food; import jakarta.inject.Inject; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_clone.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_clone.java similarity index 99% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_clone.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_clone.java index 74f907b7..562e0285 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_clone.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_clone.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.food; import java.util.List; import java.util.Objects; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_effectiveFoodDescriptors.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_effectiveFoodDescriptors.java similarity index 98% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_effectiveFoodDescriptors.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_effectiveFoodDescriptors.java index 17327c1d..e12ed05b 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_effectiveFoodDescriptors.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_effectiveFoodDescriptors.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.food; import java.util.List; import java.util.Set; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_effectiveGroupingUsedForFacetDescriptorPathway.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_effectiveGroupingUsedForFacetDescriptorPathway.java similarity index 97% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_effectiveGroupingUsedForFacetDescriptorPathway.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_effectiveGroupingUsedForFacetDescriptorPathway.java index 9680027a..2bee5207 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Food_effectiveGroupingUsedForFacetDescriptorPathway.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/food/Food_effectiveGroupingUsedForFacetDescriptorPathway.java @@ -17,7 +17,7 @@ * under the License. */ // Auto-generated by DitA-Tooling -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.food; import jakarta.inject.Inject; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FacetDescriptorPathwayForFoodGroupManager_addEntry.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_addEntry.java similarity index 99% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/FacetDescriptorPathwayForFoodGroupManager_addEntry.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_addEntry.java index 864adc97..ab41e1a4 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FacetDescriptorPathwayForFoodGroupManager_addEntry.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_addEntry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.other; import java.util.Collections; import java.util.List; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FacetDescriptorPathwayForFoodGroupManager_fixDisplayOrder.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_fixDisplayOrder.java similarity index 98% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/FacetDescriptorPathwayForFoodGroupManager_fixDisplayOrder.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_fixDisplayOrder.java index cd80f7a8..2fb4ada9 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FacetDescriptorPathwayForFoodGroupManager_fixDisplayOrder.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_fixDisplayOrder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.other; import java.util.List; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FacetDescriptorPathwayForFoodGroupManager_shiftFacetDisplayOrder.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_shiftFacetDisplayOrder.java similarity index 98% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/FacetDescriptorPathwayForFoodGroupManager_shiftFacetDisplayOrder.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_shiftFacetDisplayOrder.java index 1fc688d6..401091cf 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FacetDescriptorPathwayForFoodGroupManager_shiftFacetDisplayOrder.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_shiftFacetDisplayOrder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.other; import java.util.List; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodBrandManager_addBrand.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FoodBrandManager_addBrand.java similarity index 98% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodBrandManager_addBrand.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FoodBrandManager_addBrand.java index 4baaf56f..62c0a731 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodBrandManager_addBrand.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FoodBrandManager_addBrand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.other; import java.util.List; import java.util.Objects; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodDescriptorManager_addDescriptor.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FoodDescriptorManager_addDescriptor.java similarity index 98% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodDescriptorManager_addDescriptor.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FoodDescriptorManager_addDescriptor.java index 4525b80a..7e05d63d 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodDescriptorManager_addDescriptor.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FoodDescriptorManager_addDescriptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.other; import java.util.List; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodSubgroupManager_addSubgroup.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FoodSubgroupManager_addSubgroup.java similarity index 98% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodSubgroupManager_addSubgroup.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FoodSubgroupManager_addSubgroup.java index abe60cb6..35d0f7a2 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/FoodSubgroupManager_addSubgroup.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/other/FoodSubgroupManager_addSubgroup.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.other; import java.util.List; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Recipe_addQuantificationMethodPathway.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/recipe/Recipe_addQuantificationMethodPathway.java similarity index 98% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/Recipe_addQuantificationMethodPathway.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/recipe/Recipe_addQuantificationMethodPathway.java index 9f2f5fba..28552ccf 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Recipe_addQuantificationMethodPathway.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/recipe/Recipe_addQuantificationMethodPathway.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.recipe; import java.util.List; diff --git a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Recipe_addStandardUnit.java b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/recipe/Recipe_addStandardUnit.java similarity index 96% rename from globodiet/manager/src/main/java/dita/globodiet/manager/editing/Recipe_addStandardUnit.java rename to globodiet/manager/src/main/java/dita/globodiet/manager/editing/recipe/Recipe_addStandardUnit.java index 1983ae08..bd017a2b 100644 --- a/globodiet/manager/src/main/java/dita/globodiet/manager/editing/Recipe_addStandardUnit.java +++ b/globodiet/manager/src/main/java/dita/globodiet/manager/editing/recipe/Recipe_addStandardUnit.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package dita.globodiet.manager.editing; +package dita.globodiet.manager.editing.recipe; import java.util.List; import java.util.stream.IntStream; @@ -37,6 +37,7 @@ import dita.commons.services.lookup.ForeignKeyLookupService; import dita.globodiet.dom.params.quantif.StandardUnitForFoodOrRecipe; import dita.globodiet.dom.params.recipe_list.Recipe; +import dita.globodiet.manager.editing.food.Food_addStandardUnit; /** * @see Food_addStandardUnit