diff --git a/pom.xml b/pom.xml index 74a0a8fc..236259eb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - it.unibz.inf.ontouml + org.ontouml ontouml-vp-plugin 0.5.3 @@ -38,9 +38,11 @@ UTF-8 + /Applications/Visual Paradigm.app/Contents/Resources/app - - + + /Users/matheuslenke/Library/Application Support/VisualParadigm/plugins + diff --git a/src/main/java/it/unibz/inf/ontouml/vp/OntoUMLPlugin.java b/src/main/java/org/ontouml/vp/OntoUMLPlugin.java similarity index 96% rename from src/main/java/it/unibz/inf/ontouml/vp/OntoUMLPlugin.java rename to src/main/java/org/ontouml/vp/OntoUMLPlugin.java index b2c6e9c2..4e5d2baa 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/OntoUMLPlugin.java +++ b/src/main/java/org/ontouml/vp/OntoUMLPlugin.java @@ -1,11 +1,12 @@ -package it.unibz.inf.ontouml.vp; +package org.ontouml.vp; + +import org.ontouml.vp.services.project.ProjectListener; import com.vp.plugin.ApplicationManager; import com.vp.plugin.ProjectManager; import com.vp.plugin.VPPlugin; import com.vp.plugin.VPPluginInfo; import com.vp.plugin.model.IProject; -import it.unibz.inf.ontouml.vp.listeners.ProjectListener; /** * Implementation of VPPlugin responsible for configuring OntoUML Plugin's behaviour when loading diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAssociationStereotypeId.java b/src/main/java/org/ontouml/vp/controllers/ApplyAssociationStereotypeId.java similarity index 96% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAssociationStereotypeId.java rename to src/main/java/org/ontouml/vp/controllers/ApplyAssociationStereotypeId.java index ea513190..4be1e474 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAssociationStereotypeId.java +++ b/src/main/java/org/ontouml/vp/controllers/ApplyAssociationStereotypeId.java @@ -1,6 +1,6 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; -import it.unibz.inf.ontouml.vp.utils.Stereotype; +import org.ontouml.vp.utils.Stereotype; import java.util.Arrays; import java.util.HashMap; @@ -126,7 +126,7 @@ public enum ApplyAssociationStereotypeId { private static HashMap actionIdMap; - private ApplyAssociationStereotypeId(String actionId, String stereotype, String defaultLabel) { + ApplyAssociationStereotypeId(String actionId, String stereotype, String defaultLabel) { this.actionId = actionId; this.stereotype = stereotype; this.defaultLabel = defaultLabel; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAssociationStereotypeMenuManager.java b/src/main/java/org/ontouml/vp/controllers/ApplyAssociationStereotypeMenuManager.java similarity index 93% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAssociationStereotypeMenuManager.java rename to src/main/java/org/ontouml/vp/controllers/ApplyAssociationStereotypeMenuManager.java index ebd35337..7f9cd94f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAssociationStereotypeMenuManager.java +++ b/src/main/java/org/ontouml/vp/controllers/ApplyAssociationStereotypeMenuManager.java @@ -1,14 +1,14 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPContext; import com.vp.plugin.model.IAssociation; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.uml.Association; -import it.unibz.inf.ontouml.vp.utils.OntoUMLConstraintsManager; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; -import it.unibz.inf.ontouml.vp.utils.VPContextUtils; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.model.uml.Association; +import org.ontouml.vp.utils.OntoUMLConstraintsManager; +import org.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.utils.VPContextUtils; +import org.ontouml.vp.utils.ViewManagerUtils; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAttributeStereotypeId.java b/src/main/java/org/ontouml/vp/controllers/ApplyAttributeStereotypeId.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAttributeStereotypeId.java rename to src/main/java/org/ontouml/vp/controllers/ApplyAttributeStereotypeId.java index d6e8c23b..7dbac677 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAttributeStereotypeId.java +++ b/src/main/java/org/ontouml/vp/controllers/ApplyAttributeStereotypeId.java @@ -1,6 +1,6 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; -import it.unibz.inf.ontouml.vp.utils.Stereotype; +import org.ontouml.vp.utils.Stereotype; import java.util.Arrays; import java.util.HashMap; @@ -17,7 +17,7 @@ public enum ApplyAttributeStereotypeId { private static HashMap actionIdMap; - private ApplyAttributeStereotypeId(String actionId, String stereotype, String defaultLabel) { + ApplyAttributeStereotypeId(String actionId, String stereotype, String defaultLabel) { this.actionId = actionId; this.stereotype = stereotype; this.defaultLabel = defaultLabel; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAttributeStereotypeMenuManager.java b/src/main/java/org/ontouml/vp/controllers/ApplyAttributeStereotypeMenuManager.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAttributeStereotypeMenuManager.java rename to src/main/java/org/ontouml/vp/controllers/ApplyAttributeStereotypeMenuManager.java index 0cf4d0b4..42c698a5 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAttributeStereotypeMenuManager.java +++ b/src/main/java/org/ontouml/vp/controllers/ApplyAttributeStereotypeMenuManager.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPContext; import com.vp.plugin.model.IAttribute; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.utils.StereotypesManager; public class ApplyAttributeStereotypeMenuManager extends ApplyStereotypeMenuManager { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyClassStereotypeId.java b/src/main/java/org/ontouml/vp/controllers/ApplyClassStereotypeId.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyClassStereotypeId.java rename to src/main/java/org/ontouml/vp/controllers/ApplyClassStereotypeId.java index 07343f66..ee693dc3 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyClassStereotypeId.java +++ b/src/main/java/org/ontouml/vp/controllers/ApplyClassStereotypeId.java @@ -1,6 +1,6 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; -import it.unibz.inf.ontouml.vp.utils.Stereotype; +import org.ontouml.vp.utils.Stereotype; import java.util.Arrays; import java.util.HashMap; import java.util.Set; @@ -91,7 +91,7 @@ public enum ApplyClassStereotypeId { private static HashMap actionIdMap; - private ApplyClassStereotypeId(String actionId, String stereotype, String defaultLabel) { + ApplyClassStereotypeId(String actionId, String stereotype, String defaultLabel) { this.actionId = actionId; this.stereotype = stereotype; this.defaultLabel = defaultLabel; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyClassStereotypeMenuManager.java b/src/main/java/org/ontouml/vp/controllers/ApplyClassStereotypeMenuManager.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyClassStereotypeMenuManager.java rename to src/main/java/org/ontouml/vp/controllers/ApplyClassStereotypeMenuManager.java index e15b1071..43eb6d50 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyClassStereotypeMenuManager.java +++ b/src/main/java/org/ontouml/vp/controllers/ApplyClassStereotypeMenuManager.java @@ -1,12 +1,12 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPContext; import com.vp.plugin.model.IClass; -import it.unibz.inf.ontouml.vp.model.uml.Class; -import it.unibz.inf.ontouml.vp.utils.OntoUMLConstraintsManager; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; -import it.unibz.inf.ontouml.vp.utils.VPContextUtils; +import org.ontouml.vp.model.uml.Class; +import org.ontouml.vp.utils.OntoUMLConstraintsManager; +import org.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.utils.VPContextUtils; public class ApplyClassStereotypeMenuManager extends ApplyStereotypeMenuManager { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyPropertiesController.java b/src/main/java/org/ontouml/vp/controllers/ApplyPropertiesController.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyPropertiesController.java rename to src/main/java/org/ontouml/vp/controllers/ApplyPropertiesController.java index 75e8445d..a7e754e0 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyPropertiesController.java +++ b/src/main/java/org/ontouml/vp/controllers/ApplyPropertiesController.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.ApplicationManager; import com.vp.plugin.action.VPAction; @@ -6,15 +6,15 @@ import com.vp.plugin.action.VPContextActionController; import com.vp.plugin.model.*; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.uml.Association; -import it.unibz.inf.ontouml.vp.model.uml.Class; -import it.unibz.inf.ontouml.vp.model.uml.ModelElement; -import it.unibz.inf.ontouml.vp.utils.ActionIdManager; -import it.unibz.inf.ontouml.vp.utils.RestrictedTo; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; -import it.unibz.inf.ontouml.vp.views.SelectRestrictionsView; -import it.unibz.inf.ontouml.vp.views.SetOrderView; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.uml.Association; +import org.ontouml.vp.model.uml.Class; +import org.ontouml.vp.model.uml.ModelElement; +import org.ontouml.vp.utils.ActionIdManager; +import org.ontouml.vp.utils.RestrictedTo; +import org.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.views.SelectRestrictionsView; +import org.ontouml.vp.views.SetOrderView; import java.awt.event.ActionEvent; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyStereotypeController.java b/src/main/java/org/ontouml/vp/controllers/ApplyStereotypeController.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyStereotypeController.java rename to src/main/java/org/ontouml/vp/controllers/ApplyStereotypeController.java index 1fa97b69..031f6169 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyStereotypeController.java +++ b/src/main/java/org/ontouml/vp/controllers/ApplyStereotypeController.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPContext; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyStereotypeMenuManager.java b/src/main/java/org/ontouml/vp/controllers/ApplyStereotypeMenuManager.java similarity index 91% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyStereotypeMenuManager.java rename to src/main/java/org/ontouml/vp/controllers/ApplyStereotypeMenuManager.java index d6855a4f..73d9e240 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyStereotypeMenuManager.java +++ b/src/main/java/org/ontouml/vp/controllers/ApplyStereotypeMenuManager.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPContext; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.utils.VPContextUtils; +import org.ontouml.vp.utils.VPContextUtils; public abstract class ApplyStereotypeMenuManager { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ModelActionController.java b/src/main/java/org/ontouml/vp/controllers/ModelActionController.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ModelActionController.java rename to src/main/java/org/ontouml/vp/controllers/ModelActionController.java index e64755ed..b004ef9a 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ModelActionController.java +++ b/src/main/java/org/ontouml/vp/controllers/ModelActionController.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPContext; @@ -6,10 +6,10 @@ import com.vp.plugin.model.IAssociation; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.uml.Association; -import it.unibz.inf.ontouml.vp.model.uml.ModelElement; -import it.unibz.inf.ontouml.vp.utils.ActionIdManager; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.model.uml.Association; +import org.ontouml.vp.model.uml.ModelElement; +import org.ontouml.vp.utils.ActionIdManager; +import org.ontouml.vp.utils.ViewManagerUtils; import java.awt.event.ActionEvent; public class ModelActionController implements VPContextActionController { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ModularizationController.java b/src/main/java/org/ontouml/vp/controllers/ModularizationController.java similarity index 82% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ModularizationController.java rename to src/main/java/org/ontouml/vp/controllers/ModularizationController.java index 3dc2b882..3fd02abb 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ModularizationController.java +++ b/src/main/java/org/ontouml/vp/controllers/ModularizationController.java @@ -1,13 +1,13 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPActionController; -import it.unibz.inf.ontouml.vp.model.ModularizationServiceResult; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; -import it.unibz.inf.ontouml.vp.model.ontouml2vp.IProjectLoader; -import it.unibz.inf.ontouml.vp.model.vp2ontouml.Uml2OntoumlTransformer; -import it.unibz.inf.ontouml.vp.utils.SimpleServiceWorker; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.model.ModularizationServiceResult; +import org.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml2vp.IProjectLoader; +import org.ontouml.vp.model.vp2ontouml.Uml2OntoumlTransformer; +import org.ontouml.vp.utils.SimpleServiceWorker; +import org.ontouml.vp.utils.ViewManagerUtils; import java.io.IOException; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/OntoUMLServerAccessController.java b/src/main/java/org/ontouml/vp/controllers/OntoUMLServerAccessController.java similarity index 94% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/OntoUMLServerAccessController.java rename to src/main/java/org/ontouml/vp/controllers/OntoUMLServerAccessController.java index 6de3ca12..753c6659 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/OntoUMLServerAccessController.java +++ b/src/main/java/org/ontouml/vp/controllers/OntoUMLServerAccessController.java @@ -1,12 +1,12 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.GufoTransformationServiceResult; -import it.unibz.inf.ontouml.vp.model.ModularizationServiceResult; -import it.unibz.inf.ontouml.vp.model.ProjectConfigurations; -import it.unibz.inf.ontouml.vp.model.ServiceResult; -import it.unibz.inf.ontouml.vp.model.VerificationServiceResult; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.GufoTransformationServiceResult; +import org.ontouml.vp.model.ModularizationServiceResult; +import org.ontouml.vp.model.ProjectConfigurations; +import org.ontouml.vp.model.ServiceResult; +import org.ontouml.vp.model.VerificationServiceResult; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ReportErrorController.java b/src/main/java/org/ontouml/vp/controllers/ReportErrorController.java similarity index 90% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ReportErrorController.java rename to src/main/java/org/ontouml/vp/controllers/ReportErrorController.java index 951b589d..11686f9b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ReportErrorController.java +++ b/src/main/java/org/ontouml/vp/controllers/ReportErrorController.java @@ -1,8 +1,8 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPActionController; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.utils.ViewManagerUtils; import java.awt.*; import java.net.URI; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/SettingsMenuController.java b/src/main/java/org/ontouml/vp/controllers/SettingsMenuController.java similarity index 91% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/SettingsMenuController.java rename to src/main/java/org/ontouml/vp/controllers/SettingsMenuController.java index 921dc2fc..d37137b6 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/SettingsMenuController.java +++ b/src/main/java/org/ontouml/vp/controllers/SettingsMenuController.java @@ -1,13 +1,13 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.ApplicationManager; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPActionController; import com.vp.plugin.view.IDialog; import com.vp.plugin.view.IDialogHandler; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.views.ConfigurationsView; +import org.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.views.ConfigurationsView; import java.awt.*; /** @@ -30,7 +30,7 @@ public class SettingsMenuController implements VPActionController { */ @Override public void performAction(VPAction action) { - if (OntoUMLPlugin.getConfigWindowOpen() == true) return; + if (OntoUMLPlugin.getConfigWindowOpen()) return; else OntoUMLPlugin.setConfigWindowOpen(true); ApplicationManager.instance().getViewManager().showDialog(new ConfigurationsDialog()); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/SmartModellingController.java b/src/main/java/org/ontouml/vp/controllers/SmartModellingController.java similarity index 93% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/SmartModellingController.java rename to src/main/java/org/ontouml/vp/controllers/SmartModellingController.java index dff87e22..8f97ea8b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/SmartModellingController.java +++ b/src/main/java/org/ontouml/vp/controllers/SmartModellingController.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.controllers; import com.vp.plugin.model.IAssociation; import com.vp.plugin.model.IAssociationEnd; import com.vp.plugin.model.IClass; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.uml.Association; -import it.unibz.inf.ontouml.vp.utils.Stereotype; +import org.ontouml.vp.model.uml.Association; +import org.ontouml.vp.utils.Stereotype; public class SmartModellingController { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/AssociationEventManager.java b/src/main/java/org/ontouml/vp/listeners/AssociationEventManager.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/AssociationEventManager.java rename to src/main/java/org/ontouml/vp/listeners/AssociationEventManager.java index 44871864..6ee17d8e 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/AssociationEventManager.java +++ b/src/main/java/org/ontouml/vp/listeners/AssociationEventManager.java @@ -1,12 +1,12 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.listeners; import com.vp.plugin.diagram.IDiagramUIModel; import com.vp.plugin.diagram.connector.IAssociationUIModel; import com.vp.plugin.model.IAssociation; import com.vp.plugin.model.IAssociationEnd; -import it.unibz.inf.ontouml.vp.model.uml.Association; -import it.unibz.inf.ontouml.vp.model.uml.Diagram; -import it.unibz.inf.ontouml.vp.model.uml.ModelElement; +import org.ontouml.vp.model.uml.Association; +import org.ontouml.vp.model.uml.Diagram; +import org.ontouml.vp.model.uml.ModelElement; import java.beans.PropertyChangeEvent; import java.util.Set; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ClassEventManager.java b/src/main/java/org/ontouml/vp/listeners/ClassEventManager.java similarity index 93% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/ClassEventManager.java rename to src/main/java/org/ontouml/vp/listeners/ClassEventManager.java index 3c970d1a..db795a2c 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ClassEventManager.java +++ b/src/main/java/org/ontouml/vp/listeners/ClassEventManager.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.listeners; import com.vp.plugin.model.IClass; -import it.unibz.inf.ontouml.vp.model.uml.Class; -import it.unibz.inf.ontouml.vp.utils.ConfigurationsUtils; -import it.unibz.inf.ontouml.vp.utils.RestrictedTo; -import it.unibz.inf.ontouml.vp.utils.SmartColoringUtils; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.model.uml.Class; +import org.ontouml.vp.utils.ConfigurationsUtils; +import org.ontouml.vp.utils.RestrictedTo; +import org.ontouml.vp.utils.SmartColoringUtils; +import org.ontouml.vp.utils.StereotypesManager; import java.beans.PropertyChangeEvent; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/DiagramListener.java b/src/main/java/org/ontouml/vp/listeners/DiagramListener.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/DiagramListener.java rename to src/main/java/org/ontouml/vp/listeners/DiagramListener.java index da5d677a..a2e79c26 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/DiagramListener.java +++ b/src/main/java/org/ontouml/vp/listeners/DiagramListener.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.listeners; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.IDiagramListener; @@ -7,11 +7,11 @@ import com.vp.plugin.diagram.shape.IClassUIModel; import com.vp.plugin.model.IAssociation; import com.vp.plugin.model.IClass; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.uml.Association; -import it.unibz.inf.ontouml.vp.model.uml.Class; -import it.unibz.inf.ontouml.vp.model.uml.Diagram; -import it.unibz.inf.ontouml.vp.utils.SmartColoringUtils; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.uml.Association; +import org.ontouml.vp.model.uml.Class; +import org.ontouml.vp.model.uml.Diagram; +import org.ontouml.vp.utils.SmartColoringUtils; public class DiagramListener implements IDiagramListener { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/GeneralizationEventManager.java b/src/main/java/org/ontouml/vp/listeners/GeneralizationEventManager.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/GeneralizationEventManager.java rename to src/main/java/org/ontouml/vp/listeners/GeneralizationEventManager.java index e8118b17..64f8f46a 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/GeneralizationEventManager.java +++ b/src/main/java/org/ontouml/vp/listeners/GeneralizationEventManager.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.listeners; import com.vp.plugin.model.IClass; import com.vp.plugin.model.IGeneralization; -import it.unibz.inf.ontouml.vp.model.uml.Class; -import it.unibz.inf.ontouml.vp.model.uml.Generalization; +import org.ontouml.vp.model.uml.Class; +import org.ontouml.vp.model.uml.Generalization; import java.beans.PropertyChangeEvent; public class GeneralizationEventManager extends ModelElementEventManager { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/IssueLogMenuListener.java b/src/main/java/org/ontouml/vp/listeners/IssueLogMenuListener.java similarity index 83% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/IssueLogMenuListener.java rename to src/main/java/org/ontouml/vp/listeners/IssueLogMenuListener.java index 839dc98a..167bb77f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/IssueLogMenuListener.java +++ b/src/main/java/org/ontouml/vp/listeners/IssueLogMenuListener.java @@ -1,7 +1,7 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.listeners; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; -import it.unibz.inf.ontouml.vp.views.IssueLogMenu; +import org.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.views.IssueLogMenu; import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -9,8 +9,8 @@ import javax.swing.*; public final class IssueLogMenuListener extends MouseAdapter { - private List idModelElementList; - private JList messageList; + private final List idModelElementList; + private final JList messageList; public IssueLogMenuListener(List list, JList messages) { super(); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ModelElementEventManager.java b/src/main/java/org/ontouml/vp/listeners/ModelElementEventManager.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/ModelElementEventManager.java rename to src/main/java/org/ontouml/vp/listeners/ModelElementEventManager.java index fd40b3f8..afbd178f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ModelElementEventManager.java +++ b/src/main/java/org/ontouml/vp/listeners/ModelElementEventManager.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.listeners; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.factory.IModelElementFactory; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ModelListener.java b/src/main/java/org/ontouml/vp/listeners/ModelListener.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/ModelListener.java rename to src/main/java/org/ontouml/vp/listeners/ModelListener.java index ec6fdf48..f9520e00 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ModelListener.java +++ b/src/main/java/org/ontouml/vp/listeners/ModelListener.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.listeners; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ProjectDiagramListener.java b/src/main/java/org/ontouml/vp/listeners/ProjectDiagramListener.java similarity index 94% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/ProjectDiagramListener.java rename to src/main/java/org/ontouml/vp/listeners/ProjectDiagramListener.java index 82863336..157bac17 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ProjectDiagramListener.java +++ b/src/main/java/org/ontouml/vp/listeners/ProjectDiagramListener.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.listeners; import com.vp.plugin.ApplicationManager; import com.vp.plugin.diagram.IDiagramUIModel; @@ -8,7 +8,7 @@ public class ProjectDiagramListener implements IProjectDiagramListener { - private DiagramListener diagramListener; + private final DiagramListener diagramListener; public ProjectDiagramListener() { diagramListener = new DiagramListener(); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/Configurations.java b/src/main/java/org/ontouml/vp/model/Configurations.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/Configurations.java rename to src/main/java/org/ontouml/vp/model/Configurations.java index 68d29bae..d4bdb017 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/Configurations.java +++ b/src/main/java/org/ontouml/vp/model/Configurations.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import com.google.gson.*; import com.google.gson.annotations.Expose; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.IProject; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.OntoUMLPlugin; import java.io.File; import java.io.FileWriter; import java.io.IOException; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/GitHubRelease.java b/src/main/java/org/ontouml/vp/model/GitHubRelease.java similarity index 94% rename from src/main/java/it/unibz/inf/ontouml/vp/model/GitHubRelease.java rename to src/main/java/org/ontouml/vp/model/GitHubRelease.java index faa17556..01ebaef5 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/GitHubRelease.java +++ b/src/main/java/org/ontouml/vp/model/GitHubRelease.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -97,6 +97,6 @@ public String getId() { @Override public boolean equals(Object obj) { - return obj instanceof GitHubRelease ? getId().equals(((GitHubRelease) obj).getId()) : false; + return obj instanceof GitHubRelease && getId().equals(((GitHubRelease) obj).getId()); } } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/GitHubReleaseAsset.java b/src/main/java/org/ontouml/vp/model/GitHubReleaseAsset.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/model/GitHubReleaseAsset.java rename to src/main/java/org/ontouml/vp/model/GitHubReleaseAsset.java index cd2d48fd..12d1c9e4 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/GitHubReleaseAsset.java +++ b/src/main/java/org/ontouml/vp/model/GitHubReleaseAsset.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; @@ -65,6 +65,6 @@ public boolean isInstallationFileAsset() { @Override public boolean equals(Object obj) { - return obj instanceof GitHubRelease ? getId().equals(((GitHubRelease) obj).getId()) : false; + return obj instanceof GitHubRelease && getId().equals(((GitHubRelease) obj).getId()); } } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/GufoExportOptions.java b/src/main/java/org/ontouml/vp/model/GufoExportOptions.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/GufoExportOptions.java rename to src/main/java/org/ontouml/vp/model/GufoExportOptions.java index a5e54ca1..4e3db447 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/GufoExportOptions.java +++ b/src/main/java/org/ontouml/vp/model/GufoExportOptions.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/GufoTransformationServiceResult.java b/src/main/java/org/ontouml/vp/model/GufoTransformationServiceResult.java similarity index 90% rename from src/main/java/it/unibz/inf/ontouml/vp/model/GufoTransformationServiceResult.java rename to src/main/java/org/ontouml/vp/model/GufoTransformationServiceResult.java index 66e74efc..06404e9d 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/GufoTransformationServiceResult.java +++ b/src/main/java/org/ontouml/vp/model/GufoTransformationServiceResult.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ModularizationServiceResult.java b/src/main/java/org/ontouml/vp/model/ModularizationServiceResult.java similarity index 80% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ModularizationServiceResult.java rename to src/main/java/org/ontouml/vp/model/ModularizationServiceResult.java index 60b72534..b737e068 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ModularizationServiceResult.java +++ b/src/main/java/org/ontouml/vp/model/ModularizationServiceResult.java @@ -1,6 +1,7 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; + +import org.ontouml.vp.model.ontouml.Project; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; import java.util.List; public class ModularizationServiceResult extends ServiceResult { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/OntoumlElementReference.java b/src/main/java/org/ontouml/vp/model/OntoumlElementReference.java similarity index 93% rename from src/main/java/it/unibz/inf/ontouml/vp/model/OntoumlElementReference.java rename to src/main/java/org/ontouml/vp/model/OntoumlElementReference.java index 52d4d041..5195cb18 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/OntoumlElementReference.java +++ b/src/main/java/org/ontouml/vp/model/OntoumlElementReference.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ProjectConfigurations.java b/src/main/java/org/ontouml/vp/model/ProjectConfigurations.java similarity index 99% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ProjectConfigurations.java rename to src/main/java/org/ontouml/vp/model/ProjectConfigurations.java index bd5c18e8..1de0310d 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ProjectConfigurations.java +++ b/src/main/java/org/ontouml/vp/model/ProjectConfigurations.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ServiceIssue.java b/src/main/java/org/ontouml/vp/model/ServiceIssue.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ServiceIssue.java rename to src/main/java/org/ontouml/vp/model/ServiceIssue.java index 895e5edf..015f0a58 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ServiceIssue.java +++ b/src/main/java/org/ontouml/vp/model/ServiceIssue.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ServiceIssueDeserializer.java b/src/main/java/org/ontouml/vp/model/ServiceIssueDeserializer.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ServiceIssueDeserializer.java rename to src/main/java/org/ontouml/vp/model/ServiceIssueDeserializer.java index 3d398725..08fc2aef 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ServiceIssueDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ServiceIssueDeserializer.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ServiceResult.java b/src/main/java/org/ontouml/vp/model/ServiceResult.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ServiceResult.java rename to src/main/java/org/ontouml/vp/model/ServiceResult.java index 09135e16..0ed87f58 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ServiceResult.java +++ b/src/main/java/org/ontouml/vp/model/ServiceResult.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/VerificationServiceResult.java b/src/main/java/org/ontouml/vp/model/VerificationServiceResult.java similarity index 96% rename from src/main/java/it/unibz/inf/ontouml/vp/model/VerificationServiceResult.java rename to src/main/java/org/ontouml/vp/model/VerificationServiceResult.java index 083bd861..7a320663 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/VerificationServiceResult.java +++ b/src/main/java/org/ontouml/vp/model/VerificationServiceResult.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model; +package org.ontouml.vp.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/DiagramElementContainer.java b/src/main/java/org/ontouml/vp/model/ontouml/DiagramElementContainer.java similarity index 91% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/DiagramElementContainer.java rename to src/main/java/org/ontouml/vp/model/ontouml/DiagramElementContainer.java index 7d35d9e4..de3ad632 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/DiagramElementContainer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/DiagramElementContainer.java @@ -1,6 +1,8 @@ -package it.unibz.inf.ontouml.vp.model.ontouml; +package org.ontouml.vp.model.ontouml; + +import org.ontouml.vp.model.ontouml.view.*; +import org.ontouml.vp.model.ontouml.view.*; -import it.unibz.inf.ontouml.vp.model.ontouml.view.*; import java.util.List; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/Element.java b/src/main/java/org/ontouml/vp/model/ontouml/Element.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/Element.java rename to src/main/java/org/ontouml/vp/model/ontouml/Element.java index e5fb1f4e..733b0516 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/Element.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/Element.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml; +package org.ontouml.vp.model.ontouml; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/ElementContainer.java b/src/main/java/org/ontouml/vp/model/ontouml/ElementContainer.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/ElementContainer.java rename to src/main/java/org/ontouml/vp/model/ontouml/ElementContainer.java index 0dcb4aa0..ab0ef950 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/ElementContainer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/ElementContainer.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml; +package org.ontouml.vp.model.ontouml; import java.util.List; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/ModelElementContainer.java b/src/main/java/org/ontouml/vp/model/ontouml/ModelElementContainer.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/ModelElementContainer.java rename to src/main/java/org/ontouml/vp/model/ontouml/ModelElementContainer.java index 80f4b47b..d409dd93 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/ModelElementContainer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/ModelElementContainer.java @@ -1,8 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml; +package org.ontouml.vp.model.ontouml; + +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -16,7 +17,7 @@ default List getAllModelElements() { } default List getAllPackages() { - return getAllContentsByType(it.unibz.inf.ontouml.vp.model.ontouml.model.Package.class); + return getAllContentsByType(Package.class); } default List getAllClasses() { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/MultilingualText.java b/src/main/java/org/ontouml/vp/model/ontouml/MultilingualText.java similarity index 90% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/MultilingualText.java rename to src/main/java/org/ontouml/vp/model/ontouml/MultilingualText.java index f9b03532..49f7974b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/MultilingualText.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/MultilingualText.java @@ -1,9 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml; +package org.ontouml.vp.model.ontouml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.MultilingualTextDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.MultilingualTextSerializer; +import org.ontouml.vp.model.ontouml.deserialization.MultilingualTextDeserializer; +import org.ontouml.vp.model.ontouml.serialization.MultilingualTextSerializer; + import java.util.*; @JsonSerialize(using = MultilingualTextSerializer.class) @@ -12,7 +13,7 @@ public class MultilingualText { private static String defaultLanguage = "en"; private static String[] languagePreference = new String[] {defaultLanguage}; - private SortedMap textMap = new TreeMap<>(); + private final SortedMap textMap = new TreeMap<>(); public MultilingualText(MultilingualText base) { textMap.putAll(base.textMap); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/OntoumlElement.java b/src/main/java/org/ontouml/vp/model/ontouml/OntoumlElement.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/OntoumlElement.java rename to src/main/java/org/ontouml/vp/model/ontouml/OntoumlElement.java index f1f35bda..e42be4b4 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/OntoumlElement.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/OntoumlElement.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml; +package org.ontouml.vp.model.ontouml; import java.util.List; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/OntoumlUtils.java b/src/main/java/org/ontouml/vp/model/ontouml/OntoumlUtils.java similarity index 91% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/OntoumlUtils.java rename to src/main/java/org/ontouml/vp/model/ontouml/OntoumlUtils.java index 651ca6d7..64e465c2 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/OntoumlUtils.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/OntoumlUtils.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml; +package org.ontouml.vp.model.ontouml; import java.util.Collection; import java.util.function.Predicate; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/Project.java b/src/main/java/org/ontouml/vp/model/ontouml/Project.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/Project.java rename to src/main/java/org/ontouml/vp/model/ontouml/Project.java index 7b4a06fd..f4c7b1a3 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/Project.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/Project.java @@ -1,11 +1,12 @@ -package it.unibz.inf.ontouml.vp.model.ontouml; +package org.ontouml.vp.model.ontouml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.ProjectDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.ProjectSerializer; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Diagram; +import org.ontouml.vp.model.ontouml.deserialization.ProjectDeserializer; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.serialization.ProjectSerializer; +import org.ontouml.vp.model.ontouml.view.Diagram; + import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -15,7 +16,7 @@ public class Project extends OntoumlElement implements ModelElementContainer, DiagramElementContainer { private Package model; - private List diagrams = new ArrayList<>(); + private final List diagrams = new ArrayList<>(); public Project(String id, MultilingualText name) { super(null, id, name); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ClassDeserializer.java similarity index 66% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/ClassDeserializer.java index 8b9a39ce..a8cd44ff 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ClassDeserializer.java @@ -1,14 +1,14 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.*; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Literal; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Literal; import java.io.IOException; import java.util.List; @@ -26,16 +26,16 @@ public Class deserialize(JsonParser parser, DeserializationContext context) thro DecoratableDeserializer.deserialize(clazz, root, codec); ClassifierDeserializer.deserialize(clazz, root, codec); - Boolean isExtensional = deserializeNullableBooleanField(root, "isExtensional"); + Boolean isExtensional = DeserializerUtils.deserializeNullableBooleanField(root, "isExtensional"); clazz.setExtensional(isExtensional); - Boolean isPowertype = deserializeNullableBooleanField(root, "isPowertype"); + Boolean isPowertype = DeserializerUtils.deserializeNullableBooleanField(root, "isPowertype"); clazz.setPowertype(isPowertype); - Integer order = deserializeNullableIntegerField(root, "order"); + Integer order = DeserializerUtils.deserializeNullableIntegerField(root, "order"); clazz.setOrder(order); - String[] restrictedTo = deserializeNullableStringArrayField(root, "restrictedTo", codec); + String[] restrictedTo = DeserializerUtils.deserializeNullableStringArrayField(root, "restrictedTo", codec); if (restrictedTo != null) { clazz.setRestrictedTo(restrictedTo); } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializer.java similarity index 72% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializer.java index 1cd65cf4..014e9b65 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializer.java @@ -1,15 +1,15 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ClassView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Rectangle; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.view.ClassView; +import org.ontouml.vp.model.ontouml.view.Rectangle; import java.io.IOException; public class ClassViewDeserializer extends JsonDeserializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassifierDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ClassifierDeserializer.java similarity index 63% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassifierDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/ClassifierDeserializer.java index 6e2f3588..a854756d 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassifierDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ClassifierDeserializer.java @@ -1,12 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; - -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeBooleanField; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Property; import java.io.IOException; import java.util.List; @@ -15,10 +13,10 @@ public class ClassifierDeserializer { public static void deserialize(Classifier classifier, JsonNode root, ObjectCodec codec) throws IOException { - boolean isAbstract = deserializeBooleanField(root, "isAbstract"); + boolean isAbstract = DeserializerUtils.deserializeBooleanField(root, "isAbstract"); classifier.setAbstract(isAbstract); - boolean isDerived = deserializeBooleanField(root, "isDerived"); + boolean isDerived = DeserializerUtils.deserializeBooleanField(root, "isDerived"); classifier.setDerived(isDerived); JsonNode propertiesNode = root.get("properties"); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ConnectorViewDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ConnectorViewDeserializer.java similarity index 79% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ConnectorViewDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/ConnectorViewDeserializer.java index a9e6692f..8a14d8f2 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ConnectorViewDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ConnectorViewDeserializer.java @@ -1,11 +1,13 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.view.*; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.view.*; +import org.ontouml.vp.model.ontouml.view.*; + import java.io.IOException; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DecoratableDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/DecoratableDeserializer.java similarity index 51% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DecoratableDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/DecoratableDeserializer.java index d3c69755..b476e835 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DecoratableDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/DecoratableDeserializer.java @@ -1,17 +1,15 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; - -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeNullableStringField; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Decoratable; +import org.ontouml.vp.model.ontouml.model.Decoratable; import java.io.IOException; public class DecoratableDeserializer { public static void deserialize(Decoratable decoratable, JsonNode root, ObjectCodec codec) throws IOException { - String stereotype = deserializeNullableStringField(root, "stereotype"); + String stereotype = DeserializerUtils.deserializeNullableStringField(root, "stereotype"); decoratable.setStereotype(stereotype); } } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DeserializerUtils.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/DeserializerUtils.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DeserializerUtils.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/DeserializerUtils.java index a23627f4..c9112f61 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DeserializerUtils.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/DeserializerUtils.java @@ -1,14 +1,17 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.view.*; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.view.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.view.*; + import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DiagramDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/DiagramDeserializer.java similarity index 80% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DiagramDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/DiagramDeserializer.java index dcf9613e..09f03fbd 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DiagramDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/DiagramDeserializer.java @@ -1,17 +1,18 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.*; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.view.*; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.view.*; + import java.io.IOException; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ElementDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ElementDeserializer.java similarity index 83% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ElementDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/ElementDeserializer.java index 257688df..79ca0691 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ElementDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ElementDeserializer.java @@ -1,16 +1,16 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.Element; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.Element; +import org.ontouml.vp.model.ontouml.MultilingualText; import java.io.IOException; public class ElementDeserializer { public static void deserialize(Element element, JsonNode root, ObjectCodec codec) throws IOException { - System.out.println("Deserializing type: " + root.get("type") + ""); + System.out.println("Deserializing type: " + root.get("type")); String id = root.get("id").asText(); element.setId(id); System.out.println("Deserialized id: " + id); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializer.java similarity index 63% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializer.java index 7defa653..2c9cd799 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializer.java @@ -1,14 +1,12 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; - -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeClassifierField; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Generalization; import java.io.IOException; public class GeneralizationDeserializer extends JsonDeserializer { @@ -23,10 +21,10 @@ public Generalization deserialize(JsonParser parser, DeserializationContext cont ElementDeserializer.deserialize(gen, root, codec); ModelElementDeserializer.deserialize(gen, root, codec); - Classifier general = deserializeClassifierField(root, "general", codec); + Classifier general = DeserializerUtils.deserializeClassifierField(root, "general", codec); gen.setGeneral(general); - Classifier specific = deserializeClassifierField(root, "specific", codec); + Classifier specific = DeserializerUtils.deserializeClassifierField(root, "specific", codec); gen.setSpecific(specific); return gen; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializer.java similarity index 70% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializer.java index 36e56744..9280afaf 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializer.java @@ -1,15 +1,15 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.*; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; -import it.unibz.inf.ontouml.vp.model.ontouml.model.GeneralizationSet; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.model.GeneralizationSet; import java.io.IOException; import java.util.List; @@ -25,10 +25,10 @@ public GeneralizationSet deserialize(JsonParser parser, DeserializationContext c ElementDeserializer.deserialize(gs, root, codec); ModelElementDeserializer.deserialize(gs, root, codec); - boolean isComplete = deserializeBooleanField(root, "isComplete"); + boolean isComplete = DeserializerUtils.deserializeBooleanField(root, "isComplete"); gs.setComplete(isComplete); - boolean isDisjoint = deserializeBooleanField(root, "isDisjoint"); + boolean isDisjoint = DeserializerUtils.deserializeBooleanField(root, "isDisjoint"); gs.setDisjoint(isDisjoint); Class categorizer = deserializeObjectField(root, "categorizer", Class.class, codec); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializer.java similarity index 72% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializer.java index 69252673..38cac566 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializer.java @@ -1,15 +1,15 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.GeneralizationSet; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationSetView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Text; +import org.ontouml.vp.model.ontouml.model.GeneralizationSet; +import org.ontouml.vp.model.ontouml.view.GeneralizationSetView; +import org.ontouml.vp.model.ontouml.view.Text; import java.io.IOException; public class GeneralizationSetViewDeserializer extends JsonDeserializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializer.java similarity index 73% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializer.java index e1559ac7..664ca5f4 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializer.java @@ -1,14 +1,14 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationView; +import org.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.view.GeneralizationView; import java.io.IOException; public class GeneralizationViewDeserializer extends JsonDeserializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/LiteralDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/LiteralDeserializer.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/LiteralDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/LiteralDeserializer.java index c0979386..6980acca 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/LiteralDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/LiteralDeserializer.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Literal; +import org.ontouml.vp.model.ontouml.model.Literal; import java.io.IOException; public class LiteralDeserializer extends JsonDeserializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ModelElementDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ModelElementDeserializer.java similarity index 83% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ModelElementDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/ModelElementDeserializer.java index e90edc61..93043cef 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ModelElementDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ModelElementDeserializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.ModelElement; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializer.java similarity index 91% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializer.java index 5c21b0ae..ee7c4e5b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializer.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.MultilingualText; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/PackageDeserializer.java similarity index 90% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/PackageDeserializer.java index aedc05a4..af916875 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/PackageDeserializer.java @@ -1,13 +1,15 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Package; + import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageViewDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/PackageViewDeserializer.java similarity index 72% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageViewDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/PackageViewDeserializer.java index f52a7b49..efaa4908 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageViewDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/PackageViewDeserializer.java @@ -1,15 +1,15 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.view.PackageView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Rectangle; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.view.PackageView; +import org.ontouml.vp.model.ontouml.view.Rectangle; import java.io.IOException; public class PackageViewDeserializer extends JsonDeserializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PathDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/PathDeserializer.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PathDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/PathDeserializer.java index a0f4b091..81bf43f4 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PathDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/PathDeserializer.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Path; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Point; +import org.ontouml.vp.model.ontouml.view.Path; +import org.ontouml.vp.model.ontouml.view.Point; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ProjectDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ProjectDeserializer.java similarity index 72% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ProjectDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/ProjectDeserializer.java index a3e20f81..67d08bbf 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ProjectDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ProjectDeserializer.java @@ -1,7 +1,7 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeArrayField; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeArrayField; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; @@ -9,9 +9,9 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Diagram; +import org.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.view.Diagram; import java.io.IOException; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/PropertyDeserializer.java similarity index 63% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/PropertyDeserializer.java index 865ce9af..78f43d96 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/PropertyDeserializer.java @@ -1,15 +1,15 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.*; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.AggregationKind; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.AggregationKind; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Property; import java.io.IOException; import java.util.List; @@ -26,19 +26,19 @@ public Property deserialize(JsonParser parser, DeserializationContext context) ModelElementDeserializer.deserialize(property, root, codec); DecoratableDeserializer.deserialize(property, root, codec); - boolean isDerived = deserializeBooleanField(root, "isDerived"); + boolean isDerived = DeserializerUtils.deserializeBooleanField(root, "isDerived"); property.setDerived(isDerived); - boolean isReadOnly = deserializeBooleanField(root, "isReadOnly"); + boolean isReadOnly = DeserializerUtils.deserializeBooleanField(root, "isReadOnly"); property.setReadOnly(isReadOnly); - boolean isOrdered = deserializeBooleanField(root, "isOrdered"); + boolean isOrdered = DeserializerUtils.deserializeBooleanField(root, "isOrdered"); property.setOrdered(isOrdered); - String cardinality = deserializeNullableStringField(root, "cardinality"); + String cardinality = DeserializerUtils.deserializeNullableStringField(root, "cardinality"); property.setCardinality(cardinality); - Classifier propertyType = deserializeClassifierField(root, "propertyType", codec); + Classifier propertyType = DeserializerUtils.deserializeClassifierField(root, "propertyType", codec); property.setPropertyType(propertyType); List subsettedProperties = @@ -49,7 +49,7 @@ public Property deserialize(JsonParser parser, DeserializationContext context) deserializeArrayField(root, "redefinedProperties", Property.class, codec); property.setRedefinedProperties(redefinedProperties); - String aggregationKind = deserializeNullableStringField(root, "aggregationKind"); + String aggregationKind = DeserializerUtils.deserializeNullableStringField(root, "aggregationKind"); property.setAggregationKind(AggregationKind.findByName(aggregationKind).orElse(null)); return property; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangleDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/RectangleDeserializer.java similarity index 83% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangleDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/RectangleDeserializer.java index d68f65a2..147e4ddf 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangleDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/RectangleDeserializer.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Rectangle; +import org.ontouml.vp.model.ontouml.view.Rectangle; import java.io.IOException; public class RectangleDeserializer extends JsonDeserializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangularShapeDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/RectangularShapeDeserializer.java similarity index 70% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangularShapeDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/RectangularShapeDeserializer.java index ecfa4067..6eba2853 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangularShapeDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/RectangularShapeDeserializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeNullableIntegerField; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeNullableIntegerField; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RectangularShape; +import org.ontouml.vp.model.ontouml.view.RectangularShape; public class RectangularShapeDeserializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ReferenceResolver.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ReferenceResolver.java similarity index 91% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ReferenceResolver.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/ReferenceResolver.java index b70f1870..6a14d497 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ReferenceResolver.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/ReferenceResolver.java @@ -1,12 +1,14 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; - -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ConnectorView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Diagram; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ElementView; +package org.ontouml.vp.model.ontouml.deserialization; + +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.view.ConnectorView; +import org.ontouml.vp.model.ontouml.view.Diagram; +import org.ontouml.vp.model.ontouml.view.ElementView; + import java.util.HashSet; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/RelationDeserializer.java similarity index 87% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/RelationDeserializer.java index dafa6a08..952684db 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/RelationDeserializer.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.model.Relation; import java.io.IOException; public class RelationDeserializer extends JsonDeserializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializer.java similarity index 73% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializer.java index b810c3df..61093d1a 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializer.java @@ -1,14 +1,14 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; +package org.ontouml.vp.model.ontouml.deserialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; +import static org.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeObjectField; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RelationView; +import org.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.view.RelationView; import java.io.IOException; public class RelationViewDeserializer extends JsonDeserializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/TextDeserializer.java b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/TextDeserializer.java similarity index 66% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/TextDeserializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/deserialization/TextDeserializer.java index a0f9b94b..0fb8bfe9 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/TextDeserializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/deserialization/TextDeserializer.java @@ -1,12 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.deserialization; - -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DeserializerUtils.deserializeNullableStringField; +package org.ontouml.vp.model.ontouml.deserialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Text; +import org.ontouml.vp.model.ontouml.view.Text; import java.io.IOException; public class TextDeserializer extends JsonDeserializer { @@ -17,7 +15,7 @@ public Text deserialize(JsonParser parser, DeserializationContext context) throw Text text = new Text(); - String value = deserializeNullableStringField(root, "value"); + String value = DeserializerUtils.deserializeNullableStringField(root, "value"); text.setValue(value); RectangularShapeDeserializer.deserialize(text, root); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/AggregationKind.java b/src/main/java/org/ontouml/vp/model/ontouml/model/AggregationKind.java similarity index 90% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/AggregationKind.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/AggregationKind.java index 7a5144d5..ff65e10e 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/AggregationKind.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/AggregationKind.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import java.util.Optional; import java.util.stream.Stream; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Cardinality.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Cardinality.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Cardinality.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Cardinality.java index eea9d2eb..0404f640 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Cardinality.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Cardinality.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Class.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Class.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Class.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Class.java index f54708da..a50ed7d7 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Class.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Class.java @@ -1,12 +1,13 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlUtils; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.ClassDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.ClassSerializer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.OntoumlUtils; +import org.ontouml.vp.model.ontouml.deserialization.ClassDeserializer; +import org.ontouml.vp.model.ontouml.serialization.ClassSerializer; + import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -18,11 +19,11 @@ public final class Class extends Classifier { public static Integer ORDERLESS = Integer.MAX_VALUE; public static String ORDERLESS_STRING = "*"; - protected Boolean isExtensional; - protected Boolean isPowertype; - protected Integer order; - protected Set restrictedTo = new TreeSet<>(); - protected List literals = new ArrayList<>(); + private Boolean isExtensional; + private Boolean isPowertype; + private Integer order; + private Set restrictedTo = new TreeSet<>(); + private List literals = new ArrayList<>(); public Class(String id, MultilingualText name, ClassStereotype ontoumlStereotype) { super(id, name, ontoumlStereotype); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/ClassStereotype.java b/src/main/java/org/ontouml/vp/model/ontouml/model/ClassStereotype.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/ClassStereotype.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/ClassStereotype.java index 101df1d7..dd3f2051 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/ClassStereotype.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/ClassStereotype.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import java.util.Collection; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Classifier.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Classifier.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Classifier.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Classifier.java index 1112c33b..236a794b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Classifier.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Classifier.java @@ -1,6 +1,6 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.MultilingualText; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Decoratable.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Decoratable.java similarity index 91% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Decoratable.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Decoratable.java index 2901d3e2..c9e8f98d 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Decoratable.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Decoratable.java @@ -1,8 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.DecoratableSerializer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.serialization.DecoratableSerializer; + import java.util.Optional; @JsonSerialize(using = DecoratableSerializer.class) diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Generalization.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Generalization.java similarity index 86% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Generalization.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Generalization.java index ac50f38c..f9ee69dd 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Generalization.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Generalization.java @@ -1,11 +1,12 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.GeneralizationDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.GeneralizationSerializer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.deserialization.GeneralizationDeserializer; +import org.ontouml.vp.model.ontouml.serialization.GeneralizationSerializer; + import java.util.Collections; import java.util.List; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/GeneralizationSet.java b/src/main/java/org/ontouml/vp/model/ontouml/model/GeneralizationSet.java similarity index 82% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/GeneralizationSet.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/GeneralizationSet.java index d96ba881..3380c6ab 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/GeneralizationSet.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/GeneralizationSet.java @@ -1,12 +1,13 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlUtils; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.GeneralizationSetDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.GeneralizationSetSerializer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.OntoumlUtils; +import org.ontouml.vp.model.ontouml.deserialization.GeneralizationSetDeserializer; +import org.ontouml.vp.model.ontouml.serialization.GeneralizationSetSerializer; + import java.util.*; @JsonSerialize(using = GeneralizationSetSerializer.class) @@ -16,7 +17,7 @@ public class GeneralizationSet extends ModelElement { private boolean isDisjoint; private boolean isComplete; private Class categorizer; - private Set generalizations = new HashSet<>(); + private final Set generalizations = new HashSet<>(); public GeneralizationSet( String id, @@ -29,7 +30,7 @@ public GeneralizationSet( } public GeneralizationSet( - String id, String name, Class categorizer, Collection generalizations) { + String id, String name, Class categorizer, Collection generalizations) { this(id, new MultilingualText(name), categorizer, generalizations); } @@ -42,7 +43,7 @@ public GeneralizationSet(String id, String name, Generalization... generalizatio } public GeneralizationSet( - MultilingualText name, Class categorizer, Collection generalizations) { + MultilingualText name, Class categorizer, Collection generalizations) { this(null, name, categorizer, generalizations); } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Literal.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Literal.java similarity index 67% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Literal.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Literal.java index 0465086b..41ae2411 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Literal.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Literal.java @@ -1,11 +1,12 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.LiteralDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.LiteralSerializer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.deserialization.LiteralDeserializer; +import org.ontouml.vp.model.ontouml.serialization.LiteralSerializer; + import java.util.Collections; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/ModelElement.java b/src/main/java/org/ontouml/vp/model/ontouml/model/ModelElement.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/ModelElement.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/ModelElement.java index 6d04aaa8..132803d6 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/ModelElement.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/ModelElement.java @@ -1,10 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.ModelElementSerializer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.serialization.ModelElementSerializer; + import java.util.Map; import java.util.Optional; import java.util.TreeMap; @@ -15,7 +16,7 @@ */ @JsonSerialize(using = ModelElementSerializer.class) public abstract class ModelElement extends OntoumlElement { - private Map propertyAssignments = new TreeMap<>(); + private final Map propertyAssignments = new TreeMap<>(); public ModelElement(String id, MultilingualText name) { super(id, name); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Nature.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Nature.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Nature.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Nature.java index f872a64f..3a3d5af0 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Nature.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Nature.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import java.util.Collection; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Package.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Package.java similarity index 93% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Package.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Package.java index d436862b..c68b2eff 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Package.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Package.java @@ -1,14 +1,15 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.ModelElementContainer; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlUtils; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.PackageDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.PackageSerializer; +import org.ontouml.vp.model.ontouml.ModelElementContainer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.OntoumlUtils; +import org.ontouml.vp.model.ontouml.deserialization.PackageDeserializer; +import org.ontouml.vp.model.ontouml.serialization.PackageSerializer; + import java.util.*; @JsonSerialize(using = PackageSerializer.class) @@ -312,12 +313,12 @@ public GeneralizationSet createGeneralizationSet( } public GeneralizationSet createGeneralizationSet( - String name, Class categorizer, Collection generalizations) { + String name, Class categorizer, Collection generalizations) { return createGeneralizationSet(null, name, categorizer, generalizations); } public GeneralizationSet createGeneralizationSet( - String id, String name, Class categorizer, Collection generalizations) { + String id, String name, Class categorizer, Collection generalizations) { return addContent(new GeneralizationSet(id, name, categorizer, generalizations)); } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Property.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Property.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Property.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Property.java index 10ea6f38..bbb72f17 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Property.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Property.java @@ -1,12 +1,13 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlUtils; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.PropertyDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.PropertySerializer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.OntoumlUtils; +import org.ontouml.vp.model.ontouml.deserialization.PropertyDeserializer; +import org.ontouml.vp.model.ontouml.serialization.PropertySerializer; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -17,8 +18,8 @@ public final class Property extends Decoratable { private Cardinality cardinality = new Cardinality(); private Classifier propertyType; - private List subsettedProperties = new ArrayList<>(); - private List redefinedProperties = new ArrayList<>(); + private final List subsettedProperties = new ArrayList<>(); + private final List redefinedProperties = new ArrayList<>(); private AggregationKind aggregationKind; private boolean isDerived; private boolean isOrdered; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/PropertyStereotype.java b/src/main/java/org/ontouml/vp/model/ontouml/model/PropertyStereotype.java similarity index 89% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/PropertyStereotype.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/PropertyStereotype.java index f9422ce9..cf90b962 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/PropertyStereotype.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/PropertyStereotype.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Relation.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Relation.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Relation.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Relation.java index 43aa2546..5846e750 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Relation.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Relation.java @@ -1,12 +1,13 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.RelationDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.RelationSerializer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.deserialization.RelationDeserializer; +import org.ontouml.vp.model.ontouml.serialization.RelationSerializer; + import java.util.List; import java.util.Optional; import java.util.function.Predicate; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/RelationStereotype.java b/src/main/java/org/ontouml/vp/model/ontouml/model/RelationStereotype.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/RelationStereotype.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/RelationStereotype.java index 85d825fe..b627f6e2 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/RelationStereotype.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/RelationStereotype.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import java.util.Collection; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Stereotype.java b/src/main/java/org/ontouml/vp/model/ontouml/model/Stereotype.java similarity index 87% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Stereotype.java rename to src/main/java/org/ontouml/vp/model/ontouml/model/Stereotype.java index e1191c44..75363f3b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/model/Stereotype.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/model/Stereotype.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.model; +package org.ontouml.vp.model.ontouml.model; import java.util.EnumSet; import java.util.Optional; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ClassSerializer.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/ClassSerializer.java index 10f40851..de25aac0 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ClassSerializer.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Nature; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Nature; import java.io.IOException; public class ClassSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassViewSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ClassViewSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassViewSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/ClassViewSerializer.java index 0ff580f1..f17d898b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassViewSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ClassViewSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ClassView; +import org.ontouml.vp.model.ontouml.view.ClassView; import java.io.IOException; public class ClassViewSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassifierSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ClassifierSerializer.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassifierSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/ClassifierSerializer.java index bea8373d..a6b3824d 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassifierSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ClassifierSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Classifier; import java.io.IOException; public class ClassifierSerializer extends JsonSerializer> { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ConnectorViewSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ConnectorViewSerializer.java similarity index 87% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ConnectorViewSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/ConnectorViewSerializer.java index 6542423e..14fc4bb5 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ConnectorViewSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ConnectorViewSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ConnectorView; +import org.ontouml.vp.model.ontouml.view.ConnectorView; import java.io.IOException; public class ConnectorViewSerializer extends JsonSerializer> { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/DecoratableSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/DecoratableSerializer.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/DecoratableSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/DecoratableSerializer.java index e997e057..7bad5376 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/DecoratableSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/DecoratableSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Decoratable; +import org.ontouml.vp.model.ontouml.model.Decoratable; import java.io.IOException; public class DecoratableSerializer extends JsonSerializer> { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/DiagramElementSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/DiagramElementSerializer.java similarity index 79% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/DiagramElementSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/DiagramElementSerializer.java index 3d46e712..94620935 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/DiagramElementSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/DiagramElementSerializer.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.serialization.Serializer.writeNullableReferenceField; +import static org.ontouml.vp.model.ontouml.serialization.Serializer.writeNullableReferenceField; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ElementView; +import org.ontouml.vp.model.ontouml.view.ElementView; import java.io.IOException; public class DiagramElementSerializer extends JsonSerializer> { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/DiagramSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/DiagramSerializer.java similarity index 78% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/DiagramSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/DiagramSerializer.java index fcf76576..ed0f665f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/DiagramSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/DiagramSerializer.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; -import static it.unibz.inf.ontouml.vp.model.ontouml.serialization.Serializer.writeNullableReferenceField; +import static org.ontouml.vp.model.ontouml.serialization.Serializer.writeNullableReferenceField; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Diagram; +import org.ontouml.vp.model.ontouml.view.Diagram; import java.io.IOException; public class DiagramSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ElementSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ElementSerializer.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ElementSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/ElementSerializer.java index a63265cf..91bdde1e 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ElementSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ElementSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.Element; +import org.ontouml.vp.model.ontouml.Element; import java.io.IOException; public class ElementSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationSerializer.java similarity index 87% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationSerializer.java index 121d9d0e..554042ac 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.model.Generalization; import java.io.IOException; public class GeneralizationSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializer.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializer.java index 7127f412..580f024f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.GeneralizationSet; +import org.ontouml.vp.model.ontouml.model.GeneralizationSet; import java.io.IOException; public class GeneralizationSetSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetViewSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationSetViewSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetViewSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationSetViewSerializer.java index 8f5a5b9f..dcc2ed12 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetViewSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationSetViewSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationSetView; +import org.ontouml.vp.model.ontouml.view.GeneralizationSetView; import java.io.IOException; public class GeneralizationSetViewSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationViewSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationViewSerializer.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationViewSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationViewSerializer.java index 94512c55..924321bb 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationViewSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/GeneralizationViewSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationView; +import org.ontouml.vp.model.ontouml.view.GeneralizationView; import java.io.IOException; public class GeneralizationViewSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/LiteralSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/LiteralSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/LiteralSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/LiteralSerializer.java index 4256ad9b..2679a912 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/LiteralSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/LiteralSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Literal; +import org.ontouml.vp.model.ontouml.model.Literal; import java.io.IOException; public class LiteralSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ModelElementSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ModelElementSerializer.java similarity index 87% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ModelElementSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/ModelElementSerializer.java index 519256ec..700c5e3d 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ModelElementSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ModelElementSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.ModelElement; import java.io.IOException; public class ModelElementSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializer.java index 007aff66..5475d865 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.MultilingualText; import java.io.IOException; public class MultilingualTextSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/NodeViewSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/NodeViewSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/NodeViewSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/NodeViewSerializer.java index ed7a5201..63854068 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/NodeViewSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/NodeViewSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.NodeView; +import org.ontouml.vp.model.ontouml.view.NodeView; import java.io.IOException; public class NodeViewSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/OntoumlElementSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/OntoumlElementSerializer.java similarity index 87% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/OntoumlElementSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/OntoumlElementSerializer.java index b6b308eb..9b9c08d0 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/OntoumlElementSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/OntoumlElementSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.OntoumlElement; import java.io.IOException; public class OntoumlElementSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/PackageSerializer.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/PackageSerializer.java index c7922750..dba29088 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/PackageSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.model.Package; import java.io.IOException; public class PackageSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageViewSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/PackageViewSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageViewSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/PackageViewSerializer.java index f53d2226..f085bb83 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageViewSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/PackageViewSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.PackageView; +import org.ontouml.vp.model.ontouml.view.PackageView; import java.io.IOException; public class PackageViewSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PathSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/PathSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PathSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/PathSerializer.java index d8691ae9..cd833969 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PathSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/PathSerializer.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Path; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Point; +import org.ontouml.vp.model.ontouml.view.Path; +import org.ontouml.vp.model.ontouml.view.Point; import java.io.IOException; public class PathSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ProjectSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ProjectSerializer.java similarity index 87% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ProjectSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/ProjectSerializer.java index f065f161..f78ba49c 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ProjectSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ProjectSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.Project; import java.io.IOException; public class ProjectSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PropertySerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/PropertySerializer.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PropertySerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/PropertySerializer.java index e338e452..81b7cd73 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PropertySerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/PropertySerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.Property; import java.io.IOException; public class PropertySerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RectangleSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/RectangleSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RectangleSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/RectangleSerializer.java index 449b21b4..24fc0c01 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RectangleSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/RectangleSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Rectangle; +import org.ontouml.vp.model.ontouml.view.Rectangle; import java.io.IOException; public class RectangleSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RectangularShapeSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/RectangularShapeSerializer.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RectangularShapeSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/RectangularShapeSerializer.java index b022857c..1c6a8d87 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RectangularShapeSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/RectangularShapeSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RectangularShape; +import org.ontouml.vp.model.ontouml.view.RectangularShape; import java.io.IOException; public class RectangularShapeSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/RelationSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/RelationSerializer.java index 143002ef..5ce35a58 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/RelationSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.model.Relation; import java.io.IOException; public class RelationSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationViewSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/RelationViewSerializer.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationViewSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/RelationViewSerializer.java index e5bf852e..1aeafe8c 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationViewSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/RelationViewSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RelationView; +import org.ontouml.vp.model.ontouml.view.RelationView; import java.io.IOException; public class RelationViewSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/Serializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/Serializer.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/Serializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/Serializer.java index bcb522e7..7d8d0b31 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/Serializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/Serializer.java @@ -1,7 +1,7 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.OntoumlElement; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ShapeSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ShapeSerializer.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ShapeSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/ShapeSerializer.java index 52cb56f1..bf7451b9 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ShapeSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/ShapeSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Shape; +import org.ontouml.vp.model.ontouml.view.Shape; import java.io.IOException; public class ShapeSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/TextSerializer.java b/src/main/java/org/ontouml/vp/model/ontouml/serialization/TextSerializer.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/TextSerializer.java rename to src/main/java/org/ontouml/vp/model/ontouml/serialization/TextSerializer.java index f8c48d26..5ab2039f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/TextSerializer.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/serialization/TextSerializer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.serialization; +package org.ontouml.vp.model.ontouml.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Text; +import org.ontouml.vp.model.ontouml.view.Text; import java.io.IOException; public class TextSerializer extends JsonSerializer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/ClassView.java b/src/main/java/org/ontouml/vp/model/ontouml/view/ClassView.java similarity index 69% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/ClassView.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/ClassView.java index fcad5b08..2a796902 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/ClassView.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/ClassView.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.ClassViewDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.ClassViewSerializer; +import org.ontouml.vp.model.ontouml.deserialization.ClassViewDeserializer; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.serialization.ClassViewSerializer; @JsonSerialize(using = ClassViewSerializer.class) @JsonDeserialize(using = ClassViewDeserializer.class) diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/ConnectorView.java b/src/main/java/org/ontouml/vp/model/ontouml/view/ConnectorView.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/ConnectorView.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/ConnectorView.java index 306e5a22..615b4b7b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/ConnectorView.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/ConnectorView.java @@ -1,7 +1,8 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; + +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Diagram.java b/src/main/java/org/ontouml/vp/model/ontouml/view/Diagram.java similarity index 78% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Diagram.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/Diagram.java index ba83fdb0..8f23a798 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Diagram.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/Diagram.java @@ -1,13 +1,14 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.DiagramElementContainer; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.DiagramDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.DiagramSerializer; +import org.ontouml.vp.model.ontouml.DiagramElementContainer; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.deserialization.DiagramDeserializer; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.serialization.DiagramSerializer; + import java.util.*; /** A set of {@link ElementView} instances use to describe a perspective of the OntoUML model. */ @@ -16,7 +17,7 @@ public class Diagram extends DiagramElement implements DiagramElementContainer { private ModelElement owner; - private Set> contents = new HashSet<>(); + private final Set> contents = new HashSet<>(); @Override public String getType() { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/DiagramElement.java b/src/main/java/org/ontouml/vp/model/ontouml/view/DiagramElement.java similarity index 58% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/DiagramElement.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/DiagramElement.java index 188e2dee..a14cb65a 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/DiagramElement.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/DiagramElement.java @@ -1,8 +1,7 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import java.awt.*; +import org.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.OntoumlElement; /** Element defined in the concrete syntax of the language */ public abstract class DiagramElement extends OntoumlElement { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/ElementView.java b/src/main/java/org/ontouml/vp/model/ontouml/view/ElementView.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/ElementView.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/ElementView.java index 9c0fa61f..691013bf 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/ElementView.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/ElementView.java @@ -1,6 +1,6 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.ModelElement; /** * A graphical representation of a {@link ModelElement} within a {@link Diagram} . diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/GeneralizationSetView.java b/src/main/java/org/ontouml/vp/model/ontouml/view/GeneralizationSetView.java similarity index 70% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/GeneralizationSetView.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/GeneralizationSetView.java index ff3f9b05..627027a7 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/GeneralizationSetView.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/GeneralizationSetView.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.GeneralizationSetViewDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.model.GeneralizationSet; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.GeneralizationSetViewSerializer; +import org.ontouml.vp.model.ontouml.deserialization.GeneralizationSetViewDeserializer; +import org.ontouml.vp.model.ontouml.model.GeneralizationSet; +import org.ontouml.vp.model.ontouml.serialization.GeneralizationSetViewSerializer; @JsonSerialize(using = GeneralizationSetViewSerializer.class) @JsonDeserialize(using = GeneralizationSetViewDeserializer.class) diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/GeneralizationView.java b/src/main/java/org/ontouml/vp/model/ontouml/view/GeneralizationView.java similarity index 69% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/GeneralizationView.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/GeneralizationView.java index 93332575..b678300f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/GeneralizationView.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/GeneralizationView.java @@ -1,11 +1,12 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.GeneralizationViewDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.GeneralizationViewSerializer; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.deserialization.GeneralizationViewDeserializer; +import org.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.serialization.GeneralizationViewSerializer; + import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/NodeView.java b/src/main/java/org/ontouml/vp/model/ontouml/view/NodeView.java similarity index 79% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/NodeView.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/NodeView.java index 895b39f9..2831c64e 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/NodeView.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/NodeView.java @@ -1,8 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; + +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; import java.util.Arrays; +import java.util.Collections; import java.util.List; public abstract class NodeView @@ -22,7 +24,7 @@ public NodeView() { @Override public List getContents() { - return Arrays.asList(shape); + return Collections.singletonList(shape); } public int getX() { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/PackageView.java b/src/main/java/org/ontouml/vp/model/ontouml/view/PackageView.java similarity index 69% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/PackageView.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/PackageView.java index 8ee1c77f..bb690b66 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/PackageView.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/PackageView.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.PackageViewDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.PackageViewSerializer; +import org.ontouml.vp.model.ontouml.deserialization.PackageViewDeserializer; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.serialization.PackageViewSerializer; @JsonSerialize(using = PackageViewSerializer.class) @JsonDeserialize(using = PackageViewDeserializer.class) diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Path.java b/src/main/java/org/ontouml/vp/model/ontouml/view/Path.java similarity index 81% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Path.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/Path.java index 359b1f1b..6dda4e6b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Path.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/Path.java @@ -1,10 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.PathDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.PathSerializer; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.deserialization.PathDeserializer; +import org.ontouml.vp.model.ontouml.serialization.PathSerializer; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Point.java b/src/main/java/org/ontouml/vp/model/ontouml/view/Point.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Point.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/Point.java index 64877b51..5aa1e187 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Point.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/Point.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; public class Point { int x; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Rectangle.java b/src/main/java/org/ontouml/vp/model/ontouml/view/Rectangle.java similarity index 68% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Rectangle.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/Rectangle.java index 0e293b36..352f8f63 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Rectangle.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/Rectangle.java @@ -1,10 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.RectangleDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.RectangleSerializer; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.deserialization.RectangleDeserializer; +import org.ontouml.vp.model.ontouml.serialization.RectangleSerializer; + import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/RectangularShape.java b/src/main/java/org/ontouml/vp/model/ontouml/view/RectangularShape.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/RectangularShape.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/RectangularShape.java index 115a0592..2fc363ba 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/RectangularShape.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/RectangularShape.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; public abstract class RectangularShape extends Shape { Point topLeft = new Point(0, 0); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/RelationView.java b/src/main/java/org/ontouml/vp/model/ontouml/view/RelationView.java similarity index 79% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/RelationView.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/RelationView.java index 2c95277b..0a9dfebb 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/RelationView.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/RelationView.java @@ -1,11 +1,12 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.RelationViewDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.RelationViewSerializer; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.deserialization.RelationViewDeserializer; +import org.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.serialization.RelationViewSerializer; + import java.util.List; @JsonSerialize(using = RelationViewSerializer.class) diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Shape.java b/src/main/java/org/ontouml/vp/model/ontouml/view/Shape.java similarity index 66% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Shape.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/Shape.java index ed4aa375..2b422148 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Shape.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/Shape.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; public abstract class Shape extends DiagramElement { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Text.java b/src/main/java/org/ontouml/vp/model/ontouml/view/Text.java similarity index 75% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Text.java rename to src/main/java/org/ontouml/vp/model/ontouml/view/Text.java index f4058c41..56a95ecd 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml/view/Text.java +++ b/src/main/java/org/ontouml/vp/model/ontouml/view/Text.java @@ -1,10 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml.view; +package org.ontouml.vp.model.ontouml.view; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.deserialization.TextDeserializer; -import it.unibz.inf.ontouml.vp.model.ontouml.serialization.TextSerializer; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.deserialization.TextDeserializer; +import org.ontouml.vp.model.ontouml.serialization.TextSerializer; + import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationClassLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationClassLoader.java similarity index 83% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationClassLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationClassLoader.java index ececd92c..be20fda9 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationClassLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationClassLoader.java @@ -1,28 +1,25 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.loadName; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.logElementCreation; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.IAssociationClass; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IProject; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.utils.StereotypesManager; public class IAssociationClassLoader { static IProject vpProject = ApplicationManager.instance().getProjectManager().getProject(); public static IAssociationClass importElement(Relation fromRelation) { - logElementCreation(fromRelation); + LoaderUtils.logElementCreation(fromRelation); IAssociationClass toRelation = getOrCreateAssociation(fromRelation); fromRelation.setId(toRelation.getId()); - loadName(fromRelation, toRelation); + LoaderUtils.loadName(fromRelation, toRelation); loadSource(fromRelation, toRelation); loadTarget(fromRelation, toRelation); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationClassUIModelLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationClassUIModelLoader.java similarity index 65% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationClassUIModelLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationClassUIModelLoader.java index 15feea6e..f0ec19b5 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationClassUIModelLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationClassUIModelLoader.java @@ -1,7 +1,6 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; +package org.ontouml.vp.model.ontouml2vp; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getIDiagramElement; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getIModelElement; +import static org.ontouml.vp.model.ontouml2vp.LoaderUtils.getIDiagramElement; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; @@ -9,7 +8,7 @@ import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.model.IAssociationClass; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RelationView; +import org.ontouml.vp.model.ontouml.view.RelationView; import java.awt.Point; public class IAssociationClassUIModelLoader { @@ -17,7 +16,7 @@ public class IAssociationClassUIModelLoader { static DiagramManager diagramManager = ApplicationManager.instance().getDiagramManager(); public static void load(IClassDiagramUIModel toDiagram, RelationView fromView) { - IModelElement toModelElement = getIModelElement(fromView); + IModelElement toModelElement = LoaderUtils.getIModelElement(fromView); if (!(toModelElement instanceof IAssociationClass)) { System.out.println( @@ -25,8 +24,8 @@ public static void load(IClassDiagramUIModel toDiagram, RelationView fromView) { return; } - IDiagramElement toSource = getIDiagramElement(toDiagram, fromView.getSource()); - IDiagramElement toTarget = getIDiagramElement(toDiagram, fromView.getTarget()); + IDiagramElement toSource = LoaderUtils.getIDiagramElement(toDiagram, fromView.getSource()); + IDiagramElement toTarget = LoaderUtils.getIDiagramElement(toDiagram, fromView.getTarget()); Point[] toPoints = IConnectorUIModelLoader.loadPoints(fromView); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationLoader.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationLoader.java index 98bba7d7..d7426f39 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationLoader.java @@ -1,27 +1,24 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.loadName; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.logElementCreation; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.*; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.utils.StereotypesManager; public class IAssociationLoader { static IProject vpProject = ApplicationManager.instance().getProjectManager().getProject(); public static IAssociation importElement(Relation fromRelation) { - logElementCreation(fromRelation); + LoaderUtils.logElementCreation(fromRelation); IAssociation toRelation = getOrCreateAssociation(fromRelation); fromRelation.setId(toRelation.getId()); - loadName(fromRelation, toRelation); + LoaderUtils.loadName(fromRelation, toRelation); loadSource(fromRelation, toRelation); loadTarget(fromRelation, toRelation); @@ -45,7 +42,7 @@ public static IAssociation importElement(Relation fromRelation) { } private static void loadEndProperties(Property fromProperty, IAssociationEnd toProperty) { - loadName(fromProperty, toProperty); + LoaderUtils.loadName(fromProperty, toProperty); IMultiplicity detail = toProperty.getMultiplicityDetail(); if (detail == null) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationUIModelLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationUIModelLoader.java similarity index 66% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationUIModelLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationUIModelLoader.java index 2cde8e44..dc2d65ed 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAssociationUIModelLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAssociationUIModelLoader.java @@ -1,7 +1,6 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; +package org.ontouml.vp.model.ontouml2vp; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getIDiagramElement; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getIModelElement; +import static org.ontouml.vp.model.ontouml2vp.LoaderUtils.getIDiagramElement; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; @@ -9,7 +8,7 @@ import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.model.IAssociation; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RelationView; +import org.ontouml.vp.model.ontouml.view.RelationView; import java.awt.*; public class IAssociationUIModelLoader { @@ -17,7 +16,7 @@ public class IAssociationUIModelLoader { static DiagramManager diagramManager = ApplicationManager.instance().getDiagramManager(); public static void load(IClassDiagramUIModel toDiagram, RelationView fromView) { - IModelElement toModelElement = getIModelElement(fromView); + IModelElement toModelElement = LoaderUtils.getIModelElement(fromView); if (!(toModelElement instanceof IAssociation)) { // && !(toModelElement instanceof IAssociationClass)) { @@ -26,8 +25,8 @@ public static void load(IClassDiagramUIModel toDiagram, RelationView fromView) { return; } - IDiagramElement toSource = getIDiagramElement(toDiagram, fromView.getSource()); - IDiagramElement toTarget = getIDiagramElement(toDiagram, fromView.getTarget()); + IDiagramElement toSource = LoaderUtils.getIDiagramElement(toDiagram, fromView.getSource()); + IDiagramElement toTarget = LoaderUtils.getIDiagramElement(toDiagram, fromView.getTarget()); Point[] toPoints = IConnectorUIModelLoader.loadPoints(fromView); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAttributeLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAttributeLoader.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAttributeLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IAttributeLoader.java index 41f0acd3..4f7afb8e 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IAttributeLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IAttributeLoader.java @@ -1,14 +1,12 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.*; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.*; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.model.AggregationKind; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.AggregationKind; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Property; import java.util.Optional; public class IAttributeLoader { @@ -16,7 +14,7 @@ public class IAttributeLoader { static IProject vpProject = ApplicationManager.instance().getProjectManager().getProject(); public static void importAttributes(Class fromClass) { - IClass toClass = getToClass(fromClass); + IClass toClass = LoaderUtils.getToClass(fromClass); if (toClass == null) return; @@ -24,7 +22,7 @@ public static void importAttributes(Class fromClass) { } private static void importAttribute(IClass toClass, Property fromAttribute) { - logElementCreation(fromAttribute); + LoaderUtils.logElementCreation(fromAttribute); IAttribute toAttribute = getOrCreateAttribute(toClass, fromAttribute); fromAttribute.setId(toAttribute.getId()); @@ -35,7 +33,7 @@ private static void importAttribute(IClass toClass, Property fromAttribute) { toAttribute.setMultiplicityDetail(detail); } - loadName(fromAttribute, toAttribute); + LoaderUtils.loadName(fromAttribute, toAttribute); boolean isDerived = fromAttribute.isDerived(); toAttribute.setDerived(isDerived); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IClassDiagramLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IClassDiagramLoader.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IClassDiagramLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IClassDiagramLoader.java index 94bed933..83ca9a49 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IClassDiagramLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IClassDiagramLoader.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; @@ -7,7 +7,7 @@ import com.vp.plugin.diagram.shape.IClassUIModel; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IProject; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Diagram; +import org.ontouml.vp.model.ontouml.view.Diagram; import java.util.stream.Stream; public class IClassDiagramLoader { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IClassLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IClassLoader.java similarity index 82% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IClassLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IClassLoader.java index 2ceb75cb..564fae76 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IClassLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IClassLoader.java @@ -1,13 +1,13 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; +package org.ontouml.vp.model.ontouml2vp; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.logElementCreation; -import static it.unibz.inf.ontouml.vp.model.uml.Class.*; +import static org.ontouml.vp.model.uml.Class.*; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.*; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.utils.StereotypesManager; + import java.util.stream.Collectors; public class IClassLoader { @@ -16,7 +16,7 @@ public class IClassLoader { public static IClass importElement(Class fromClass) { - logElementCreation(fromClass); + LoaderUtils.logElementCreation(fromClass); IClass toClass = getOrCreateClass(fromClass); fromClass.setId(toClass.getId()); @@ -33,7 +33,7 @@ public static IClass importElement(Class fromClass) { fromClass .isExtensional() .ifPresent( - aBoolean -> it.unibz.inf.ontouml.vp.model.uml.Class.isExtensional(toClass, aBoolean)); + aBoolean -> org.ontouml.vp.model.uml.Class.isExtensional(toClass, aBoolean)); fromClass.isPowertype().ifPresent(aBoolean -> setIsPowertype(toClass, aBoolean)); fromClass.getOrderAsString().ifPresent(aString -> setOrder(toClass, aString)); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IClassUIModelLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IClassUIModelLoader.java similarity index 79% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IClassUIModelLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IClassUIModelLoader.java index b36eaa15..a6d9bb09 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IClassUIModelLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IClassUIModelLoader.java @@ -1,20 +1,18 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getIModelElement; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; import com.vp.plugin.diagram.IClassDiagramUIModel; import com.vp.plugin.diagram.shape.IClassUIModel; import com.vp.plugin.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ClassView; +import org.ontouml.vp.model.ontouml.view.ClassView; public class IClassUIModelLoader { static DiagramManager diagramManager = ApplicationManager.instance().getDiagramManager(); public static void load(IClassDiagramUIModel toDiagram, ClassView fromView) { - IModelElement toModelElement = getIModelElement(fromView); + IModelElement toModelElement = LoaderUtils.getIModelElement(fromView); if (!(toModelElement instanceof IClass) && !(toModelElement instanceof IDataType)) { System.out.println( diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IConnectorUIModelLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IConnectorUIModelLoader.java similarity index 54% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IConnectorUIModelLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IConnectorUIModelLoader.java index 4bc3bf6e..36ab8973 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IConnectorUIModelLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IConnectorUIModelLoader.java @@ -1,13 +1,13 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; +package org.ontouml.vp.model.ontouml2vp; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ConnectorView; +import org.ontouml.vp.model.ontouml.view.ConnectorView; import java.awt.*; public class IConnectorUIModelLoader { public static Point[] loadPoints(ConnectorView fromView) { return fromView.getPath().getPoints().stream() - .map(p -> new Point((int) p.getX(), (int) p.getY())) + .map(p -> new Point(p.getX(), p.getY())) .toArray(Point[]::new); } } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IDataTypeLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IDataTypeLoader.java similarity index 83% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IDataTypeLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IDataTypeLoader.java index 83e4f587..ce931cf6 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IDataTypeLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IDataTypeLoader.java @@ -1,14 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.loadName; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.logElementCreation; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.IDataType; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IProject; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Class; import java.util.Optional; public class IDataTypeLoader { @@ -16,12 +13,12 @@ public class IDataTypeLoader { static IProject vpProject = ApplicationManager.instance().getProjectManager().getProject(); public static IDataType importElement(Class fromPrimitive) { - logElementCreation(fromPrimitive); + LoaderUtils.logElementCreation(fromPrimitive); IDataType toPrimitive = getOrCreateDataType(fromPrimitive); fromPrimitive.setId(toPrimitive.getId()); - loadName(fromPrimitive, toPrimitive); + LoaderUtils.loadName(fromPrimitive, toPrimitive); return toPrimitive; } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IEnumerationLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IEnumerationLoader.java similarity index 57% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IEnumerationLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IEnumerationLoader.java index 69582bcb..00876567 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IEnumerationLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IEnumerationLoader.java @@ -1,19 +1,16 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getToClass; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.loadName; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.model.IClass; import com.vp.plugin.model.IEnumerationLiteral; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Literal; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Literal; public class IEnumerationLoader { public static void importLiterals(Class fromClass) { if (!fromClass.isEnumeration()) return; - IClass toClass = getToClass(fromClass); + IClass toClass = LoaderUtils.getToClass(fromClass); if (toClass == null) return; @@ -22,7 +19,7 @@ public static void importLiterals(Class fromClass) { public static void importLiteral(IClass toClass, Literal fromLiteral) { IEnumerationLiteral toLiteral = toClass.createEnumerationLiteral(); - loadName(fromLiteral, toLiteral); + LoaderUtils.loadName(fromLiteral, toLiteral); ITaggedValueLoader.loadTaggedValues(fromLiteral, toLiteral); } } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationLoader.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationLoader.java index fc4fdb09..c0896b83 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationLoader.java @@ -1,14 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.loadName; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.logElementCreation; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.IGeneralization; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IProject; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.model.Generalization; public class IGeneralizationLoader { @@ -16,12 +13,12 @@ public class IGeneralizationLoader { public static IGeneralization importElement(Generalization fromGeneralization) { - logElementCreation(fromGeneralization); + LoaderUtils.logElementCreation(fromGeneralization); IGeneralization toGeneralization = getOrCreateGeneralization(fromGeneralization); fromGeneralization.setId(toGeneralization.getId()); - loadName(fromGeneralization, toGeneralization); + LoaderUtils.loadName(fromGeneralization, toGeneralization); loadGeneral(fromGeneralization, toGeneralization); loadSpecific(fromGeneralization, toGeneralization); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationSetLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationSetLoader.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationSetLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationSetLoader.java index 74b3e9a1..a12575b9 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationSetLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationSetLoader.java @@ -1,12 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.loadName; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.logElementCreation; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.*; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.model.GeneralizationSet; +import org.ontouml.vp.model.ontouml.model.GeneralizationSet; public class IGeneralizationSetLoader { @@ -14,12 +11,12 @@ public class IGeneralizationSetLoader { public static IGeneralizationSet importElement(GeneralizationSet fromGs) { - logElementCreation(fromGs); + LoaderUtils.logElementCreation(fromGs); IGeneralizationSet toGs = getOrCreateGeneralizationSet(fromGs); fromGs.setId(toGs.getId()); - loadName(fromGs, toGs); + LoaderUtils.loadName(fromGs, toGs); toGs.setCovering(fromGs.isComplete()); toGs.setDisjoint(fromGs.isDisjoint()); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationSetUIModelLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationSetUIModelLoader.java similarity index 68% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationSetUIModelLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationSetUIModelLoader.java index 6e0565d0..428525fc 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationSetUIModelLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationSetUIModelLoader.java @@ -1,6 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getIModelElement; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; @@ -8,14 +6,14 @@ import com.vp.plugin.diagram.shape.IGeneralizationSetUIModel; import com.vp.plugin.model.IGeneralizationSet; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationSetView; +import org.ontouml.vp.model.ontouml.view.GeneralizationSetView; public class IGeneralizationSetUIModelLoader { static DiagramManager diagramManager = ApplicationManager.instance().getDiagramManager(); public static void load(IClassDiagramUIModel toDiagram, GeneralizationSetView fromView) { - IModelElement toModelElement = getIModelElement(fromView); + IModelElement toModelElement = LoaderUtils.getIModelElement(fromView); if (!(toModelElement instanceof IGeneralizationSet)) { System.out.println( @@ -31,9 +29,9 @@ public static void load(IClassDiagramUIModel toDiagram, GeneralizationSetView fr toView.setNotation(2); toView.resetCaption(); - toView.setX((int) fromView.getX()); - toView.setY((int) fromView.getY()); - toView.setWidth((int) fromView.getWidth()); - toView.setHeight((int) fromView.getHeight()); + toView.setX(fromView.getX()); + toView.setY(fromView.getY()); + toView.setWidth(fromView.getWidth()); + toView.setHeight(fromView.getHeight()); } } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationUIModelLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationUIModelLoader.java similarity index 68% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationUIModelLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationUIModelLoader.java index 00e9c7c0..305f7d8b 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IGeneralizationUIModelLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IGeneralizationUIModelLoader.java @@ -1,7 +1,6 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; +package org.ontouml.vp.model.ontouml2vp; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getIDiagramElement; -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getIModelElement; +import static org.ontouml.vp.model.ontouml2vp.LoaderUtils.getIDiagramElement; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; @@ -10,7 +9,7 @@ import com.vp.plugin.diagram.shape.IClassUIModel; import com.vp.plugin.model.IGeneralization; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationView; +import org.ontouml.vp.model.ontouml.view.GeneralizationView; import java.awt.*; public class IGeneralizationUIModelLoader { @@ -18,7 +17,7 @@ public class IGeneralizationUIModelLoader { static DiagramManager diagramManager = ApplicationManager.instance().getDiagramManager(); public static void load(IClassDiagramUIModel toDiagram, GeneralizationView fromView) { - IModelElement toModelElement = getIModelElement(fromView); + IModelElement toModelElement = LoaderUtils.getIModelElement(fromView); if (!(toModelElement instanceof IGeneralization)) { System.out.println( @@ -27,9 +26,9 @@ public static void load(IClassDiagramUIModel toDiagram, GeneralizationView fromV } IClassUIModel vpSource = - getIDiagramElement(toDiagram, fromView.getSource(), IClassUIModel.class); + LoaderUtils.getIDiagramElement(toDiagram, fromView.getSource(), IClassUIModel.class); IClassUIModel vpTarget = - getIDiagramElement(toDiagram, fromView.getTarget(), IClassUIModel.class); + LoaderUtils.getIDiagramElement(toDiagram, fromView.getTarget(), IClassUIModel.class); Point[] points = IConnectorUIModelLoader.loadPoints(fromView); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IPackageLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IPackageLoader.java similarity index 83% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IPackageLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IPackageLoader.java index a3ee0a41..eb3d7d38 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IPackageLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IPackageLoader.java @@ -1,20 +1,18 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.logElementCreation; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.IHasChildrenBaseModelElement; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IProject; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.model.Package; public class IPackageLoader { static IProject vpProject = ApplicationManager.instance().getProjectManager().getProject(); public static IHasChildrenBaseModelElement importElement(Package fromPackage) { - logElementCreation(fromPackage); + LoaderUtils.logElementCreation(fromPackage); IHasChildrenBaseModelElement toPackage = getOrCreatePackage(fromPackage); fromPackage.setId(toPackage.getId()); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IPackageUIModelLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IPackageUIModelLoader.java similarity index 78% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IPackageUIModelLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IPackageUIModelLoader.java index 3d97f52f..51e74fd1 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IPackageUIModelLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IPackageUIModelLoader.java @@ -1,20 +1,18 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.getIModelElement; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; import com.vp.plugin.diagram.IClassDiagramUIModel; import com.vp.plugin.diagram.IShapeUIModel; import com.vp.plugin.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.view.PackageView; +import org.ontouml.vp.model.ontouml.view.PackageView; public class IPackageUIModelLoader { static DiagramManager diagramManager = ApplicationManager.instance().getDiagramManager(); public static void load(IClassDiagramUIModel toDiagram, PackageView fromView) { - IModelElement toModelElement = getIModelElement(fromView); + IModelElement toModelElement = LoaderUtils.getIModelElement(fromView); if (!(toModelElement instanceof IPackage) && !(toModelElement instanceof IModel)) { System.out.println( diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IProjectLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/IProjectLoader.java similarity index 89% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IProjectLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/IProjectLoader.java index 8009b6a2..f971df0c 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/IProjectLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/IProjectLoader.java @@ -1,14 +1,12 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; - -import static it.unibz.inf.ontouml.vp.model.ontouml2vp.LoaderUtils.loadName; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IProject; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.Package; public class IProjectLoader { @@ -103,6 +101,6 @@ private static void transferContainerAndName(ModelElement fromElement) { } }); - loadName(fromElement, toElement); + LoaderUtils.loadName(fromElement, toElement); } } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/ITaggedValueLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/ITaggedValueLoader.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/ITaggedValueLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/ITaggedValueLoader.java index e7c84275..9cf27fd7 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/ITaggedValueLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/ITaggedValueLoader.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.ITaggedValue; import com.vp.plugin.model.ITaggedValueContainer; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.ModelElement; public class ITaggedValueLoader { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/LoaderUtils.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/LoaderUtils.java similarity index 87% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/LoaderUtils.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/LoaderUtils.java index 928b9b08..d706d919 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/LoaderUtils.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/LoaderUtils.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; +package org.ontouml.vp.model.ontouml2vp; import com.vp.plugin.ApplicationManager; import com.vp.plugin.diagram.IClassDiagramUIModel; @@ -8,10 +8,10 @@ import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IProject; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ElementView; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.view.ElementView; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -73,7 +73,7 @@ static List getAllDatatypes() { } static IClass getToClass(Class fromClass) { - IModelElement toClass = IAttributeLoader.vpProject.getModelElementById(fromClass.getId()); + IModelElement toClass = org.ontouml.vp.model.ontouml2vp.IAttributeLoader.vpProject.getModelElementById(fromClass.getId()); if (toClass instanceof IClass) return (IClass) toClass; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/Ontouml2UmlLoader.java b/src/main/java/org/ontouml/vp/model/ontouml2vp/Ontouml2UmlLoader.java similarity index 89% rename from src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/Ontouml2UmlLoader.java rename to src/main/java/org/ontouml/vp/model/ontouml2vp/Ontouml2UmlLoader.java index b7f9573b..cb66bc6f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/ontouml2vp/Ontouml2UmlLoader.java +++ b/src/main/java/org/ontouml/vp/model/ontouml2vp/Ontouml2UmlLoader.java @@ -1,8 +1,8 @@ -package it.unibz.inf.ontouml.vp.model.ontouml2vp; +package org.ontouml.vp.model.ontouml2vp; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.Project; import java.io.IOException; public class Ontouml2UmlLoader { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Association.java b/src/main/java/org/ontouml/vp/model/uml/Association.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/Association.java rename to src/main/java/org/ontouml/vp/model/uml/Association.java index c6bd570b..ac1536c7 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Association.java +++ b/src/main/java/org/ontouml/vp/model/uml/Association.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; @@ -8,7 +8,8 @@ import com.vp.plugin.model.IAssociation; import com.vp.plugin.model.IAssociationEnd; import com.vp.plugin.model.IClass; -import it.unibz.inf.ontouml.vp.utils.Stereotype; +import org.ontouml.vp.utils.Stereotype; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -174,9 +175,7 @@ public void addStereotype(String name) { public void removeStereotype(String name) { - if (this.stereotypes.contains(name)) { - this.stereotypes.remove(name); - } + this.stereotypes.remove(name); } public List getProperties() { @@ -201,9 +200,7 @@ public void addProperty(Property property) { public void removeProperty(Property property) { - if (this.properties.contains(property)) { - this.properties.remove(property); - } + this.properties.remove(property); } public boolean isAbstract() { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/AssociationClass.java b/src/main/java/org/ontouml/vp/model/uml/AssociationClass.java similarity index 93% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/AssociationClass.java rename to src/main/java/org/ontouml/vp/model/uml/AssociationClass.java index c72f5bab..d8a7a56f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/AssociationClass.java +++ b/src/main/java/org/ontouml/vp/model/uml/AssociationClass.java @@ -1,10 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.vp.plugin.model.IAssociationClass; -import it.unibz.inf.ontouml.vp.utils.Stereotype; +import org.ontouml.vp.utils.Stereotype; + import java.util.ArrayList; import java.util.List; @@ -131,7 +132,7 @@ public void addStereotype(String name) { public void removeStereotype(String name) { - if (this.stereotypes.contains(name)) this.stereotypes.remove(name); + this.stereotypes.remove(name); } public List getProperties() { @@ -154,7 +155,7 @@ public void addProperty(Property property) { public void removeProperty(Property property) { - if (this.properties.contains(property)) this.properties.remove(property); + this.properties.remove(property); } public boolean isAbstract() { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/AssociationModelDescription.java b/src/main/java/org/ontouml/vp/model/uml/AssociationModelDescription.java similarity index 99% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/AssociationModelDescription.java rename to src/main/java/org/ontouml/vp/model/uml/AssociationModelDescription.java index 245870f9..44f4218c 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/AssociationModelDescription.java +++ b/src/main/java/org/ontouml/vp/model/uml/AssociationModelDescription.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Class.java b/src/main/java/org/ontouml/vp/model/uml/Class.java similarity index 99% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/Class.java rename to src/main/java/org/ontouml/vp/model/uml/Class.java index 83182e0c..e99b5566 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Class.java +++ b/src/main/java/org/ontouml/vp/model/uml/Class.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -7,9 +7,10 @@ import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.vp.plugin.model.*; -import it.unibz.inf.ontouml.vp.utils.RestrictedTo; -import it.unibz.inf.ontouml.vp.utils.Stereotype; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.utils.RestrictedTo; +import org.ontouml.vp.utils.Stereotype; +import org.ontouml.vp.utils.StereotypesManager; + import java.util.*; import java.util.function.Consumer; import java.util.function.Function; @@ -277,7 +278,6 @@ public String getDescription() { public void setDescription(String description) { this.description = ModelElement.safeGetString(description); - ; } public Set getProperties() { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Diagram.java b/src/main/java/org/ontouml/vp/model/uml/Diagram.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/Diagram.java rename to src/main/java/org/ontouml/vp/model/uml/Diagram.java index 4ce3a89b..9b2e837c 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Diagram.java +++ b/src/main/java/org/ontouml/vp/model/uml/Diagram.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/DiagramComment.java b/src/main/java/org/ontouml/vp/model/uml/DiagramComment.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/DiagramComment.java rename to src/main/java/org/ontouml/vp/model/uml/DiagramComment.java index f62f6074..2206ce45 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/DiagramComment.java +++ b/src/main/java/org/ontouml/vp/model/uml/DiagramComment.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.vp.plugin.diagram.IDiagramUIModelComment; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Generalization.java b/src/main/java/org/ontouml/vp/model/uml/Generalization.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/Generalization.java rename to src/main/java/org/ontouml/vp/model/uml/Generalization.java index 22954d0e..fbbf1e6c 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Generalization.java +++ b/src/main/java/org/ontouml/vp/model/uml/Generalization.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; @@ -89,7 +89,6 @@ public String getDescription() { public void setDescription(String description) { this.description = ModelElement.safeGetString(description); - ; } public JsonObject getPropertyAssignments() { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/GeneralizationSet.java b/src/main/java/org/ontouml/vp/model/uml/GeneralizationSet.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/GeneralizationSet.java rename to src/main/java/org/ontouml/vp/model/uml/GeneralizationSet.java index 471a7ec8..b6646a8f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/GeneralizationSet.java +++ b/src/main/java/org/ontouml/vp/model/uml/GeneralizationSet.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; @@ -129,7 +129,6 @@ public String getDescription() { public void setDescription(String description) { this.description = ModelElement.safeGetString(description); - ; } public JsonObject getPropertyAssignments() { @@ -179,7 +178,7 @@ public void addGeneralization(Reference ref) { } public void removeGeneralization(Reference ref) { - if (this.generalizations != null && this.generalizations.contains(ref)) + if (this.generalizations != null) this.generalizations.remove(ref); } } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Literal.java b/src/main/java/org/ontouml/vp/model/uml/Literal.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/Literal.java rename to src/main/java/org/ontouml/vp/model/uml/Literal.java index 649901b2..32085a5a 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Literal.java +++ b/src/main/java/org/ontouml/vp/model/uml/Literal.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; @@ -67,7 +67,6 @@ public String getDescription() { public void setDescription(String description) { this.description = ModelElement.safeGetString(description); - ; } public JsonObject getPropertyAssignments() { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Model.java b/src/main/java/org/ontouml/vp/model/uml/Model.java similarity index 99% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/Model.java rename to src/main/java/org/ontouml/vp/model/uml/Model.java index 752bc5b7..e6e5eaa7 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Model.java +++ b/src/main/java/org/ontouml/vp/model/uml/Model.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/ModelElement.java b/src/main/java/org/ontouml/vp/model/uml/ModelElement.java similarity index 87% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/ModelElement.java rename to src/main/java/org/ontouml/vp/model/uml/ModelElement.java index 9e6736d6..e7faa6e3 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/ModelElement.java +++ b/src/main/java/org/ontouml/vp/model/uml/ModelElement.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; @@ -9,7 +9,8 @@ import com.vp.plugin.diagram.IDiagramUIModel; import com.vp.plugin.model.*; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.utils.StereotypesManager; + import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -26,14 +27,14 @@ */ public interface ModelElement { - public static final String TYPE_PACKAGE = "Package"; - public static final String TYPE_CLASS = "Class"; - public static final String TYPE_RELATION = "Relation"; - public static final String TYPE_ASSOCIATION_CLASS = "Relation"; - public static final String TYPE_GENERALIZATION = "Generalization"; - public static final String TYPE_GENERALIZATION_SET = "GeneralizationSet"; - public static final String TYPE_PROPERTY = "Property"; - public static final String TYPE_LITERAL = "Literal"; + String TYPE_PACKAGE = "Package"; + String TYPE_CLASS = "Class"; + String TYPE_RELATION = "Relation"; + String TYPE_ASSOCIATION_CLASS = "Relation"; + String TYPE_GENERALIZATION = "Generalization"; + String TYPE_GENERALIZATION_SET = "GeneralizationSet"; + String TYPE_PROPERTY = "Property"; + String TYPE_LITERAL = "Literal"; static String getUniqueStereotypeName(IModelElement element) { return element.stereotypeCount() == 1 ? element.toStereotypeModelArray()[0].getName() : null; @@ -65,13 +66,13 @@ static boolean isPresentInOntoumlDiagram(IModelElement element) { } /** @return IModelElement on which the object is based. */ - public IModelElement getSourceModelElement(); + IModelElement getSourceModelElement(); /** @return object's type in OntoUML Schema. */ - public String getOntoUMLType(); + String getOntoUMLType(); /** @return object's ID (based on a IModelElement). */ - public String getId(); + String getId(); /** * Returns Visual Paradigm's link to the related model element. This method removes the project's @@ -81,7 +82,7 @@ static boolean isPresentInOntoumlDiagram(IModelElement element) { * @return a link identify a IModelElement in Visual Paradigm following the pattern * "vpp://modelelement/Cd.WKPaAUB22rwx4". */ - public static String getModelElementURI(IModelElement modelElement) { + static String getModelElementURI(IModelElement modelElement) { if (modelElement == null) return null; final String link = @@ -96,7 +97,7 @@ public static String getModelElementURI(IModelElement modelElement) { * @param pretty - true if return string should be indented. * @return serialized version JSON of whole project in OntoUML Schema. */ - public static String generateModel(boolean pretty) { + static String generateModel(boolean pretty) { final Model model = new Model(); if (pretty) { @@ -115,7 +116,7 @@ public static String generateModel(boolean pretty) { } } - public static String generateModel(HashSet elements, boolean pretty) { + static String generateModel(HashSet elements, boolean pretty) { final Model model = new Model(elements); if (pretty) { @@ -134,12 +135,12 @@ public static String generateModel(HashSet elements, boolean pretty) { } } - public static String safeGetString(String s) { + static String safeGetString(String s) { if (s != null && s.length() != 0) return s; return null; } - public static String toOntoUMLSchemaType(IModelElement element) { + static String toOntoUMLSchemaType(IModelElement element) { switch (element.getModelType()) { case IModelElementFactory.MODEL_TYPE_MODEL: case IModelElementFactory.MODEL_TYPE_PACKAGE: @@ -164,7 +165,7 @@ public static String toOntoUMLSchemaType(IModelElement element) { return null; } - public static JsonObject transformPropertyAssignments(IModelElement sourceElement) { + static JsonObject transformPropertyAssignments(IModelElement sourceElement) { ITaggedValueContainer lContainer = sourceElement.getTaggedValues(); if (lContainer == null) return null; @@ -207,7 +208,7 @@ public static JsonObject transformPropertyAssignments(IModelElement sourceElemen Boolean.parseBoolean((String) lTaggedValues[i].getValue())); break; default: - obj.addProperty(lTaggedValues[i].getName(), (String) lTaggedValues[i].getValueAsString()); + obj.addProperty(lTaggedValues[i].getName(), lTaggedValues[i].getValueAsString()); } } @@ -216,7 +217,7 @@ public static JsonObject transformPropertyAssignments(IModelElement sourceElemen return obj; } - public static boolean isAbstract(IModelElement element) { + static boolean isAbstract(IModelElement element) { final String elementType = element.getModelType(); switch (elementType) { @@ -232,7 +233,7 @@ public static boolean isAbstract(IModelElement element) { } } - public static void setAbstract(IModelElement element, boolean isAbstract) { + static void setAbstract(IModelElement element, boolean isAbstract) { final String elementType = element.getModelType(); switch (elementType) { @@ -250,7 +251,7 @@ public static void setAbstract(IModelElement element, boolean isAbstract) { } } - public static boolean isDerived(IModelElement element) { + static boolean isDerived(IModelElement element) { final String elementType = element.getModelType(); switch (elementType) { @@ -272,7 +273,7 @@ public static boolean isDerived(IModelElement element) { } } - public static void setDerived(IModelElement element, boolean isDerived) { + static void setDerived(IModelElement element, boolean isDerived) { final String elementType = element.getModelType(); switch (elementType) { @@ -306,7 +307,7 @@ public static void setDerived(IModelElement element, boolean isDerived) { } } - public static boolean isOrdered(IModelElement element) { + static boolean isOrdered(IModelElement element) { final String elementType = element.getModelType(); switch (elementType) { @@ -314,7 +315,7 @@ public static boolean isOrdered(IModelElement element) { { final IAssociationEnd associationEnd = (IAssociationEnd) element; final IMultiplicity multiplicity = associationEnd.getMultiplicityDetail(); - return multiplicity != null ? multiplicity.isOrdered() : false; + return multiplicity != null && multiplicity.isOrdered(); } case IModelElementFactory.MODEL_TYPE_ATTRIBUTE: @@ -330,7 +331,7 @@ public static boolean isOrdered(IModelElement element) { } } - public static void setOrdered(IModelElement element, boolean isOrdered) { + static void setOrdered(IModelElement element, boolean isOrdered) { final String elementType = element.getModelType(); IMultiplicity multiplicity = null; @@ -367,7 +368,7 @@ public static void setOrdered(IModelElement element, boolean isOrdered) { multiplicity.setOrdered(isOrdered); } - public static boolean isReadOnly(IModelElement element) { + static boolean isReadOnly(IModelElement element) { final String elementType = element.getModelType(); switch (elementType) { @@ -387,7 +388,7 @@ public static boolean isReadOnly(IModelElement element) { } } - public static void setReadOnly(IModelElement element, boolean isReadOnly) { + static void setReadOnly(IModelElement element, boolean isReadOnly) { final String elementType = element.getModelType(); switch (elementType) { @@ -430,7 +431,6 @@ static void forEachSelectedElement( Arrays.stream(selectedDiagramElements) .map(IDiagramElement::getModelElement) .forEach((Consumer) consumer); - ; } static boolean isOntoumlElement(Object object) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Package.java b/src/main/java/org/ontouml/vp/model/uml/Package.java similarity index 99% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/Package.java rename to src/main/java/org/ontouml/vp/model/uml/Package.java index e1b1fb04..f53cc102 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Package.java +++ b/src/main/java/org/ontouml/vp/model/uml/Package.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; @@ -120,7 +120,6 @@ public String getDescription() { public void setDescription(String description) { this.description = ModelElement.safeGetString(description); - ; } public JsonObject getPropertyAssignments() { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Property.java b/src/main/java/org/ontouml/vp/model/uml/Property.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/Property.java rename to src/main/java/org/ontouml/vp/model/uml/Property.java index ebb5f770..ac1a480f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Property.java +++ b/src/main/java/org/ontouml/vp/model/uml/Property.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; @@ -260,7 +260,6 @@ public String getDescription() { public void setDescription(String description) { this.description = ModelElement.safeGetString(description); - ; } public Reference getPropertyType() { @@ -456,7 +455,7 @@ public static void addRedefinedProperties( Stream.of(redefinedProperties) .filter(prop -> prop instanceof IAssociationEnd || prop instanceof IAttribute) - .forEach(prop -> associationEnd.addRedefinedProperty((IAssociationEnd) prop)); + .forEach(prop -> associationEnd.addRedefinedProperty(prop)); } public static void addSubsettedProperties( @@ -466,6 +465,6 @@ public static void addSubsettedProperties( Stream.of(subsettedProperties) .filter(prop -> prop instanceof IAssociationEnd || prop instanceof IAttribute) - .forEach(prop -> associationEnd.addSubsettedProperty((IAssociationEnd) prop)); + .forEach(prop -> associationEnd.addSubsettedProperty(prop)); } } diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/PropertyDescription.java b/src/main/java/org/ontouml/vp/model/uml/PropertyDescription.java similarity index 96% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/PropertyDescription.java rename to src/main/java/org/ontouml/vp/model/uml/PropertyDescription.java index b62816e5..2a8086b6 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/PropertyDescription.java +++ b/src/main/java/org/ontouml/vp/model/uml/PropertyDescription.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.vp.plugin.model.IAssociationEnd; import com.vp.plugin.model.IModelElement; @@ -7,7 +7,7 @@ public class PropertyDescription { - private IAssociationEnd associationEnd; + private final IAssociationEnd associationEnd; final boolean isDerived; // must invert final boolean isReadOnly; // must invert final String aggregationKind; // must invert diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Reference.java b/src/main/java/org/ontouml/vp/model/uml/Reference.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/model/uml/Reference.java rename to src/main/java/org/ontouml/vp/model/uml/Reference.java index 25eb1d9e..61805dee 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/uml/Reference.java +++ b/src/main/java/org/ontouml/vp/model/uml/Reference.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.uml; +package org.ontouml.vp.model.uml; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAdapter.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAdapter.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAdapter.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IAdapter.java index 6f81ffe1..58646394 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAdapter.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAdapter.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.ITaggedValue; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationClassTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationClassTransformer.java similarity index 78% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationClassTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationClassTransformer.java index 413cb243..56ac93a8 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationClassTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationClassTransformer.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IAssociationClass; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.Relation; public class IAssociationClassTransformer { public static ModelElement transform(IModelElement sourceElement) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationClassUIModelTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationClassUIModelTransformer.java similarity index 77% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationClassUIModelTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationClassUIModelTransformer.java index 3d50d6aa..1b3ca957 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationClassUIModelTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationClassUIModelTransformer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.connector.IAssociationClassUIModel; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RelationView; +import org.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.view.RelationView; public class IAssociationClassUIModelTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationTransformer.java similarity index 86% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationTransformer.java index b636be66..eb5811f1 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationTransformer.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IAssociation; import com.vp.plugin.model.IAssociationEnd; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.Relation; import java.util.List; public class IAssociationTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationUIModelTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationUIModelTransformer.java similarity index 79% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationUIModelTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationUIModelTransformer.java index edbf92bc..23429eb4 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IAssociationUIModelTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IAssociationUIModelTransformer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.connector.IAssociationUIModel; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RelationView; +import org.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.view.RelationView; public class IAssociationUIModelTransformer { public static RelationView transform(IDiagramElement sourceElement) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassAdapter.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IClassAdapter.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassAdapter.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IClassAdapter.java index 15a53065..4c0cb770 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassAdapter.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IClassAdapter.java @@ -1,13 +1,13 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.utils.StereotypesManager; public class IClassAdapter implements IAdapter { - private IClass clazz; - private IDataType datatype; + private final IClass clazz; + private final IDataType datatype; public IClassAdapter(IModelElement element) { if (element instanceof IClass) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassDiagramTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IClassDiagramTransformer.java similarity index 89% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassDiagramTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IClassDiagramTransformer.java index b8b9cf3a..5e512faf 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassDiagramTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IClassDiagramTransformer.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IClassDiagramUIModel; import com.vp.plugin.diagram.IDiagramElement; @@ -11,10 +11,10 @@ import com.vp.plugin.diagram.shape.IModelUIModel; import com.vp.plugin.diagram.shape.IPackageUIModel; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Diagram; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ElementView; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.view.Diagram; +import org.ontouml.vp.model.ontouml.view.ElementView; import java.util.Arrays; public class IClassDiagramTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IClassTransformer.java similarity index 90% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IClassTransformer.java index 218fdcaa..3229ec14 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IClassTransformer.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IClass; import com.vp.plugin.model.IDataType; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Literal; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Literal; +import org.ontouml.vp.model.ontouml.model.Property; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassUIModelTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IClassUIModelTransformer.java similarity index 75% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassUIModelTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IClassUIModelTransformer.java index 4ae8905d..158f5c63 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IClassUIModelTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IClassUIModelTransformer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.shape.IClassUIModel; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ClassView; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.view.ClassView; public class IClassUIModelTransformer { public static ClassView transform(IDiagramElement sourceElement) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IConnectorTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IConnectorTransformer.java similarity index 83% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IConnectorTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IConnectorTransformer.java index 33201f1d..70f79b49 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IConnectorTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IConnectorTransformer.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IConnectorUIModel; import com.vp.plugin.diagram.IDiagramElement; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ConnectorView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ElementView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Path; +import org.ontouml.vp.model.ontouml.view.ConnectorView; +import org.ontouml.vp.model.ontouml.view.ElementView; +import org.ontouml.vp.model.ontouml.view.Path; import java.util.Arrays; public class IConnectorTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IDiagramElementTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IDiagramElementTransformer.java similarity index 75% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IDiagramElementTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IDiagramElementTransformer.java index 906b4bf5..3cfbd702 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IDiagramElementTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IDiagramElementTransformer.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ElementView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Shape; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.view.ElementView; +import org.ontouml.vp.model.ontouml.view.Shape; public class IDiagramElementTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IEnumerationLiteralTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IEnumerationLiteralTransformer.java similarity index 77% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IEnumerationLiteralTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IEnumerationLiteralTransformer.java index 1da3e85a..bbc5c1e2 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IEnumerationLiteralTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IEnumerationLiteralTransformer.java @@ -1,7 +1,7 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IEnumerationLiteral; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Literal; +import org.ontouml.vp.model.ontouml.model.Literal; public class IEnumerationLiteralTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationSetTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationSetTransformer.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationSetTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationSetTransformer.java index e99f0016..908354a1 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationSetTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationSetTransformer.java @@ -1,13 +1,13 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IClass; import com.vp.plugin.model.IGeneralization; import com.vp.plugin.model.IGeneralizationSet; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; -import it.unibz.inf.ontouml.vp.model.ontouml.model.GeneralizationSet; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.model.GeneralizationSet; +import org.ontouml.vp.model.ontouml.model.ModelElement; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationSetUIModelTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationSetUIModelTransformer.java similarity index 76% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationSetUIModelTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationSetUIModelTransformer.java index 014474f7..1bed3f09 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationSetUIModelTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationSetUIModelTransformer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.shape.IGeneralizationSetUIModel; -import it.unibz.inf.ontouml.vp.model.ontouml.model.GeneralizationSet; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationSetView; +import org.ontouml.vp.model.ontouml.model.GeneralizationSet; +import org.ontouml.vp.model.ontouml.view.GeneralizationSetView; public class IGeneralizationSetUIModelTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationTransformer.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationTransformer.java index fbaabb9e..335808e6 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationTransformer.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IGeneralization; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Generalization; public class IGeneralizationTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationUIModelTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationUIModelTransformer.java similarity index 76% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationUIModelTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationUIModelTransformer.java index 666d0d62..502d7f93 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IGeneralizationUIModelTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IGeneralizationUIModelTransformer.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.connector.IGeneralizationUIModel; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationView; +import org.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.view.GeneralizationView; public class IGeneralizationUIModelTransformer { public static GeneralizationView transform(IDiagramElement sourceElement) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IModelElementTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IModelElementTransformer.java similarity index 80% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IModelElementTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IModelElementTransformer.java index 0b799788..4fc7e560 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IModelElementTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IModelElementTransformer.java @@ -1,7 +1,7 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.Element; +import org.ontouml.vp.model.ontouml.Element; public class IModelElementTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPackageTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IPackageTransformer.java similarity index 74% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPackageTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IPackageTransformer.java index ba883f5b..60354e08 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPackageTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IPackageTransformer.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IModel; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IPackage; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.Package; public class IPackageTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPackageUIModelTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IPackageUIModelTransformer.java similarity index 80% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPackageUIModelTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IPackageUIModelTransformer.java index 1dc645c0..0053425f 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPackageUIModelTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IPackageUIModelTransformer.java @@ -1,11 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.shape.IBasePackageUIModel; import com.vp.plugin.diagram.shape.IModelUIModel; import com.vp.plugin.diagram.shape.IPackageUIModel; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.view.PackageView; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.view.PackageView; public class IPackageUIModelTransformer { public static PackageView transform(IDiagramElement sourceElement) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IProjectTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IProjectTransformer.java similarity index 93% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IProjectTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IProjectTransformer.java index b861a9e3..eaa23b54 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IProjectTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IProjectTransformer.java @@ -1,15 +1,15 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; -import static it.unibz.inf.ontouml.vp.model.ontouml.deserialization.ReferenceResolver.resolveReferences; +import static org.ontouml.vp.model.ontouml.deserialization.ReferenceResolver.resolveReferences; import com.vp.plugin.diagram.IClassDiagramUIModel; import com.vp.plugin.model.*; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Diagram; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.view.Diagram; import java.util.Arrays; import java.util.List; import java.util.Objects; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPropertyAdapter.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IPropertyAdapter.java similarity index 96% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPropertyAdapter.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IPropertyAdapter.java index 45e98e13..4c703047 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPropertyAdapter.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IPropertyAdapter.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IAssociationEnd; import com.vp.plugin.model.IAttribute; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IMultiplicity; -import it.unibz.inf.ontouml.vp.model.ontouml.model.AggregationKind; +import org.ontouml.vp.model.ontouml.model.AggregationKind; import java.util.Iterator; public class IPropertyAdapter implements IAdapter { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPropertyTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IPropertyTransformer.java similarity index 91% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPropertyTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IPropertyTransformer.java index 0623633d..5e0e0235 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IPropertyTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IPropertyTransformer.java @@ -1,12 +1,12 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IAssociationEnd; import com.vp.plugin.model.IAttribute; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; -import it.unibz.inf.ontouml.vp.model.ontouml.model.AggregationKind; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.model.AggregationKind; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Property; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IShapeTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IShapeTransformer.java similarity index 76% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IShapeTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IShapeTransformer.java index abdb89ec..b1b16ae7 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IShapeTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IShapeTransformer.java @@ -1,7 +1,7 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IShapeUIModel; -import it.unibz.inf.ontouml.vp.model.ontouml.view.NodeView; +import org.ontouml.vp.model.ontouml.view.NodeView; public class IShapeTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IStereotypeTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/IStereotypeTransformer.java similarity index 94% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IStereotypeTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/IStereotypeTransformer.java index dcb3cf45..f7af8fd1 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/IStereotypeTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/IStereotypeTransformer.java @@ -1,7 +1,7 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Decoratable; +import org.ontouml.vp.model.ontouml.model.Decoratable; public class IStereotypeTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/ITaggedValueTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/ITaggedValueTransformer.java similarity index 93% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/ITaggedValueTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/ITaggedValueTransformer.java index 45662dc4..cbf94b38 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/ITaggedValueTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/ITaggedValueTransformer.java @@ -1,10 +1,11 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.ITaggedValue; import com.vp.plugin.model.ITaggedValueContainer; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ModelElement; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.model.ontouml.model.ModelElement; +import org.ontouml.vp.utils.StereotypesManager; + import java.util.AbstractMap; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/ReferenceTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/ReferenceTransformer.java similarity index 86% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/ReferenceTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/ReferenceTransformer.java index cfeec819..bc98cccd 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/ReferenceTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/ReferenceTransformer.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.connector.IAssociationClassUIModel; @@ -9,10 +9,12 @@ import com.vp.plugin.diagram.shape.IModelUIModel; import com.vp.plugin.diagram.shape.IPackageUIModel; import com.vp.plugin.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; -import it.unibz.inf.ontouml.vp.model.ontouml.view.*; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.view.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.view.*; public class ReferenceTransformer { public static ModelElement transformStub(IModelElement source) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/Trace.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/Trace.java similarity index 94% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/Trace.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/Trace.java index 42cf1aa8..813ce485 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/Trace.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/Trace.java @@ -1,7 +1,7 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.OntoumlElement; import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/Uml2OntoumlTransformer.java b/src/main/java/org/ontouml/vp/model/vp2ontouml/Uml2OntoumlTransformer.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/Uml2OntoumlTransformer.java rename to src/main/java/org/ontouml/vp/model/vp2ontouml/Uml2OntoumlTransformer.java index 9c2586fb..3472e919 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/model/vp2ontouml/Uml2OntoumlTransformer.java +++ b/src/main/java/org/ontouml/vp/model/vp2ontouml/Uml2OntoumlTransformer.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.model.vp2ontouml; +package org.ontouml.vp.model.vp2ontouml; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.Project; import java.io.IOException; public class Uml2OntoumlTransformer { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/GufoExportController.java b/src/main/java/org/ontouml/vp/services/gufo/GufoExportController.java similarity index 90% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/GufoExportController.java rename to src/main/java/org/ontouml/vp/services/gufo/GufoExportController.java index e7b07d4e..4f0acbcc 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/GufoExportController.java +++ b/src/main/java/org/ontouml/vp/services/gufo/GufoExportController.java @@ -1,15 +1,17 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.services.gufo; import com.vp.plugin.ApplicationManager; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPActionController; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.GufoExportOptions; -import it.unibz.inf.ontouml.vp.model.GufoTransformationServiceResult; -import it.unibz.inf.ontouml.vp.model.ProjectConfigurations; -import it.unibz.inf.ontouml.vp.model.vp2ontouml.Uml2OntoumlTransformer; -import it.unibz.inf.ontouml.vp.utils.SimpleServiceWorker; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; + +import org.ontouml.vp.controllers.OntoUMLServerAccessController; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.GufoExportOptions; +import org.ontouml.vp.model.GufoTransformationServiceResult; +import org.ontouml.vp.model.ProjectConfigurations; +import org.ontouml.vp.model.vp2ontouml.Uml2OntoumlTransformer; +import org.ontouml.vp.utils.SimpleServiceWorker; +import org.ontouml.vp.utils.ViewManagerUtils; import java.awt.FileDialog; import java.awt.Frame; import java.io.IOException; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/GufoExportDialogHandler.java b/src/main/java/org/ontouml/vp/services/gufo/GufoExportDialogHandler.java similarity index 90% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/GufoExportDialogHandler.java rename to src/main/java/org/ontouml/vp/services/gufo/GufoExportDialogHandler.java index 0c82c997..6c653e06 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/GufoExportDialogHandler.java +++ b/src/main/java/org/ontouml/vp/services/gufo/GufoExportDialogHandler.java @@ -1,13 +1,13 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.services.gufo; import com.vp.plugin.ApplicationManager; import com.vp.plugin.ViewManager; import com.vp.plugin.view.IDialog; import com.vp.plugin.view.IDialogHandler; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.ProjectConfigurations; -import it.unibz.inf.ontouml.vp.views.GufoExportView; +import org.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.ProjectConfigurations; + import java.awt.Component; class GufoExportDialogHandler implements IDialogHandler { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/views/GufoExportView.java b/src/main/java/org/ontouml/vp/services/gufo/GufoExportView.java similarity index 96% rename from src/main/java/it/unibz/inf/ontouml/vp/views/GufoExportView.java rename to src/main/java/org/ontouml/vp/services/gufo/GufoExportView.java index b2acb0a8..cfb5a8c9 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/views/GufoExportView.java +++ b/src/main/java/org/ontouml/vp/services/gufo/GufoExportView.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.views; +package org.ontouml.vp.services.gufo; import com.google.gson.Gson; import com.google.gson.JsonObject; @@ -13,7 +13,9 @@ import com.vp.plugin.model.IProject; import com.vp.plugin.model.factory.IModelElementFactory; import com.vp.plugin.view.IDialog; -import it.unibz.inf.ontouml.vp.model.ProjectConfigurations; +import org.ontouml.vp.model.ProjectConfigurations; +import org.ontouml.vp.views.JCheckBoxTree; + import java.awt.Color; import java.awt.Dimension; import java.awt.GridBagConstraints; @@ -50,33 +52,33 @@ public class GufoExportView extends JPanel { private JComboBox inverseBox; private JComboBox objectBox; private JComboBox analysisBox; - private JComboBox packagesBox; + private final JComboBox packagesBox; private JComboBox namesBox; - private JComboBox languagesBox; - private JComboBox packagesIdBox; - private JTabbedPane tabbedPane; - private JCheckBoxTree packageTree; - private JCheckBoxTree diagramTree; + private final JComboBox languagesBox; + private final JComboBox packagesIdBox; + private final JTabbedPane tabbedPane; + private final JCheckBoxTree packageTree; + private final JCheckBoxTree diagramTree; - private JTable table; - private JTable table2; + private final JTable table; + private final JTable table2; JPanel treePanelPackage; JPanel treePanelDiagram; - private JButton btnExport; - private JButton btnCancel; + private final JButton btnExport; + private final JButton btnCancel; private IDialog _dialog; - private boolean wasCancelled = false; + private final boolean wasCancelled = false; - private HashSet elementsPackageTree = new HashSet<>(); - private HashSet elementsDiagramTree = new HashSet<>(); + private final HashSet elementsPackageTree = new HashSet<>(); + private final HashSet elementsDiagramTree = new HashSet<>(); - private IModelElement[] elementsMapping; - private IModelElement[] packagesMapping; + private final IModelElement[] elementsMapping; + private final IModelElement[] packagesMapping; public GufoExportView(ProjectConfigurations configurations) { setSize(new Dimension(680, 550)); @@ -109,11 +111,13 @@ public GufoExportView(ProjectConfigurations configurations) { buttonsPanelTable1.setLayout(new GridBagLayout()); buttonsPanelTable2.setLayout(new GridBagLayout()); - mainPanel.setPreferredSize(new Dimension(650, 540)); - elementMappingPanel.setPreferredSize(new Dimension(650, 480)); - packageMappingPanel.setPreferredSize(new Dimension(650, 540)); + int width = 750; + + mainPanel.setPreferredSize(new Dimension(width, 540)); + elementMappingPanel.setPreferredSize(new Dimension(width, 480)); + packageMappingPanel.setPreferredSize(new Dimension(width, 540)); optionsPanelLeft.setPreferredSize(new Dimension(280, 120)); - optionsPanelRight.setPreferredSize(new Dimension(320, 120)); + optionsPanelRight.setPreferredSize(new Dimension(420, 120)); treePanel.setPreferredSize(new Dimension(600, 300)); buttonsPanel.setPreferredSize(new Dimension(600, 40)); buttonsPanelTable1.setPreferredSize(new Dimension(280, 40)); @@ -199,7 +203,7 @@ public GufoExportView(ProjectConfigurations configurations) { optionsPanelLeft.add(uriFormatBox, gbc_insidePanelLeft); JLabel inverseLabel = new JLabel("Create inverse properties:"); - JLabel objectLabel = new JLabel("Minimize property creation:"); + JLabel objectLabel = new JLabel("Create properties corresponding to associations:"); JLabel analysisLabel = new JLabel("Run pre analysis:"); JLabel prefixPackageLabel = new JLabel("Add prefix per package:"); diff --git a/src/main/java/org/ontouml/vp/services/gufo/gufoService.java b/src/main/java/org/ontouml/vp/services/gufo/gufoService.java new file mode 100644 index 00000000..c35bc392 --- /dev/null +++ b/src/main/java/org/ontouml/vp/services/gufo/gufoService.java @@ -0,0 +1,5 @@ +package org.ontouml.vp.services.gufo; + +public class gufoService { + +} diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/JsonImportAndExportController.java b/src/main/java/org/ontouml/vp/services/json/JsonImportAndExportController.java similarity index 94% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/JsonImportAndExportController.java rename to src/main/java/org/ontouml/vp/services/json/JsonImportAndExportController.java index 0defa523..451b3edb 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/JsonImportAndExportController.java +++ b/src/main/java/org/ontouml/vp/services/json/JsonImportAndExportController.java @@ -1,14 +1,14 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.services.json; import com.vp.plugin.ApplicationManager; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPActionController; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.ProjectConfigurations; -import it.unibz.inf.ontouml.vp.model.ontouml2vp.Ontouml2UmlLoader; -import it.unibz.inf.ontouml.vp.model.vp2ontouml.Uml2OntoumlTransformer; -import it.unibz.inf.ontouml.vp.utils.SimpleServiceWorker; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.ProjectConfigurations; +import org.ontouml.vp.model.ontouml2vp.Ontouml2UmlLoader; +import org.ontouml.vp.model.vp2ontouml.Uml2OntoumlTransformer; +import org.ontouml.vp.utils.SimpleServiceWorker; +import org.ontouml.vp.utils.ViewManagerUtils; import java.awt.*; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/org/ontouml/vp/services/json/transformJsonService.java b/src/main/java/org/ontouml/vp/services/json/transformJsonService.java new file mode 100644 index 00000000..b4a66c6e --- /dev/null +++ b/src/main/java/org/ontouml/vp/services/json/transformJsonService.java @@ -0,0 +1,5 @@ +package org.ontouml.vp.services.json; + +public class transformJsonService { + +} diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/GitHubAccessController.java b/src/main/java/org/ontouml/vp/services/project/GitHubAccessController.java similarity index 85% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/GitHubAccessController.java rename to src/main/java/org/ontouml/vp/services/project/GitHubAccessController.java index 3d6eb75c..21955695 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/GitHubAccessController.java +++ b/src/main/java/org/ontouml/vp/services/project/GitHubAccessController.java @@ -1,13 +1,12 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.services.project; import com.google.gson.JsonArray; import com.google.gson.JsonParser; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.GitHubRelease; -import it.unibz.inf.ontouml.vp.model.GitHubReleaseAsset; +import org.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.GitHubRelease; +import org.ontouml.vp.model.GitHubReleaseAsset; import java.io.*; -import java.net.MalformedURLException; import java.net.URL; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; @@ -59,7 +58,7 @@ public static List getReleases() throws IOException { } JsonArray releasesArray = - (JsonArray) new JsonParser().parse(response.toString()).getAsJsonArray(); + new JsonParser().parse(response.toString()).getAsJsonArray(); List releases = new ArrayList<>(); releasesArray.forEach( @@ -75,7 +74,7 @@ public static List getReleases() throws IOException { } public static File downloadReleaseAsset(GitHubReleaseAsset asset) - throws MalformedURLException, IOException { + throws IOException { final URL downloadURL = new URL(asset.getDownloadUrl()); final ReadableByteChannel rbc = Channels.newChannel(downloadURL.openStream()); final Path pluginDownloadDir = Files.createTempDirectory("pluginDownloadDir"); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ProjectListener.java b/src/main/java/org/ontouml/vp/services/project/ProjectListener.java similarity index 88% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/ProjectListener.java rename to src/main/java/org/ontouml/vp/services/project/ProjectListener.java index c73f31bd..1a9de627 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ProjectListener.java +++ b/src/main/java/org/ontouml/vp/services/project/ProjectListener.java @@ -1,21 +1,22 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.services.project; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.IProject; import com.vp.plugin.model.IProjectListener; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; -import it.unibz.inf.ontouml.vp.controllers.GitHubAccessController; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.GitHubRelease; -import it.unibz.inf.ontouml.vp.utils.StereotypesManager; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.listeners.ProjectDiagramListener; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.GitHubRelease; +import org.ontouml.vp.utils.StereotypesManager; +import org.ontouml.vp.utils.ViewManagerUtils; + import java.time.ZonedDateTime; import java.util.List; public class ProjectListener implements IProjectListener { - private ProjectModelListener projectModelListener; - private ProjectDiagramListener projectDiagramListener; + private final ProjectModelListener projectModelListener; + private final ProjectDiagramListener projectDiagramListener; public ProjectListener() { projectModelListener = new ProjectModelListener(); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ProjectModelListener.java b/src/main/java/org/ontouml/vp/services/project/ProjectModelListener.java similarity index 94% rename from src/main/java/it/unibz/inf/ontouml/vp/listeners/ProjectModelListener.java rename to src/main/java/org/ontouml/vp/services/project/ProjectModelListener.java index 47c670e5..967979a9 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/listeners/ProjectModelListener.java +++ b/src/main/java/org/ontouml/vp/services/project/ProjectModelListener.java @@ -1,10 +1,12 @@ -package it.unibz.inf.ontouml.vp.listeners; +package org.ontouml.vp.services.project; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IProject; import com.vp.plugin.model.IProjectModelListener; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.utils.ApplicationManagerUtils; + +import org.ontouml.vp.listeners.ModelListener; +import org.ontouml.vp.utils.ApplicationManagerUtils; import java.util.Collections; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/UpdatePluginController.java b/src/main/java/org/ontouml/vp/services/project/UpdatePluginController.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/UpdatePluginController.java rename to src/main/java/org/ontouml/vp/services/project/UpdatePluginController.java index 180e642c..6579e048 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/UpdatePluginController.java +++ b/src/main/java/org/ontouml/vp/services/project/UpdatePluginController.java @@ -1,12 +1,12 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.services.project; import com.vp.plugin.ApplicationManager; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPActionController; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; -import it.unibz.inf.ontouml.vp.model.GitHubRelease; -import it.unibz.inf.ontouml.vp.model.GitHubReleaseAsset; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.model.GitHubRelease; +import org.ontouml.vp.model.GitHubReleaseAsset; +import org.ontouml.vp.utils.ViewManagerUtils; import java.io.*; import java.util.function.Predicate; import java.util.zip.ZipEntry; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ReloadClassesController.java b/src/main/java/org/ontouml/vp/services/reload/ReloadClassesController.java similarity index 82% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ReloadClassesController.java rename to src/main/java/org/ontouml/vp/services/reload/ReloadClassesController.java index def74bbd..944c7250 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ReloadClassesController.java +++ b/src/main/java/org/ontouml/vp/services/reload/ReloadClassesController.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.services.reload; import com.vp.plugin.ApplicationManager; import com.vp.plugin.action.VPAction; import com.vp.plugin.action.VPActionController; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.utils.ViewManagerUtils; public class ReloadClassesController implements VPActionController { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ModelVerificationController.java b/src/main/java/org/ontouml/vp/services/verification/ModelVerificationController.java similarity index 89% rename from src/main/java/it/unibz/inf/ontouml/vp/controllers/ModelVerificationController.java rename to src/main/java/org/ontouml/vp/services/verification/ModelVerificationController.java index 25fb839f..109566f6 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/controllers/ModelVerificationController.java +++ b/src/main/java/org/ontouml/vp/services/verification/ModelVerificationController.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.controllers; +package org.ontouml.vp.services.verification; import com.vp.plugin.ApplicationManager; import com.vp.plugin.action.VPAction; @@ -6,11 +6,13 @@ import com.vp.plugin.diagram.IBaseDiagramElement; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.IDiagramUIModel; -import it.unibz.inf.ontouml.vp.model.ServiceIssue; -import it.unibz.inf.ontouml.vp.model.VerificationServiceResult; -import it.unibz.inf.ontouml.vp.model.vp2ontouml.Uml2OntoumlTransformer; -import it.unibz.inf.ontouml.vp.utils.SimpleServiceWorker; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; + +import org.ontouml.vp.controllers.OntoUMLServerAccessController; +import org.ontouml.vp.model.ServiceIssue; +import org.ontouml.vp.model.VerificationServiceResult; +import org.ontouml.vp.model.vp2ontouml.Uml2OntoumlTransformer; +import org.ontouml.vp.utils.SimpleServiceWorker; +import org.ontouml.vp.utils.ViewManagerUtils; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/org/ontouml/vp/services/verification/verifyService.java b/src/main/java/org/ontouml/vp/services/verification/verifyService.java new file mode 100644 index 00000000..672192e9 --- /dev/null +++ b/src/main/java/org/ontouml/vp/services/verification/verifyService.java @@ -0,0 +1,5 @@ +package org.ontouml.vp.services.verification; + +public class verifyService { + +} diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/ActionIdManager.java b/src/main/java/org/ontouml/vp/utils/ActionIdManager.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/ActionIdManager.java rename to src/main/java/org/ontouml/vp/utils/ActionIdManager.java index 4a4f2643..34509114 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/ActionIdManager.java +++ b/src/main/java/org/ontouml/vp/utils/ActionIdManager.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; public final class ActionIdManager { // Properties menu options IDs diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/ApplicationManagerUtils.java b/src/main/java/org/ontouml/vp/utils/ApplicationManagerUtils.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/ApplicationManagerUtils.java rename to src/main/java/org/ontouml/vp/utils/ApplicationManagerUtils.java index 76ebff96..0fa9cdf5 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/ApplicationManagerUtils.java +++ b/src/main/java/org/ontouml/vp/utils/ApplicationManagerUtils.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/ConfigurationsUtils.java b/src/main/java/org/ontouml/vp/utils/ConfigurationsUtils.java similarity index 84% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/ConfigurationsUtils.java rename to src/main/java/org/ontouml/vp/utils/ConfigurationsUtils.java index ccea658e..0a174c75 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/ConfigurationsUtils.java +++ b/src/main/java/org/ontouml/vp/utils/ConfigurationsUtils.java @@ -1,6 +1,6 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; -import it.unibz.inf.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.Configurations; public class ConfigurationsUtils { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/OntoUMLConstraintsManager.java b/src/main/java/org/ontouml/vp/utils/OntoUMLConstraintsManager.java similarity index 89% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/OntoUMLConstraintsManager.java rename to src/main/java/org/ontouml/vp/utils/OntoUMLConstraintsManager.java index fda59326..c232d8ff 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/OntoUMLConstraintsManager.java +++ b/src/main/java/org/ontouml/vp/utils/OntoUMLConstraintsManager.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; import com.google.gson.Gson; import com.google.gson.JsonObject; @@ -8,10 +8,10 @@ import com.vp.plugin.VPPluginInfo; import com.vp.plugin.model.IAssociation; import com.vp.plugin.model.IClass; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; -import it.unibz.inf.ontouml.vp.model.uml.Association; -import it.unibz.inf.ontouml.vp.model.uml.Class; -import it.unibz.inf.ontouml.vp.model.uml.ModelElement; +import org.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.model.uml.Association; +import org.ontouml.vp.model.uml.Class; +import org.ontouml.vp.model.uml.ModelElement; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; @@ -24,11 +24,11 @@ public class OntoUMLConstraintsManager { private static final Type mapOfListsType = new TypeToken>>() {}.getType(); - private static String GENERALIZATION_CONSTRAINTS_FILENAME = "generalization_constraints.json"; - private static String ASSOCIATION_CONSTRAINTS_FILENAME = "association_constraints_nature.json"; + private static final String GENERALIZATION_CONSTRAINTS_FILENAME = "generalization_constraints.json"; + private static final String ASSOCIATION_CONSTRAINTS_FILENAME = "association_constraints_nature.json"; - private static String ALLOWED_SUBCLASSES = "allowedSubClassesFor"; - private static String ALLOWED_SUPERCLASSES = "allowedSuperClassesFor"; + private static final String ALLOWED_SUBCLASSES = "allowedSubClassesFor"; + private static final String ALLOWED_SUPERCLASSES = "allowedSuperClassesFor"; private static Map> allowedSuperClassesFor, allowedSubClassesFor; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/RestrictedTo.java b/src/main/java/org/ontouml/vp/utils/RestrictedTo.java similarity index 99% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/RestrictedTo.java rename to src/main/java/org/ontouml/vp/utils/RestrictedTo.java index 72ac388d..4315befc 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/RestrictedTo.java +++ b/src/main/java/org/ontouml/vp/utils/RestrictedTo.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/SimpleServiceWorker.java b/src/main/java/org/ontouml/vp/utils/SimpleServiceWorker.java similarity index 94% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/SimpleServiceWorker.java rename to src/main/java/org/ontouml/vp/utils/SimpleServiceWorker.java index fa9d4b39..dfaf08b2 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/SimpleServiceWorker.java +++ b/src/main/java/org/ontouml/vp/utils/SimpleServiceWorker.java @@ -1,6 +1,7 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; + +import org.ontouml.vp.views.ProgressDialogHandler; -import it.unibz.inf.ontouml.vp.views.ProgressDialogHandler; import java.util.List; import java.util.function.Function; import javax.swing.SwingWorker; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/SmartColoringUtils.java b/src/main/java/org/ontouml/vp/utils/SmartColoringUtils.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/SmartColoringUtils.java rename to src/main/java/org/ontouml/vp/utils/SmartColoringUtils.java index 94ad53a7..a4856dc6 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/SmartColoringUtils.java +++ b/src/main/java/org/ontouml/vp/utils/SmartColoringUtils.java @@ -1,12 +1,12 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.diagram.shape.IClassUIModel; import com.vp.plugin.model.IClass; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.uml.Class; -import it.unibz.inf.ontouml.vp.model.uml.ModelElement; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.uml.Class; +import org.ontouml.vp.model.uml.ModelElement; import java.awt.*; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/Stereotype.java b/src/main/java/org/ontouml/vp/utils/Stereotype.java similarity index 99% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/Stereotype.java rename to src/main/java/org/ontouml/vp/utils/Stereotype.java index 4c2ebd20..d89997ab 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/Stereotype.java +++ b/src/main/java/org/ontouml/vp/utils/Stereotype.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/StereotypesManager.java b/src/main/java/org/ontouml/vp/utils/StereotypesManager.java similarity index 99% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/StereotypesManager.java rename to src/main/java/org/ontouml/vp/utils/StereotypesManager.java index 46246d4c..c9c2a3c6 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/StereotypesManager.java +++ b/src/main/java/org/ontouml/vp/utils/StereotypesManager.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; import com.vp.plugin.ApplicationManager; import com.vp.plugin.model.*; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/VPContextUtils.java b/src/main/java/org/ontouml/vp/utils/VPContextUtils.java similarity index 89% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/VPContextUtils.java rename to src/main/java/org/ontouml/vp/utils/VPContextUtils.java index 533c7c17..a95f93a2 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/VPContextUtils.java +++ b/src/main/java/org/ontouml/vp/utils/VPContextUtils.java @@ -1,8 +1,8 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; import com.vp.plugin.action.VPContext; import com.vp.plugin.model.IModelElement; -import it.unibz.inf.ontouml.vp.model.uml.Diagram; +import org.ontouml.vp.model.uml.Diagram; import java.util.Set; public class VPContextUtils { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/utils/ViewManagerUtils.java b/src/main/java/org/ontouml/vp/utils/ViewManagerUtils.java similarity index 97% rename from src/main/java/it/unibz/inf/ontouml/vp/utils/ViewManagerUtils.java rename to src/main/java/org/ontouml/vp/utils/ViewManagerUtils.java index 4e752583..f8ee0845 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/utils/ViewManagerUtils.java +++ b/src/main/java/org/ontouml/vp/utils/ViewManagerUtils.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.utils; +package org.ontouml.vp.utils; import com.vp.plugin.ApplicationManager; import com.vp.plugin.DiagramManager; @@ -6,14 +6,15 @@ import com.vp.plugin.diagram.IDiagramElement; import com.vp.plugin.model.IModelElement; import com.vp.plugin.model.IProject; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; -import it.unibz.inf.ontouml.vp.listeners.IssueLogMenuListener; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.GitHubRelease; -import it.unibz.inf.ontouml.vp.model.ProjectConfigurations; -import it.unibz.inf.ontouml.vp.model.ServiceIssue; -import it.unibz.inf.ontouml.vp.model.VerificationServiceResult; -import it.unibz.inf.ontouml.vp.views.HTMLEnabledMessage; +import org.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.listeners.IssueLogMenuListener; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.GitHubRelease; +import org.ontouml.vp.model.ProjectConfigurations; +import org.ontouml.vp.model.ServiceIssue; +import org.ontouml.vp.model.VerificationServiceResult; +import org.ontouml.vp.views.HTMLEnabledMessage; + import java.io.File; import java.net.HttpURLConnection; import java.nio.file.Paths; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/views/ConfigurationsView.java b/src/main/java/org/ontouml/vp/views/ConfigurationsView.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/views/ConfigurationsView.java rename to src/main/java/org/ontouml/vp/views/ConfigurationsView.java index 76a2e300..e1467864 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/views/ConfigurationsView.java +++ b/src/main/java/org/ontouml/vp/views/ConfigurationsView.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.views; +package org.ontouml.vp.views; import com.vp.plugin.view.IDialog; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.ProjectConfigurations; +import org.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.ProjectConfigurations; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -21,16 +21,16 @@ public class ConfigurationsView extends JPanel { private static final long serialVersionUID = 1L; - private JCheckBox _chckbxEnableCustomServer; - private JTextField _txtServerAddress; + private final JCheckBox _chckbxEnableCustomServer; + private final JTextField _txtServerAddress; - private JCheckBox _chckbxEnableAutoColoring; - private JCheckBox _chckbxEnableSmartModelling; + private final JCheckBox _chckbxEnableAutoColoring; + private final JCheckBox _chckbxEnableSmartModelling; - private JButton _btnApply; - private JButton _btnResetDefaults; + private final JButton _btnApply; + private final JButton _btnResetDefaults; - private JLabel pluginVersion; + private final JLabel pluginVersion; private IDialog _dialog; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/views/HTMLEnabledMessage.java b/src/main/java/org/ontouml/vp/views/HTMLEnabledMessage.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/views/HTMLEnabledMessage.java rename to src/main/java/org/ontouml/vp/views/HTMLEnabledMessage.java index 44214c26..bec98c19 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/views/HTMLEnabledMessage.java +++ b/src/main/java/org/ontouml/vp/views/HTMLEnabledMessage.java @@ -1,6 +1,6 @@ -package it.unibz.inf.ontouml.vp.views; +package org.ontouml.vp.views; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.utils.ViewManagerUtils; import java.awt.*; import javax.swing.*; import javax.swing.event.HyperlinkEvent; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/views/IssueLogMenu.java b/src/main/java/org/ontouml/vp/views/IssueLogMenu.java similarity index 94% rename from src/main/java/it/unibz/inf/ontouml/vp/views/IssueLogMenu.java rename to src/main/java/org/ontouml/vp/views/IssueLogMenu.java index ced9b926..fbf12b48 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/views/IssueLogMenu.java +++ b/src/main/java/org/ontouml/vp/views/IssueLogMenu.java @@ -1,6 +1,6 @@ -package it.unibz.inf.ontouml.vp.views; +package org.ontouml.vp.views; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; +import org.ontouml.vp.utils.ViewManagerUtils; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.*; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/views/JCheckBoxTree.java b/src/main/java/org/ontouml/vp/views/JCheckBoxTree.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/views/JCheckBoxTree.java rename to src/main/java/org/ontouml/vp/views/JCheckBoxTree.java index e849f0e1..3d2e54e9 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/views/JCheckBoxTree.java +++ b/src/main/java/org/ontouml/vp/views/JCheckBoxTree.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.views; +package org.ontouml.vp.views; import com.vp.plugin.ApplicationManager; import com.vp.plugin.diagram.IClassDiagramUIModel; @@ -6,7 +6,9 @@ import com.vp.plugin.diagram.IDiagramUIModel; import com.vp.plugin.model.*; import com.vp.plugin.model.factory.IModelElementFactory; -import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils; + +import org.ontouml.vp.services.gufo.GufoExportView; +import org.ontouml.vp.utils.ViewManagerUtils; import java.awt.*; import java.util.*; import javax.swing.*; @@ -50,7 +52,7 @@ public CheckChangeEvent(Object source) { } public interface CheckChangeEventListener extends EventListener { - public void checkStateChanged(CheckChangeEvent event); + void checkStateChanged(CheckChangeEvent event); } public void addCheckChangeEventListener(CheckChangeEventListener listener) { @@ -232,7 +234,7 @@ public void setSelectionPaths(TreePath[] pPaths) {} private void visitAllNodesAndCheckSimilar(ElementNode root, ElementNode nodeToCompare) { // if same Object - if (((ElementNode) root).getUserObject().equals(nodeToCompare.getUserObject())) { + if (root.getUserObject().equals(nodeToCompare.getUserObject())) { TreeNode[] old_treeNode = nodeToCompare.getPath(); TreePath oldTp = new TreePath(old_treeNode); @@ -266,7 +268,7 @@ private void visitAllAndCheckSameId(ElementNode root, String id, boolean checkMo if (root.getUserObject() instanceof IModelElement) { IModelElement rootModelElement = - ((IModelElement) ((DefaultMutableTreeNode) root).getUserObject()); + ((IModelElement) root.getUserObject()); // if same Object if (rootModelElement.getId().equals(id)) { @@ -329,7 +331,7 @@ private void visitAllNodesAndCheckType(ElementNode root, ElementNode nodeToCompa boolean checkMode = nodesCheckingState.get(oldTp).isSelected; if ((root.getUserObject() instanceof IClass || root.getUserObject() instanceof IDataType) - && checkMode == true) { + && checkMode) { CheckedNode cn = nodesCheckingState.get(newTp); cn.isSelected = checkMode; @@ -359,7 +361,7 @@ protected void selectAllGeneralizationsFromSet(ElementNode node, boolean checkMo if (!(node.getUserObject() instanceof IGeneralizationSet)) return; IGeneralizationSet gSet = - ((IGeneralizationSet) ((DefaultMutableTreeNode) node).getUserObject()); + ((IGeneralizationSet) node.getUserObject()); IGeneralization[] generalizations = gSet.toGeneralizationArray(); @@ -381,7 +383,7 @@ protected void updatePredecessorsWithCheckMode(TreePath tp, boolean check) { CheckedNode currentNode = nodesCheckingState.get(tp); // It is allowed to choose a class without its attributes if (((ElementNode) tp.getLastPathComponent()).getUserObject() instanceof IAttribute - && currentNode.isSelected == false) return; + && !currentNode.isSelected) return; CheckedNode parentCheckedNode = nodesCheckingState.get(parentPath); ElementNode parentNode = (ElementNode) parentPath.getLastPathComponent(); @@ -725,7 +727,7 @@ private void visitAllNodesAndCheckSameId(ElementNode root, String id) { } // if modelElement - if (((ElementNode) root).getUserObject() instanceof IModelElement) { + if (root.getUserObject() instanceof IModelElement) { IModelElement nodeElement = (IModelElement) root.getUserObject(); if (nodeElement.getId().contentEquals(id)) { @@ -736,7 +738,7 @@ private void visitAllNodesAndCheckSameId(ElementNode root, String id) { } // if Diagram - if (((ElementNode) root).getUserObject() instanceof IDiagramUIModel) { + if (root.getUserObject() instanceof IDiagramUIModel) { IDiagramUIModel diagramElement = (IDiagramUIModel) root.getUserObject(); if (diagramElement.getId().contentEquals(id)) { diff --git a/src/main/java/it/unibz/inf/ontouml/vp/views/ProgressDialogHandler.java b/src/main/java/org/ontouml/vp/views/ProgressDialogHandler.java similarity index 95% rename from src/main/java/it/unibz/inf/ontouml/vp/views/ProgressDialogHandler.java rename to src/main/java/org/ontouml/vp/views/ProgressDialogHandler.java index 23c49151..7a43d84a 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/views/ProgressDialogHandler.java +++ b/src/main/java/org/ontouml/vp/views/ProgressDialogHandler.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.views; +package org.ontouml.vp.views; import com.vp.plugin.ApplicationManager; import com.vp.plugin.view.IDialog; @@ -10,7 +10,7 @@ public class ProgressDialogHandler implements IDialogHandler { - private ProgressPanel _progressPanel; + private final ProgressPanel _progressPanel; private IDialog _dialog; private boolean wasShown = false; private boolean wasClosed = false; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/views/ProgressPanel.java b/src/main/java/org/ontouml/vp/views/ProgressPanel.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/views/ProgressPanel.java rename to src/main/java/org/ontouml/vp/views/ProgressPanel.java index bbc31b0f..d817c7f2 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/views/ProgressPanel.java +++ b/src/main/java/org/ontouml/vp/views/ProgressPanel.java @@ -1,4 +1,4 @@ -package it.unibz.inf.ontouml.vp.views; +package org.ontouml.vp.views; import java.awt.Component; import java.awt.event.ActionListener; diff --git a/src/main/java/it/unibz/inf/ontouml/vp/views/SelectRestrictionsView.java b/src/main/java/org/ontouml/vp/views/SelectRestrictionsView.java similarity index 92% rename from src/main/java/it/unibz/inf/ontouml/vp/views/SelectRestrictionsView.java rename to src/main/java/org/ontouml/vp/views/SelectRestrictionsView.java index 2611c88f..220dad0d 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/views/SelectRestrictionsView.java +++ b/src/main/java/org/ontouml/vp/views/SelectRestrictionsView.java @@ -1,10 +1,10 @@ -package it.unibz.inf.ontouml.vp.views; +package org.ontouml.vp.views; import com.vp.plugin.view.IDialog; import com.vp.plugin.view.IDialogHandler; -import it.unibz.inf.ontouml.vp.model.Configurations; -import it.unibz.inf.ontouml.vp.model.uml.Class; -import it.unibz.inf.ontouml.vp.utils.RestrictedTo; +import org.ontouml.vp.model.Configurations; +import org.ontouml.vp.model.uml.Class; +import org.ontouml.vp.utils.RestrictedTo; import java.awt.*; import java.util.List; import javax.swing.*; @@ -13,12 +13,12 @@ public class SelectRestrictionsView implements IDialogHandler { private IDialog dialog; - private JPanel selectionPanel; + private final JPanel selectionPanel; private boolean cancelledExit = true; - private String restrictedTo; - private List restrictedToList; - private List selectableRestrictedTo; + private final String restrictedTo; + private final List restrictedToList; + private final List selectableRestrictedTo; public SelectRestrictionsView(String restrictedTo, List selectableRestrictedTo) { super(); diff --git a/src/main/java/it/unibz/inf/ontouml/vp/views/SetOrderView.java b/src/main/java/org/ontouml/vp/views/SetOrderView.java similarity index 98% rename from src/main/java/it/unibz/inf/ontouml/vp/views/SetOrderView.java rename to src/main/java/org/ontouml/vp/views/SetOrderView.java index 64eed9a4..de8f5533 100644 --- a/src/main/java/it/unibz/inf/ontouml/vp/views/SetOrderView.java +++ b/src/main/java/org/ontouml/vp/views/SetOrderView.java @@ -1,9 +1,9 @@ -package it.unibz.inf.ontouml.vp.views; +package org.ontouml.vp.views; import com.vp.plugin.ApplicationManager; import com.vp.plugin.view.IDialog; import com.vp.plugin.view.IDialogHandler; -import it.unibz.inf.ontouml.vp.OntoUMLPlugin; +import org.ontouml.vp.OntoUMLPlugin; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/main/resources/plugin.xml b/src/main/resources/plugin.xml index db236a25..9b542bc6 100644 --- a/src/main/resources/plugin.xml +++ b/src/main/resources/plugin.xml @@ -2,7 +2,7 @@ id="it.unibz.inf.ontouml.vp" description="OntoUML Plugin Visual Paradigm v0.5.3" provider="University of Bolzano" - class="it.unibz.inf.ontouml.vp.OntoUMLPlugin"> + class="org.ontouml.vp.OntoUMLPlugin"> @@ -23,7 +23,7 @@ icon="icons/toolbar/check-circle-orange.png" label="Check Model" menuPath="it.unibz.inf.ontouml.vp.actionset1.toolbar1/it.unibz.inf.ontouml.vp.actionset1.menu1/#"> - + - + + class="org.ontouml.vp.controllers.ModularizationController"/> - + - + @@ -86,7 +86,7 @@ icon="icons/logo/ontouml-simple-logo-small.png" label="Export to JSON" menuPath="it.unibz.inf.ontouml.vp.actionset1.toolbar1/it.unibz.inf.ontouml.vp.actionset1.menu1/#"> - + - + - + - + @@ -136,7 +136,7 @@ icon="icons/toolbar/update-orange.png" label="Update Plugin" menuPath="it.unibz.inf.ontouml.vp.actionset1.toolbar1/it.unibz.inf.ontouml.vp.actionset1.menu1/#"> - + - + - + - + @@ -186,7 +186,7 @@ - + @@ -202,32 +202,32 @@ - + - + - + - + - + - + @@ -244,18 +244,18 @@ - + - + - + - + - + - + - + - + @@ -303,17 +303,17 @@ - + - + - + @@ -326,117 +326,117 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -450,98 +450,98 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -556,17 +556,17 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -685,7 +685,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -793,12 +793,12 @@ - + - + diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/GufoTransformationServiceResultDeserializationTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/GufoTransformationServiceResultDeserializationTest.java index fd566552..92eb0c7e 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/GufoTransformationServiceResultDeserializationTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/GufoTransformationServiceResultDeserializationTest.java @@ -8,6 +8,8 @@ import java.util.List; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.ontouml.vp.model.GufoTransformationServiceResult; +import org.ontouml.vp.model.ServiceIssue; public class GufoTransformationServiceResultDeserializationTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ModularizationServiceResultDeserializationTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ModularizationServiceResultDeserializationTest.java index 6c2f68ed..68c12e76 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ModularizationServiceResultDeserializationTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ModularizationServiceResultDeserializationTest.java @@ -3,7 +3,8 @@ import static com.google.common.truth.Truth.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ModularizationServiceResult; +import org.ontouml.vp.model.ontouml.Project; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/VerificationServiceResultDeserializationTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/VerificationServiceResultDeserializationTest.java index 2fda8548..539e3314 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/VerificationServiceResultDeserializationTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/VerificationServiceResultDeserializationTest.java @@ -8,6 +8,8 @@ import java.util.List; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.ontouml.vp.model.ServiceIssue; +import org.ontouml.vp.model.VerificationServiceResult; public class VerificationServiceResultDeserializationTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/CardinalityTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/CardinalityTest.java index fb7f02a8..d9c5210c 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/CardinalityTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/CardinalityTest.java @@ -4,7 +4,7 @@ import static com.google.common.truth.Truth8.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Cardinality; +import org.ontouml.vp.model.ontouml.model.Cardinality; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ClassStereotypeTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ClassStereotypeTest.java index 55ce07ea..83ef83e4 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ClassStereotypeTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ClassStereotypeTest.java @@ -2,7 +2,7 @@ import static com.google.common.truth.Truth8.assertThat; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ClassStereotype; +import org.ontouml.vp.model.ontouml.model.ClassStereotype; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ClassTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ClassTest.java index 481947a0..8aec5889 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ClassTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ClassTest.java @@ -2,9 +2,10 @@ import static com.google.common.truth.Truth.assertThat; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Literal; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Literal; +import org.ontouml.vp.model.ontouml.model.Property; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/MultilingualTextTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/MultilingualTextTest.java index 9957e772..ccc9ebad 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/MultilingualTextTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/MultilingualTextTest.java @@ -6,6 +6,7 @@ import java.util.Optional; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.ontouml.vp.model.ontouml.MultilingualText; class MultilingualTextTest { MultilingualText text = new MultilingualText(); diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/PackageTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/PackageTest.java index cf067aed..37bbc382 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/PackageTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/PackageTest.java @@ -3,12 +3,14 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.Project; + import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Package; class PackageTest { Project project = new Project(); diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ProjectTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ProjectTest.java index 6eff0a4d..1c44323e 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ProjectTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/ProjectTest.java @@ -3,12 +3,14 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.Project; + import java.util.stream.Stream; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Package; class ProjectTest { Project project = new Project(); diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/RelationStereotypeTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/RelationStereotypeTest.java index 527cb452..87e5ebac 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/RelationStereotypeTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/RelationStereotypeTest.java @@ -2,7 +2,7 @@ import static com.google.common.truth.Truth8.assertThat; -import it.unibz.inf.ontouml.vp.model.ontouml.model.RelationStereotype; +import org.ontouml.vp.model.ontouml.model.RelationStereotype; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/RelationTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/RelationTest.java index cc412a12..c63ea9c5 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/RelationTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/RelationTest.java @@ -2,9 +2,10 @@ import static com.google.common.truth.Truth.assertThat; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.OntoumlElement; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.Relation; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/StereotypeTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/StereotypeTest.java index 470656c0..7102f8e1 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/StereotypeTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/StereotypeTest.java @@ -2,10 +2,10 @@ import static com.google.common.truth.Truth8.assertThat; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ClassStereotype; -import it.unibz.inf.ontouml.vp.model.ontouml.model.PropertyStereotype; -import it.unibz.inf.ontouml.vp.model.ontouml.model.RelationStereotype; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Stereotype; +import org.ontouml.vp.model.ontouml.model.ClassStereotype; +import org.ontouml.vp.model.ontouml.model.PropertyStereotype; +import org.ontouml.vp.model.ontouml.model.RelationStereotype; +import org.ontouml.vp.model.ontouml.model.Stereotype; import org.junit.jupiter.api.Test; class StereotypeTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassDeserializerTest.java index 3ec72b85..b370c300 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassDeserializerTest.java @@ -4,11 +4,11 @@ import static com.google.common.truth.Truth8.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ClassStereotype; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Literal; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Nature; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.ClassStereotype; +import org.ontouml.vp.model.ontouml.model.Literal; +import org.ontouml.vp.model.ontouml.model.Nature; +import org.ontouml.vp.model.ontouml.model.Property; import java.io.IOException; import java.util.List; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializerTest.java index 58c71c6c..976ad900 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ClassViewDeserializerTest.java @@ -3,8 +3,8 @@ import static com.google.common.truth.Truth.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ClassView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Rectangle; +import org.ontouml.vp.model.ontouml.view.ClassView; +import org.ontouml.vp.model.ontouml.view.Rectangle; import java.io.IOException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DiagramDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DiagramDeserializerTest.java index eb374ef9..a3324a7e 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DiagramDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/DiagramDeserializerTest.java @@ -4,9 +4,9 @@ import static com.google.common.truth.Truth8.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ClassView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Diagram; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Rectangle; +import org.ontouml.vp.model.ontouml.view.ClassView; +import org.ontouml.vp.model.ontouml.view.Diagram; +import org.ontouml.vp.model.ontouml.view.Rectangle; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializerTest.java index 23b0e40b..666dc489 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationDeserializerTest.java @@ -4,8 +4,8 @@ import static com.google.common.truth.Truth8.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Classifier; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.model.Classifier; +import org.ontouml.vp.model.ontouml.model.Generalization; import java.io.IOException; import java.util.Optional; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializerTest.java index 9ce5891a..22dedb52 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetDeserializerTest.java @@ -4,9 +4,9 @@ import static com.google.common.truth.Truth8.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; -import it.unibz.inf.ontouml.vp.model.ontouml.model.GeneralizationSet; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.model.GeneralizationSet; import java.io.IOException; import java.util.Optional; import java.util.Set; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializerTest.java index 9e11431a..78ed5a38 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationSetViewDeserializerTest.java @@ -3,8 +3,8 @@ import static com.google.common.truth.Truth.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationSetView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Text; +import org.ontouml.vp.model.ontouml.view.GeneralizationSetView; +import org.ontouml.vp.model.ontouml.view.Text; import java.io.IOException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializerTest.java index 95081df6..81dd20ff 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/GeneralizationViewDeserializerTest.java @@ -3,9 +3,9 @@ import static com.google.common.truth.Truth.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Path; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Point; +import org.ontouml.vp.model.ontouml.view.GeneralizationView; +import org.ontouml.vp.model.ontouml.view.Path; +import org.ontouml.vp.model.ontouml.view.Point; import java.io.IOException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializerTest.java index 15af9543..8f9b14e0 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/MultilingualTextDeserializerTest.java @@ -4,7 +4,7 @@ import static com.google.common.truth.Truth8.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.MultilingualText; import java.io.IOException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageDeserializerTest.java index 29f3ae3f..e885d18c 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PackageDeserializerTest.java @@ -4,15 +4,16 @@ import static com.google.common.truth.Truth8.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.OntoumlElement; + import java.io.IOException; import java.util.List; import java.util.Optional; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Package; class PackageDeserializerTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PathDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PathDeserializerTest.java index 00318102..171e89c0 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PathDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PathDeserializerTest.java @@ -3,8 +3,8 @@ import static com.google.common.truth.Truth.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Path; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Point; +import org.ontouml.vp.model.ontouml.view.Path; +import org.ontouml.vp.model.ontouml.view.Point; import java.io.IOException; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ProjectDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ProjectDeserializerTest.java index 5dfc00d9..c1d55a2f 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ProjectDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ProjectDeserializerTest.java @@ -5,8 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.Element; +import org.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.model.Package; import java.io.IOException; import java.util.Optional; import java.util.stream.Stream; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyAssignmentsDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyAssignmentsDeserializerTest.java index 7b38dbe6..109467d7 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyAssignmentsDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyAssignmentsDeserializerTest.java @@ -4,7 +4,7 @@ import static com.google.common.truth.Truth8.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Class; import java.io.IOException; import java.util.List; import java.util.Optional; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyDeserializerTest.java index ab3ae9eb..10e5eb78 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/PropertyDeserializerTest.java @@ -4,10 +4,10 @@ import static com.google.common.truth.Truth8.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.model.AggregationKind; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; -import it.unibz.inf.ontouml.vp.model.ontouml.model.PropertyStereotype; +import org.ontouml.vp.model.ontouml.model.AggregationKind; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.PropertyStereotype; import java.io.IOException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangleDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangleDeserializerTest.java index 9d19de4d..758633fc 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangleDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RectangleDeserializerTest.java @@ -3,7 +3,7 @@ import static com.google.common.truth.Truth.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Rectangle; +import org.ontouml.vp.model.ontouml.view.Rectangle; import java.io.IOException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ReferenceResolverTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ReferenceResolverTest.java index 96fc3887..150e78ae 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ReferenceResolverTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/ReferenceResolverTest.java @@ -5,12 +5,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.truth.Truth8; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.view.ClassView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.GeneralizationView; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RelationView; +import org.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.view.ClassView; +import org.ontouml.vp.model.ontouml.view.GeneralizationView; +import org.ontouml.vp.model.ontouml.view.RelationView; import java.io.IOException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationDeserializerTest.java index 5980ac1c..e4ab1e0c 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationDeserializerTest.java @@ -4,11 +4,12 @@ import static com.google.common.truth.Truth8.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; + import java.io.IOException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.Class; class RelationDeserializerTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializerTest.java index b5e8782a..c86b7201 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/RelationViewDeserializerTest.java @@ -3,9 +3,9 @@ import static com.google.common.truth.Truth.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Path; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Point; -import it.unibz.inf.ontouml.vp.model.ontouml.view.RelationView; +import org.ontouml.vp.model.ontouml.view.Path; +import org.ontouml.vp.model.ontouml.view.Point; +import org.ontouml.vp.model.ontouml.view.RelationView; import java.io.IOException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/TextDeserializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/TextDeserializerTest.java index e128f2bb..4cf8319e 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/TextDeserializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/deserialization/TextDeserializerTest.java @@ -3,7 +3,7 @@ import static com.google.common.truth.Truth.assertThat; import com.fasterxml.jackson.databind.ObjectMapper; -import it.unibz.inf.ontouml.vp.model.ontouml.view.Text; +import org.ontouml.vp.model.ontouml.view.Text; import java.io.IOException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassSerializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassSerializerTest.java index 019e5ddb..0f14f009 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassSerializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ClassSerializerTest.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.ClassStereotype; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Nature; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.ClassStereotype; +import org.ontouml.vp.model.ontouml.model.Nature; import org.junit.jupiter.api.Test; public class ClassSerializerTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSerializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSerializerTest.java index df5254e4..d13d4730 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSerializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSerializerTest.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Generalization; import org.junit.jupiter.api.Test; public class GeneralizationSerializerTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializerTest.java index da61fa70..0a343ec3 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/GeneralizationSetSerializerTest.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Generalization; -import it.unibz.inf.ontouml.vp.model.ontouml.model.GeneralizationSet; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Generalization; +import org.ontouml.vp.model.ontouml.model.GeneralizationSet; import org.junit.jupiter.api.Test; public class GeneralizationSetSerializerTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializerTest.java index 7eac3059..041d7fdc 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/MultilingualTextSerializerTest.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.MultilingualText; +import org.ontouml.vp.model.ontouml.MultilingualText; import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageSerializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageSerializerTest.java index b7de1135..de8e46fa 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageSerializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PackageSerializerTest.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.model.Package; import org.junit.jupiter.api.Test; public class PackageSerializerTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ProjectSerializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ProjectSerializerTest.java index dd6746bd..094ea195 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ProjectSerializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/ProjectSerializerTest.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.Project; +import org.ontouml.vp.model.ontouml.Project; import org.junit.jupiter.api.Test; public class ProjectSerializerTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PropertySerializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PropertySerializerTest.java index ae905b09..8c6fb2fd 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PropertySerializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/PropertySerializerTest.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Property; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Property; import org.junit.jupiter.api.Test; public class PropertySerializerTest { diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationSerializerTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationSerializerTest.java index 74e69e57..91ddb72b 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationSerializerTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/RelationSerializerTest.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Relation; -import it.unibz.inf.ontouml.vp.model.ontouml.model.RelationStereotype; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Relation; +import org.ontouml.vp.model.ontouml.model.RelationStereotype; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/SerializationTest.java b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/SerializationTest.java index 2fccd696..4f6e3f05 100644 --- a/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/SerializationTest.java +++ b/src/test/java/it/unibz/inf/ontouml/vp/model/ontouml/serialization/SerializationTest.java @@ -2,13 +2,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import it.unibz.inf.ontouml.vp.model.ontouml.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.*; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Class; -import it.unibz.inf.ontouml.vp.model.ontouml.model.Package; +import org.ontouml.vp.model.ontouml.Project; + import java.io.File; import java.io.IOException; import org.junit.jupiter.api.Test; +import org.ontouml.vp.model.ontouml.model.*; +import org.ontouml.vp.model.ontouml.model.Class; +import org.ontouml.vp.model.ontouml.model.Package; public class SerializationTest { ObjectMapper mapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT);