Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Bégaudeau2017-01-13 14:55:33 +0000
committerStephane Begaudeau2017-02-07 16:38:01 +0000
commitc5f505b5630818d4b88750c7c6d40d5f207bbfcc (patch)
tree13920e951f60d57240f40e159374fb5fc0d58d98
parent6aaabd50cc12e8c859e4e95094467c5ebd93c2f8 (diff)
downloadorg.eclipse.sirius-c5f505b5630818d4b88750c7c6d40d5f207bbfcc.tar.gz
org.eclipse.sirius-c5f505b5630818d4b88750c7c6d40d5f207bbfcc.tar.xz
org.eclipse.sirius-c5f505b5630818d4b88750c7c6d40d5f207bbfcc.zip
[510028] Move expressions-related code out of the UI plugin
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=510028 Change-Id: I3b1e3724ad8db842d1bb4ca232329af8bc07175c Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.sirius.properties.core/plugin.properties4
-rw-r--r--plugins/org.eclipse.sirius.properties.core/plugin.xml6
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/api/SiriusInputDescriptor.java (renamed from plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInputDescriptor.java)5
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/EditSupportSpec.java (renamed from plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EditSupportSpec.java)2
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/Messages.java3
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusContext.java (renamed from plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusContext.java)4
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusToolServices.java (renamed from plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java)9
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/DomainClassSwitch.java (renamed from plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/DomainClassSwitch.java)2
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesExpressionQueryProvider.java (renamed from plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesExpressionQueryProvider.java)4
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesInterpretedExpressionQuery.java (renamed from plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java)9
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/VSMNavigation.java (renamed from plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/VSMNavigation.java)2
-rw-r--r--plugins/org.eclipse.sirius.tests.ui.properties/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/converters/ConverterTests.java2
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/plugin.properties1
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/plugin.xml6
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/api/AbstractDescriptionConverter.java2
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/ContributorWrapper.java3
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/Messages.java3
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInputAdapter.java3
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java1
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java2
-rw-r--r--plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java4
-rw-r--r--plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java7
-rw-r--r--plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/SiriusPlugin.java25
26 files changed, 79 insertions, 43 deletions
diff --git a/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF
index ac232fdb36..1102caf7f5 100644
--- a/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF
@@ -10,13 +10,18 @@ Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.sirius.properties.core.api;version="5.0.0",
org.eclipse.sirius.properties.core.api.preferences;version="5.0.0",
org.eclipse.sirius.properties.core.internal;version="5.0.0";x-internal:=true,
+ org.eclipse.sirius.properties.core.internal.expressions;version="5.0.0",
org.eclipse.sirius.properties.core.internal.migration;version="5.0.0",
org.eclipse.sirius.properties.core.internal.preferences;version="5.0.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.0.0",
org.eclipse.sirius;bundle-version="5.0.0",
+ org.eclipse.sirius.common;bundle-version="5.0.0",
org.eclipse.sirius.ecore.extender;bundle-version="5.0.0",
- org.eclipse.sirius.properties;bundle-version="5.0.0",
org.eclipse.sirius.ext.base;bundle-version="5.0.0",
- org.eclipse.eef.common;bundle-version="2.0.0"
+ org.eclipse.sirius.properties;bundle-version="5.0.0",
+ org.eclipse.eef.common;bundle-version="2.0.0",
+ org.eclipse.eef.core;bundle-version="2.0.0",
+ org.eclipse.emf.transaction;bundle-version="1.8.0",
+ org.eclipse.sirius.ext.emf.edit;bundle-version="5.0.0"
Import-Package: com.google.common.collect;version="[15.0.0,16.0.0)"
diff --git a/plugins/org.eclipse.sirius.properties.core/plugin.properties b/plugins/org.eclipse.sirius.properties.core/plugin.properties
index 73c72954a8..a775a3ad8f 100644
--- a/plugins/org.eclipse.sirius.properties.core/plugin.properties
+++ b/plugins/org.eclipse.sirius.properties.core/plugin.properties
@@ -12,4 +12,6 @@
pluginName = Sirius Properties View Runtime
providerName = Eclipse Modeling Project
-DefaultRulesProvider_DefaultPropertiesNotFound=The model containing the default configuration of the Properties page has not been found. \ No newline at end of file
+DefaultRulesProvider_DefaultPropertiesNotFound=The model containing the default configuration of the Properties page has not been found.
+
+SiriusToolServices_MainTabLabel=Main \ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.properties.core/plugin.xml b/plugins/org.eclipse.sirius.properties.core/plugin.xml
index 0916f7a3fe..e1ba71b212 100644
--- a/plugins/org.eclipse.sirius.properties.core/plugin.xml
+++ b/plugins/org.eclipse.sirius.properties.core/plugin.xml
@@ -28,4 +28,10 @@
kind="VSM">
</participant>
</extension>
+ <extension
+ point="org.eclipse.sirius.interpretedExpressionQueryProvider">
+ <interpretedExpressionProvider
+ class="org.eclipse.sirius.properties.core.internal.expressions.PropertiesExpressionQueryProvider">
+ </interpretedExpressionProvider>
+ </extension>
</plugin>
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInputDescriptor.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/api/SiriusInputDescriptor.java
index 9bceec0859..646e883cec 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInputDescriptor.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/api/SiriusInputDescriptor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 Obeo.
+ * Copyright (c) 2016, 2017 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,13 +8,14 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.ui.properties.internal;
+package org.eclipse.sirius.properties.core.api;
import java.util.Collection;
import org.eclipse.eef.core.api.InputDescriptor;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.sirius.ext.base.Option;
+import org.eclipse.sirius.properties.core.internal.SiriusContext;
import com.google.common.collect.Sets;
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EditSupportSpec.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/EditSupportSpec.java
index 80bc6dbcf9..571fa864b0 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EditSupportSpec.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/EditSupportSpec.java
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.ui.properties.internal;
+package org.eclipse.sirius.properties.core.internal;
import org.eclipse.eef.common.api.utils.Util;
import org.eclipse.emf.common.util.BasicEList;
diff --git a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/Messages.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/Messages.java
index abb80d2eee..a701ea856e 100644
--- a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/Messages.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/Messages.java
@@ -29,6 +29,9 @@ public final class Messages {
@TranslatableMessage
public static String DefaultRulesProvider_DefaultPropertiesNotFound;
+ @TranslatableMessage
+ public static String SiriusToolServices_MainTabLabel;
+
// CHECKSTYLE:ON
private Messages() {
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusContext.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusContext.java
index e78f880a48..d32b8214a6 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusContext.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 Obeo.
+ * Copyright (c) 2016, 2017 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.ui.properties.internal;
+package org.eclipse.sirius.properties.core.internal;
import java.util.Collection;
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusToolServices.java
index 28e124c7b0..a1b202f3d3 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusToolServices.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2016 Obeo.
+ * Copyright (c) 2015, 2017 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.ui.properties.internal;
+package org.eclipse.sirius.properties.core.internal;
import java.util.Collection;
import java.util.LinkedHashSet;
@@ -26,13 +26,14 @@ import org.eclipse.sirius.ext.base.Option;
import org.eclipse.sirius.properties.EditSupport;
import org.eclipse.sirius.properties.ViewExtensionDescription;
import org.eclipse.sirius.properties.core.api.DefaultRulesProvider;
+import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor;
import org.eclipse.sirius.tools.api.command.SiriusCommand;
import org.eclipse.sirius.viewpoint.DRepresentation;
import org.eclipse.sirius.viewpoint.DSemanticDecorator;
+import org.eclipse.sirius.viewpoint.SiriusPlugin;
import org.eclipse.sirius.viewpoint.description.Viewpoint;
import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
import org.eclipse.sirius.viewpoint.description.tool.ModelOperation;
-import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
/**
* This class contains various services provided by the Sirius UI Properties
@@ -60,7 +61,7 @@ public class SiriusToolServices {
ModelOperation modelOperation = findModelOperation(initialCommandUri, session);
if (modelOperation != null) {
ModelAccessor modelAccessor = session.getModelAccessor();
- ICommandTask task = new TaskHelper(modelAccessor, SiriusEditPlugin.getPlugin().getUiCallback()).buildTaskFromModelOperation(eObject, modelOperation);
+ ICommandTask task = new TaskHelper(modelAccessor, SiriusPlugin.getDefault().getUiCallback()).buildTaskFromModelOperation(eObject, modelOperation);
SiriusCommand command = new SiriusCommand(session.getTransactionalEditingDomain(), "SiriusToolServices#executeOperation"); //$NON-NLS-1$
command.getTasks().add(task);
try {
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/DomainClassSwitch.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/DomainClassSwitch.java
index 12f101056b..cb60a45e31 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/DomainClassSwitch.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/DomainClassSwitch.java
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.ui.properties.internal.expressions;
+package org.eclipse.sirius.properties.core.internal.expressions;
import java.util.Collection;
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesExpressionQueryProvider.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesExpressionQueryProvider.java
index 74e5143bee..0216016943 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesExpressionQueryProvider.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesExpressionQueryProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 Obeo.
+ * Copyright (c) 2016, 2017 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.ui.properties.internal.expressions;
+package org.eclipse.sirius.properties.core.internal.expressions;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesInterpretedExpressionQuery.java
index 00d26c4a8e..6922522b37 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesInterpretedExpressionQuery.java
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.ui.properties.internal.expressions;
+package org.eclipse.sirius.properties.core.internal.expressions;
import java.util.Collection;
import java.util.Iterator;
@@ -42,9 +42,9 @@ import org.eclipse.sirius.properties.GroupDescription;
import org.eclipse.sirius.properties.PageDescription;
import org.eclipse.sirius.properties.PropertiesPackage;
import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor;
+import org.eclipse.sirius.properties.core.internal.SiriusToolServices;
import org.eclipse.sirius.tools.api.interpreter.context.SiriusInterpreterContextFactory;
-import org.eclipse.sirius.ui.properties.internal.SiriusInputDescriptor;
-import org.eclipse.sirius.ui.properties.internal.SiriusToolServices;
import org.eclipse.sirius.viewpoint.ViewpointPackage;
import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
import org.eclipse.sirius.viewpoint.description.Extension;
@@ -65,6 +65,7 @@ import com.google.common.collect.Sets;
*
* @author pcdavid
*/
+@SuppressWarnings("restriction")
public final class PropertiesInterpretedExpressionQuery extends AbstractInterpretedExpressionQuery implements IInterpretedExpressionQuery {
private Collection<EPackage> packagesToImport;
@@ -180,7 +181,7 @@ public final class PropertiesInterpretedExpressionQuery extends AbstractInterpre
if (availableVariables == null) {
availableVariables = Maps.newLinkedHashMap();
}
-
+
// going through eContainer() to declare any For variable (dynamic
// mappings)
EObject cur = target;
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/VSMNavigation.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/VSMNavigation.java
index 2513a251d2..230b8ec1a5 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/VSMNavigation.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/VSMNavigation.java
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.ui.properties.internal.expressions;
+package org.eclipse.sirius.properties.core.internal.expressions;
import java.util.Collection;
import java.util.Collections;
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.ui.properties/META-INF/MANIFEST.MF
index 2955b5d6f1..f809b6ffd5 100644
--- a/plugins/org.eclipse.sirius.tests.ui.properties/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/META-INF/MANIFEST.MF
@@ -17,5 +17,6 @@ Require-Bundle: org.eclipse.sirius.ui.properties;bundle-version="4.1.0",
org.eclipse.emf.compare,
com.google.guava;bundle-version="[11.0.2,16.0)",
org.eclipse.sirius.common.acceleo.aql,
- org.eclipse.sirius.common
+ org.eclipse.sirius.common,
+ org.eclipse.sirius.properties.core
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/converters/ConverterTests.java b/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/converters/ConverterTests.java
index 97e2285a5c..7d8dd94cde 100644
--- a/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/converters/ConverterTests.java
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/converters/ConverterTests.java
@@ -39,7 +39,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
import org.eclipse.sirius.properties.PropertiesPackage;
import org.eclipse.sirius.properties.ViewExtensionDescription;
-import org.eclipse.sirius.ui.properties.internal.SiriusInputDescriptor;
+import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor;
import org.eclipse.sirius.ui.properties.internal.tabprovider.ViewDescriptionConverter;
import org.junit.Test;
diff --git a/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF
index adc80bf3e3..25a6d8db86 100644
--- a/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF
@@ -41,7 +41,6 @@ Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.sirius.ui.properties.api;version="4.1.0",
org.eclipse.sirius.ui.properties.internal;version="4.1.0";x-internal:=true,
- org.eclipse.sirius.ui.properties.internal.expressions;version="4.1.0";x-internal:=true,
org.eclipse.sirius.ui.properties.internal.tabprovider;version="4.1.0";x-internal:=true,
org.eclipse.sirius.ui.properties.internal.filter;version="4.1.0";x-internal:=true,
org.eclipse.sirius.ui.properties.internal.preferences;version="4.1.0";x-internal:=true
diff --git a/plugins/org.eclipse.sirius.ui.properties/plugin.properties b/plugins/org.eclipse.sirius.ui.properties/plugin.properties
index 7992440d7f..3a35d3b776 100644
--- a/plugins/org.eclipse.sirius.ui.properties/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.properties/plugin.properties
@@ -28,7 +28,6 @@ TransactionalEditingDomainContextAdapter_errorDuringCommand = Errors occured dur
siriusTabDescriptorFilter.Label=Sirius EEF Tab Descriptor Filter
siriusTabDescriptorFilter.Description=Filters the properties tabs according to a precondition
SiriusToolServices_DefaultCategoryName=Default
-SiriusToolServices_MainTabLabel=Main
# Preferences
preference.page.title.org.eclipse.sirius.ui.properties.general=Sirius Properties View
diff --git a/plugins/org.eclipse.sirius.ui.properties/plugin.xml b/plugins/org.eclipse.sirius.ui.properties/plugin.xml
index 026b9e2304..7bce947235 100644
--- a/plugins/org.eclipse.sirius.ui.properties/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui.properties/plugin.xml
@@ -64,12 +64,6 @@
</siriusPropertySheetPageProvider>
</extension>
<extension
- point="org.eclipse.sirius.interpretedExpressionQueryProvider">
- <interpretedExpressionProvider
- class="org.eclipse.sirius.ui.properties.internal.expressions.PropertiesExpressionQueryProvider">
- </interpretedExpressionProvider>
- </extension>
- <extension
point="org.eclipse.eef.properties.ui.eefTabDescriptorFilter">
<descriptor
class="org.eclipse.sirius.ui.properties.internal.filter.SiriusTabDescriptorFilter"
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/api/AbstractDescriptionConverter.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/api/AbstractDescriptionConverter.java
index 05712c276f..b8c3a50b06 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/api/AbstractDescriptionConverter.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/api/AbstractDescriptionConverter.java
@@ -19,8 +19,8 @@ import java.util.Map;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.sirius.business.api.color.AbstractColorUpdater;
+import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor;
import org.eclipse.sirius.ui.properties.internal.Messages;
-import org.eclipse.sirius.ui.properties.internal.SiriusInputDescriptor;
import org.eclipse.sirius.ui.properties.internal.SiriusUIPropertiesPlugin;
import org.eclipse.sirius.viewpoint.RGBValues;
import org.eclipse.sirius.viewpoint.description.ColorDescription;
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/ContributorWrapper.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/ContributorWrapper.java
index 78545da717..1762ff136e 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/ContributorWrapper.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/ContributorWrapper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 Obeo.
+ * Copyright (c) 2016, 2017 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.sirius.ext.emf.edit.EditingDomainServices;
+import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor;
import org.eclipse.ui.forms.widgets.Form;
/**
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/Messages.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/Messages.java
index 105ed81c9d..37b6349c9d 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/Messages.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/Messages.java
@@ -41,9 +41,6 @@ public final class Messages {
public static String SiriusToolServices_DefaultCategoryName;
@TranslatableMessage
- public static String SiriusToolServices_MainTabLabel;
-
- @TranslatableMessage
public static String TransactionalEditingDomainContextAdapter_errorDuringCommand;
// CHECKSTYLE:ON
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInputAdapter.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInputAdapter.java
index 5761f99c20..b627ae5933 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInputAdapter.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInputAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 Obeo.
+ * Copyright (c) 2016, 2017 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@ package org.eclipse.sirius.ui.properties.internal;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.eef.core.api.InputDescriptor;
+import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor;
/**
* An adapter factory to convert an element selected in Sirius into a suitable
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java
index 8ef9cd2dcd..5e0474676b 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java
@@ -22,6 +22,7 @@ import org.eclipse.sirius.common.interpreter.api.IEvaluationResult;
import org.eclipse.sirius.common.interpreter.api.IInterpreter;
import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterWithDiagnostic;
+import org.eclipse.sirius.properties.core.internal.SiriusToolServices;
import com.google.common.base.Preconditions;
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java
index ce1feacd07..4c596ce7b1 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java
@@ -38,7 +38,7 @@ import org.eclipse.sirius.ext.base.Option;
import org.eclipse.sirius.properties.PageDescription;
import org.eclipse.sirius.properties.ViewExtensionDescription;
import org.eclipse.sirius.properties.core.api.DefaultRulesProvider;
-import org.eclipse.sirius.ui.properties.internal.SiriusInputDescriptor;
+import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor;
import org.eclipse.sirius.ui.properties.internal.SiriusInterpreter;
import org.eclipse.sirius.ui.properties.internal.SiriusUIPropertiesPlugin;
import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
index 3192b66198..9f3c938943 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2016 Obeo.
+ * Copyright (c) 2015, 2017 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,10 +25,10 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.sirius.properties.GroupDescription;
import org.eclipse.sirius.properties.PageDescription;
import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor;
import org.eclipse.sirius.ui.properties.api.DescriptionCache;
import org.eclipse.sirius.ui.properties.api.IDescriptionConverter;
import org.eclipse.sirius.ui.properties.api.IDescriptionLinkResolver;
-import org.eclipse.sirius.ui.properties.internal.SiriusInputDescriptor;
import org.eclipse.sirius.ui.properties.internal.SiriusUIPropertiesPlugin;
/**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java
index 16d2651b22..024579a119 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java
@@ -154,8 +154,6 @@ public final class SiriusEditPlugin extends EMFPlugin {
private Map<ImageDescriptor, Image> descriptorsToImages;
- private UICallBack uiCallback = new GenericSWTCallBack();
-
private Multimap<String, ISiriusPropertySheetPageProvider> propertySheetPageProviders = HashMultimap.create();
/**
@@ -185,6 +183,7 @@ public final class SiriusEditPlugin extends EMFPlugin {
// Remember the static instance.
//
SiriusEditPlugin.plugin = this;
+ SiriusPlugin.getDefault().setUiCallback(new GenericSWTCallBack());
}
/**
@@ -516,7 +515,7 @@ public final class SiriusEditPlugin extends EMFPlugin {
* @return the uiCallback
*/
public UICallBack getUiCallback() {
- return uiCallback;
+ return SiriusPlugin.getDefault().getUiCallback();
}
/**
@@ -526,7 +525,7 @@ public final class SiriusEditPlugin extends EMFPlugin {
* the uiCallback to set
*/
public void setUiCallback(UICallBack uiCallback) {
- this.uiCallback = uiCallback;
+ SiriusPlugin.getDefault().setUiCallback(uiCallback);
}
}
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/SiriusPlugin.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/SiriusPlugin.java
index 900fe402ef..b8cdb9f08e 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/SiriusPlugin.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/SiriusPlugin.java
@@ -28,6 +28,7 @@ import org.eclipse.sirius.business.internal.helper.delete.DeleteHookDescriptorRe
import org.eclipse.sirius.business.internal.resource.strategy.ResourceStrategyRegistryListener;
import org.eclipse.sirius.business.internal.session.factory.SessionFactoryRegistryListener;
import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessorsRegistry;
+import org.eclipse.sirius.tools.api.command.ui.UICallBack;
import org.eclipse.sirius.tools.api.interpreter.InterpreterRegistry;
import org.eclipse.sirius.tools.internal.ui.ExternalJavaActionRegistryListener;
import org.eclipse.sirius.tools.internal.validation.EValidatorAdapter;
@@ -137,6 +138,11 @@ public final class SiriusPlugin extends EMFPlugin {
private InterpretedExpressionQueryProviderRegistry expressionQueryProviderRegistry;
/**
+ * The user interface callback.
+ */
+ private UICallBack uiCallback;
+
+ /**
* Creates an instance.
*/
public Implementation() {
@@ -257,6 +263,25 @@ public final class SiriusPlugin extends EMFPlugin {
}
}
+ /**
+ * Return callBack.
+ *
+ * @return the uiCallback
+ */
+ public UICallBack getUiCallback() {
+ return uiCallback;
+ }
+
+ /**
+ * Modify callBack.
+ *
+ * @param uiCallback
+ * the uiCallback to set
+ */
+ public void setUiCallback(UICallBack uiCallback) {
+ this.uiCallback = uiCallback;
+ }
+
}
}

Back to the top