diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddFullyQualifiedNameController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/AddFullyQualifiedNameController.java similarity index 99% rename from kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddFullyQualifiedNameController.java rename to kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/AddFullyQualifiedNameController.java index 2f0e548e8..3de75440f 100644 --- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddFullyQualifiedNameController.java +++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/AddFullyQualifiedNameController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.ikm.komet.kview.mvvm.view.properties; +package dev.ikm.komet.kview.mvvm.view.concept; import dev.ikm.komet.kview.mvvm.view.AbstractBasicController; import dev.ikm.komet.kview.events.ClosePropertiesPanelEvent; diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddOtherNameController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/AddOtherNameController.java similarity index 99% rename from kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddOtherNameController.java rename to kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/AddOtherNameController.java index d80d2f7f6..4a0bf0213 100644 --- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddOtherNameController.java +++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/AddOtherNameController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.ikm.komet.kview.mvvm.view.properties; +package dev.ikm.komet.kview.mvvm.view.concept; import dev.ikm.komet.kview.mvvm.view.AbstractBasicController; import dev.ikm.komet.kview.events.ClosePropertiesPanelEvent; diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/ConceptController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/ConceptController.java index c4884daab..48127865b 100644 --- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/ConceptController.java +++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/ConceptController.java @@ -84,7 +84,6 @@ import dev.ikm.komet.kview.mvvm.model.DataModelHelper; import dev.ikm.komet.kview.mvvm.model.DescrName; import dev.ikm.komet.kview.mvvm.view.journal.VerticallyFilledPane; -import dev.ikm.komet.kview.mvvm.view.properties.PropertiesController; import dev.ikm.komet.kview.mvvm.view.stamp.StampEditController; import dev.ikm.komet.kview.mvvm.viewmodel.ConceptViewModel; import dev.ikm.komet.kview.mvvm.viewmodel.StampFormViewModelBase; diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/ConceptNode.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/ConceptNode.java index 01d8a59f9..8e5446343 100644 --- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/ConceptNode.java +++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/ConceptNode.java @@ -25,7 +25,6 @@ import dev.ikm.komet.framework.TopPanelFactory; import dev.ikm.komet.framework.controls.EntityLabelWithDragAndDrop; import dev.ikm.komet.framework.view.ViewProperties; -import dev.ikm.komet.kview.mvvm.view.properties.PropertiesController; import dev.ikm.komet.kview.mvvm.view.timeline.TimelineController; import dev.ikm.komet.preferences.KometPreferences; import dev.ikm.tinkar.common.flow.FlowSubscriber; diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditConceptController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditConceptController.java similarity index 98% rename from kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditConceptController.java rename to kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditConceptController.java index 36a6aadc0..a3501e431 100644 --- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditConceptController.java +++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditConceptController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.ikm.komet.kview.mvvm.view.properties; +package dev.ikm.komet.kview.mvvm.view.concept; import dev.ikm.komet.kview.mvvm.view.BasicController; import dev.ikm.komet.kview.events.OpenPropertiesPanelEvent; diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionFormController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditDescriptionFormController.java similarity index 99% rename from kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionFormController.java rename to kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditDescriptionFormController.java index 3f23286d0..1ba9049e1 100644 --- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionFormController.java +++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditDescriptionFormController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.ikm.komet.kview.mvvm.view.properties; +package dev.ikm.komet.kview.mvvm.view.concept; import static dev.ikm.komet.kview.mvvm.model.DataModelHelper.fetchDescendentsOfConcept; import static dev.ikm.komet.kview.mvvm.viewmodel.DescrNameViewModel.CASE_SIGNIFICANCE; @@ -31,7 +31,6 @@ import dev.ikm.komet.kview.events.ClosePropertiesPanelEvent; import dev.ikm.komet.kview.events.CreateConceptEvent; import dev.ikm.komet.kview.mvvm.model.DescrName; -import dev.ikm.komet.kview.mvvm.model.ViewCoordinateHelper; import dev.ikm.komet.kview.mvvm.view.BasicController; import dev.ikm.komet.kview.mvvm.viewmodel.DescrNameViewModel; import dev.ikm.tinkar.common.id.IntIdSet; diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionsController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditDescriptionsController.java similarity index 98% rename from kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionsController.java rename to kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditDescriptionsController.java index 33cffda4a..7a0b245c3 100644 --- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionsController.java +++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditDescriptionsController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.ikm.komet.kview.mvvm.view.properties; +package dev.ikm.komet.kview.mvvm.view.concept; import dev.ikm.komet.kview.mvvm.view.BasicController; import dev.ikm.komet.kview.events.AddOtherNameToConceptEvent; diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditFullyQualifiedNameController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditFullyQualifiedNameController.java similarity index 99% rename from kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditFullyQualifiedNameController.java rename to kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditFullyQualifiedNameController.java index 052bbf031..5fec42600 100644 --- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditFullyQualifiedNameController.java +++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/EditFullyQualifiedNameController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.ikm.komet.kview.mvvm.view.properties; +package dev.ikm.komet.kview.mvvm.view.concept; import dev.ikm.tinkar.events.EvtBus; import dev.ikm.tinkar.events.EvtBusFactory; diff --git a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/PropertiesController.java b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/PropertiesController.java similarity index 99% rename from kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/PropertiesController.java rename to kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/PropertiesController.java index 90f95edc7..59734125a 100644 --- a/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/PropertiesController.java +++ b/kview/src/main/java/dev/ikm/komet/kview/mvvm/view/concept/PropertiesController.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.ikm.komet.kview.mvvm.view.properties; +package dev.ikm.komet.kview.mvvm.view.concept; import dev.ikm.komet.framework.view.ViewProperties; import dev.ikm.komet.kview.events.*; import dev.ikm.komet.kview.mvvm.view.common.StampAddController; +import dev.ikm.komet.kview.mvvm.view.properties.*; import dev.ikm.komet.kview.mvvm.viewmodel.StampAddFormViewModel; import dev.ikm.komet.kview.mvvm.viewmodel.StampCreateFormViewModel; import dev.ikm.komet.kview.mvvm.viewmodel.StampFormViewModelBase; diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-fully-qualified-name.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/add-fully-qualified-name.fxml similarity index 100% rename from kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-fully-qualified-name.fxml rename to kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/add-fully-qualified-name.fxml diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-other-name.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/add-other-name.fxml similarity index 100% rename from kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-other-name.fxml rename to kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/add-other-name.fxml diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-descriptions.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/edit-descriptions.fxml similarity index 100% rename from kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-descriptions.fxml rename to kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/edit-descriptions.fxml diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-fully-qualified-name.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/edit-fully-qualified-name.fxml similarity index 100% rename from kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-fully-qualified-name.fxml rename to kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/edit-fully-qualified-name.fxml diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-other-name-form.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/edit-other-name-form.fxml similarity index 100% rename from kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-other-name-form.fxml rename to kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/edit-other-name-form.fxml diff --git a/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-view.fxml b/kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/edit-view.fxml similarity index 100% rename from kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/edit-view.fxml rename to kview/src/main/resources/dev/ikm/komet/kview/mvvm/view/concept/edit-view.fxml