Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2017-04-10 12:05:35 +0000
committerGerrit Code Review @ Eclipse.org2017-04-12 08:24:04 +0000
commitf5e001674caf1e7b70b1d03c9c39d4390c04514c (patch)
tree285dab0e37809f7a82827c64cfeb816fcc1f4044 /plugins/infra/architecture
parent41e1c785d4ef6a5f5f9e827d492e86a54af00ed9 (diff)
downloadorg.eclipse.papyrus-f5e001674caf1e7b70b1d03c9c39d4390c04514c.tar.gz
org.eclipse.papyrus-f5e001674caf1e7b70b1d03c9c39d4390c04514c.tar.xz
org.eclipse.papyrus-f5e001674caf1e7b70b1d03c9c39d4390c04514c.zip
Bug 510451 - Two changes: 1) Make architecture viewpoints exchangeable
between private .sash model and the public .di model, 2) Remove PapyrusSyncTable and refactor its usage for PapyrusTable instead Change-Id: Id5e3cfe313572e7a984dc320e868ca6ced2301c4 Signed-off-by: Maged Elaasar <melaasar@gmail.com>
Diffstat (limited to 'plugins/infra/architecture')
-rw-r--r--plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties28
-rw-r--r--plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java5
-rw-r--r--plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainPreferences.java1
3 files changed, 4 insertions, 30 deletions
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties
index 2b10a04920b..e8b0a3085a2 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/plugin.properties
@@ -19,36 +19,19 @@ _UI_CreateChild_text3 = {1}
_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
_UI_PropertyDescriptor_description = The {0} of the {1}
-
_UI_PapyrusRepresentationKind_type = Papyrus Representation Kind
-_UI_PapyrusDiagram_type = Papyrus Diagram
-_UI_PapyrusSyncTable_type = Papyrus Sync Table
-_UI_PapyrusTable_type = Papyrus Table
_UI_Rule_type = Rule
_UI_ModelRule_type = Model Rule
_UI_OwningRule_type = Owning Rule
-_UI_ChildRule_type = Child Rule
-_UI_PaletteRule_type = Palette Rule
-_UI_PathElement_type = Path Element
_UI_ModelAutoCreate_type = Model Auto Create
_UI_RootAutoSelect_type = Root Auto Select
-_UI_AssistantRule_type = Assistant Rule
_UI_Unknown_type = Object
-
_UI_Unknown_datatype= Value
-
_UI_PapyrusRepresentationKind_parent_feature = Parent
_UI_PapyrusRepresentationKind_modelRules_feature = Model Rules
_UI_PapyrusRepresentationKind_owningRules_feature = Owning Rules
_UI_PapyrusRepresentationKind_implementationID_feature = Implementation ID
-_UI_PapyrusDiagram_customPalette_feature = Custom Palette
-_UI_PapyrusDiagram_customStyle_feature = Custom Style
-_UI_PapyrusDiagram_childRules_feature = Child Rules
-_UI_PapyrusDiagram_paletteRules_feature = Palette Rules
-_UI_PapyrusDiagram_assistantRules_feature = Assistant Rules
-_UI_PapyrusTable_configuration_feature = Configuration
_UI_Rule_permit_feature = Permit
_UI_ModelRule_element_feature = Element
_UI_ModelRule_stereotypes_feature = Stereotypes
@@ -58,19 +41,8 @@ _UI_OwningRule_stereotypes_feature = Stereotypes
_UI_OwningRule_multiplicity_feature = Multiplicity
_UI_OwningRule_newModelPath_feature = New Model Path
_UI_OwningRule_selectDiagramRoot_feature = Select Diagram Root
-_UI_ChildRule_element_feature = Element
-_UI_ChildRule_stereotypes_feature = Stereotypes
-_UI_ChildRule_origin_feature = Origin
-_UI_ChildRule_insertionPath_feature = Insertion Path
-_UI_PaletteRule_element_feature = Element
-_UI_PathElement_feature_feature = Feature
-_UI_PathElement_origin_feature = Origin
-_UI_PathElement_target_feature = Target
_UI_ModelAutoCreate_feature_feature = Feature
_UI_ModelAutoCreate_origin_feature = Origin
_UI_ModelAutoCreate_creationType_feature = Creation Type
_UI_RootAutoSelect_feature_feature = Feature
-_UI_AssistantRule_elementTypeID_feature = Element Type ID
_UI_Unknown_feature = Unspecified
-
-_UI_PapyrusDiagram_creationCommandClass_feature = Creation Command Class
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java
index b1b5e83c438..166734f8158 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureCont
import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureViewpoint;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModelUtils;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
/**
* An API for manipulating architecture descriptions in a model set
@@ -110,7 +111,7 @@ public class ArchitectureDescriptionUtils {
* @return a collection of architecture viewpoin ids
*/
public Collection<String> getArchitectureViewpointIds() {
- ArchitectureDescriptionPreferences preferences = DiModelUtils.getArchitectureDescriptionPreferences(modelSet);
+ ArchitectureDescriptionPreferences preferences = SashModelUtils.getArchitectureDescriptionPreferences(modelSet);
if (preferences != null)
return preferences.getViewpointIds();
MergedArchitectureContext context = ArchitectureDomainManager.getInstance().getDefaultArchitectureContext();
@@ -251,7 +252,7 @@ public class ArchitectureDescriptionUtils {
return new RecordingCommand(modelSet.getTransactionalEditingDomain()) {
@Override
protected void doExecute() {
- ArchitectureDescriptionPreferences preferences = DiModelUtils.getOrAddArchitectureDescriptionPreferences(modelSet);
+ ArchitectureDescriptionPreferences preferences = SashModelUtils.getOrAddArchitectureDescriptionPreferences(modelSet);
Arrays.sort(viewpointIds);
preferences.eSet(ArchitecturePackage.eINSTANCE.getArchitectureDescriptionPreferences_ViewpointIds(), Arrays.asList(viewpointIds));
}
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainPreferences.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainPreferences.java
index e7954f363d6..2cd3440b4d5 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainPreferences.java
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDomainPreferences.java
@@ -87,6 +87,7 @@ public class ArchitectureDomainPreferences implements Cloneable {
* Writes the state of the preferences
*/
public void write() {
+ getPreferences().put(ArchitectureDomainPreferences.ADDED_MODELS, "");
getPreferences().put(ArchitectureDomainPreferences.ADDED_MODELS, String.join(" ", addedModels));
getPreferences().put(ArchitectureDomainPreferences.EXCLUDED_CONTEXTS, String.join(",", excludedContexts));
if (defaultContext != null)

Back to the top