diff options
Diffstat (limited to 'plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse')
43 files changed, 185 insertions, 534 deletions
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/Activator.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/Activator.java index 1c7aeff1748..fae2fc17535 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/Activator.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/Activator.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@ *
* Contributors:
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 485220
+ *
*****************************************************************************/
package org.eclipse.papyrus.views.properties;
@@ -16,12 +18,15 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.emf.common.util.URI;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.papyrus.infra.properties.spi.IPropertiesResolver;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
/**
@@ -42,23 +47,25 @@ public class Activator extends AbstractUIPlugin { */
public static LogHelper log;
+ private ServiceRegistration<IPropertiesResolver> propertiesResolverReg;
+
/**
* The constructor
*/
public Activator() {
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
log = new LogHelper(plugin);
+ // We can resolve ppe: scheme URIs against our workspace metadata storage path
+ propertiesResolverReg = context.registerService(IPropertiesResolver.class,
+ ppeURI -> ppeURI.resolve(URI.createFileURI(getPreferencesPath().toString() + "/")),
+ null);
+
Job startProperties = new Job("Starting Configuration Manager") {
@Override
@@ -79,13 +86,13 @@ public class Activator extends AbstractUIPlugin { return getStateLocation();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
@Override
public void stop(BundleContext context) throws Exception {
+ if (propertiesResolverReg != null) {
+ propertiesResolverReg.unregister();
+ propertiesResolverReg = null;
+ }
+
plugin = null;
super.stop(context);
}
@@ -118,7 +125,7 @@ public class Activator extends AbstractUIPlugin { * @param path
* The path to the image from the plugin
* @return
- * The Image at the given location, or null if it couldn't be found
+ * The Image at the given location, or null if it couldn't be found
*/
public Image getImage(String pluginId, String path) {
final ImageRegistry registry = getImageRegistry();
@@ -137,7 +144,7 @@ public class Activator extends AbstractUIPlugin { * @param imagePath
* The path of the image, in the form /<plug-in ID>/<path to the image>
* @return
- * The Image at the given location, or null if none was found
+ * The Image at the given location, or null if none was found
*/
public Image getImageFromPlugin(String imagePath) {
if (imagePath.startsWith("/")) { //$NON-NLS-1$
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/catalog/PropertiesCatalog.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/catalog/PropertiesCatalog.java deleted file mode 100644 index 88c40adf86f..00000000000 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/catalog/PropertiesCatalog.java +++ /dev/null @@ -1,74 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.views.properties.catalog;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Factory;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-
-/**
- * A catalog for property view URIs
- *
- * Handles URIs with the ppe:/ scheme
- *
- * @author Camille Letavernier
- */
-public class PropertiesCatalog implements Factory {
-
- /**
- * {@inheritDoc}
- */
- public Resource createResource(URI sourceURI) {
- return new PropertiesXMIResource(sourceURI);
- }
-
- /**
- * An XMIResource with a specific URI Converter, for handling
- * the ppe:/ scheme
- *
- * @author Camille Letavernier
- */
- // TODO : This class should encapsulate a resource, and not extend it
- // Non-xmi resources which are relative to a XMI resource cannot be handled
- // Typically, xwt files cannot be handled by an XMIResource
- // Problem : local calls to getURIConverter will skip the encapsulation...
- public class PropertiesXMIResource extends XMIResourceImpl {
-
- /**
- *
- * Constructor.
- *
- * @param sourceURI
- * The URI to associate to this resource
- */
- public PropertiesXMIResource(URI sourceURI) {
- super(sourceURI);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public URIConverter getURIConverter() {
- return new ExtensibleURIConverterImpl() {
-
- @Override
- public org.eclipse.emf.ecore.resource.URIHandler getURIHandler(URI uri) {
- return new PropertiesURIHandler();
- }
- };
- }
- }
-}
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/catalog/PropertiesURIHandler.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/catalog/PropertiesURIHandler.java deleted file mode 100644 index d92cb40e72e..00000000000 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/catalog/PropertiesURIHandler.java +++ /dev/null @@ -1,191 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.views.properties.catalog;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.URIHandler;
-import org.eclipse.papyrus.views.properties.Activator;
-
-/**
- * A URI Handler for URIs with the ppe:/ scheme
- *
- * @author Camille Letavernier
- */
-public class PropertiesURIHandler implements URIHandler {
-
- /**
- * The segment for environment models
- */
- public static final String ENVIRONMENT_SEGMENT = "environment"; //$NON-NLS-1$
-
- /**
- * The segment for context models
- */
- public static final String CONTEXT_SEGMENT = "context"; //$NON-NLS-1$
-
- /**
- * The handled URI scheme (ppe)
- */
- public static final String PROPERTIES_SCHEME = "ppe"; //$NON-NLS-1$
-
- /**
- * {@inheritDoc}
- */
- public boolean canHandle(URI uri) {
- return uri != null && PROPERTIES_SCHEME.equals(uri.scheme());
- }
-
- /**
- * {@inheritDoc}
- */
- public InputStream createInputStream(URI uri, Map<?, ?> options) throws IOException {
- URI convertedURI = getConvertedURI(uri);
- URIHandler handler = getDelegateHandler(convertedURI);
- return handler.createInputStream(convertedURI, options);
- }
-
- /**
- * {@inheritDoc}
- */
- public OutputStream createOutputStream(URI uri, Map<?, ?> options) throws IOException {
- URI convertedURI = getConvertedURI(uri);
- URIHandler handler = getDelegateHandler(convertedURI);
- return handler.createOutputStream(convertedURI, options);
- }
-
- /**
- * {@inheritDoc}
- */
- public void delete(URI uri, Map<?, ?> options) throws IOException {
- URI convertedURI = getConvertedURI(uri);
- URIHandler handler = getDelegateHandler(convertedURI);
- handler.delete(convertedURI, options);
- }
-
- /**
- * {@inheritDoc}
- */
- public Map<String, ?> contentDescription(URI uri, Map<?, ?> options) throws IOException {
- URI convertedURI = getConvertedURI(uri);
- URIHandler handler = getDelegateHandler(convertedURI);
- return handler.contentDescription(convertedURI, options);
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean exists(URI uri, Map<?, ?> options) {
- URI convertedURI = getConvertedURI(uri);
- URIHandler handler = getDelegateHandler(convertedURI);
- return handler.exists(convertedURI, options);
- }
-
- /**
- * {@inheritDoc}
- */
- public Map<String, ?> getAttributes(URI uri, Map<?, ?> options) {
- URI convertedURI = getConvertedURI(uri);
- URIHandler handler = getDelegateHandler(convertedURI);
- return handler.getAttributes(convertedURI, options);
- }
-
- /**
- * {@inheritDoc}
- */
- public void setAttributes(URI uri, Map<String, ?> attributes, Map<?, ?> options) throws IOException {
- URI convertedURI = getConvertedURI(uri);
- URIHandler handler = getDelegateHandler(convertedURI);
- handler.setAttributes(convertedURI, attributes, options);
- }
-
- /**
- * Returns the URIHandler that can handle the given URI
- *
- * @param convertedURI
- * The URI obtained after converting the ppe:/ URI to a standard URI
- * @return
- * The URIHandler corresponding to the converted URI
- */
- protected URIHandler getDelegateHandler(URI convertedURI) {
- if (convertedURI == null) {
- return null;
- }
-
- for (URIHandler handler : URIHandler.DEFAULT_HANDLERS) {
- if (handler.canHandle(convertedURI)) {
- return handler;
- }
- }
- return null;
- }
-
- /**
- * Converts the ppe:/ URI to a standard URI
- *
- * @param sourceURI
- * The ppe:/ URI to convert
- * @return
- * The standard URI
- */
- public URI getConvertedURI(URI sourceURI) {
- if (sourceURI == null) {
- throw new IllegalArgumentException("sourceURI shall not be null"); //$NON-NLS-1$
- }
- String firstSegment = sourceURI.segment(0);
- URI targetURI = URI.createURI(""); //$NON-NLS-1$
- if (firstSegment.equals(ENVIRONMENT_SEGMENT)) {
- for (int i = 1; i < sourceURI.segmentsList().size(); i++) {
- String segment = sourceURI.segmentsList().get(i);
- targetURI = targetURI.appendSegment(segment);
- }
- } else if (firstSegment.equals(CONTEXT_SEGMENT)) {
- for (int i = 1; i < sourceURI.segmentsList().size(); i++) {
- String segment = sourceURI.segmentsList().get(i);
- targetURI = targetURI.appendSegment(segment);
- }
- } else {
- throw new IllegalArgumentException(sourceURI + " is not a valid URI"); //$NON-NLS-1$
- }
-
- URI pluginURI = targetURI.resolve(URI.createURI("platform:/plugin/")); //$NON-NLS-1$
-
- if (!exists(pluginURI)) {
- URI workspaceURI = targetURI.resolve(URI.createURI("platform:/resource/")); //$NON-NLS-1$
- if (!exists(workspaceURI)) {
- URI preferenceURI = targetURI.resolve(URI.createFileURI(Activator.getDefault().getPreferencesPath().toString() + "/")); //$NON-NLS-1$
- if (!exists(preferenceURI)) {
- return null;
- }
- return preferenceURI;
- }
- return workspaceURI;
- }
-
- return pluginURI;
- }
-
- private boolean exists(URI uri) {
- for (URIHandler handler : DEFAULT_HANDLERS) {
- if (handler.canHandle(uri)) {
- return handler.exists(uri, Collections.EMPTY_MAP);
- }
- }
- return false;
- }
-
-}
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java index 0f482e07f9e..40743b07524 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EcorePropertyEditorFactory.java @@ -37,10 +37,10 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.window.Window;
import org.eclipse.papyrus.infra.emf.utils.EClassNameComparator;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.infra.ui.emf.dialog.NestedEditingDialogContext;
import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.papyrus.views.properties.messages.Messages;
import org.eclipse.papyrus.views.properties.providers.CreateInFeatureContentProvider;
import org.eclipse.swt.SWT;
@@ -55,8 +55,8 @@ import org.eclipse.swt.widgets.MenuItem; /**
* A ReferenceFactory used to instantiate and edit EObjects.
* The specified nsUri and ClassName are used to instantiate the EObject.
- * The matching {@link org.eclipse.papyrus.views.properties.contexts.View}s from all
- * applied {@link org.eclipse.papyrus.views.properties.contexts.Context}s are used to
+ * The matching {@link org.eclipse.papyrus.infra.properties.contexts.View}s from all
+ * applied {@link org.eclipse.papyrus.infra.properties.contexts.Context}s are used to
* display the right form to edit the EObject.
*
* If no EClass is specified, a list of all concrete subclasses of {@link #type} will be displayed before the instantiation.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EditionDialog.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EditionDialog.java index 297fb3246cb..f8a0436e93a 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EditionDialog.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/EditionDialog.java @@ -29,11 +29,11 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.Tab;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Context;
-import org.eclipse.papyrus.views.properties.contexts.Section;
-import org.eclipse.papyrus.views.properties.contexts.Tab;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.papyrus.views.properties.messages.Messages;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.papyrus.views.properties.runtime.DefaultDisplayEngine;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/PropertyEditorFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/PropertyEditorFactory.java index e7d163d5fd1..7a611673906 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/PropertyEditorFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/PropertyEditorFactory.java @@ -22,9 +22,9 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.infra.widgets.creation.IAtomicOperationExecutor;
import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.papyrus.views.properties.messages.Messages;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.papyrus.views.properties.runtime.ViewConstraintEngine;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/EnvironmentExtensionPoint.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/EnvironmentExtensionPoint.java deleted file mode 100644 index 49fc94f7220..00000000000 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/EnvironmentExtensionPoint.java +++ /dev/null @@ -1,53 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.views.properties.extensions;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.infra.constraints.runtime.ConstraintsManager;
-import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
-
-/**
- * Handles the extension point org.eclipse.papyrus.views.properties.environment
- * Registers the given Environment models to the Property View framework
- *
- * @author Camille Letavernier
- */
-public class EnvironmentExtensionPoint {
-
- private final String EXTENSION_ID = "org.eclipse.papyrus.views.properties.environment"; //$NON-NLS-1$
-
- /**
- *
- * Constructor.
- *
- */
- public EnvironmentExtensionPoint() {
- IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
-
- for (IConfigurationElement e : config) {
- final String environmentResource = e.getAttribute("environmentModel"); //$NON-NLS-1$
- URI uri = URI.createURI("ppe:/environment/" + e.getContributor().getName() + "/" + environmentResource); //$NON-NLS-1$ //$NON-NLS-2$
- //URI uri = URI.createPlatformPluginURI(e.getContributor().getName() + "/" + environmentResource, true); //$NON-NLS-1$
- try {
- ConfigurationManager.getInstance().addEnvironment(uri);
- ConstraintsManager.instance.addEnvironment(uri); // We also add it to the constraints extension point, which we "extend"
- } catch (IOException ex) {
- Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid " + "extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
- }
- }
- }
-}
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/DeployCustomizationHandler.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/DeployCustomizationHandler.java index 1ba3766312e..31661271f12 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/DeployCustomizationHandler.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/DeployCustomizationHandler.java @@ -30,8 +30,8 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Context;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/UndeployCustomizationHandler.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/UndeployCustomizationHandler.java index 5a36ecd6a06..e64748968cd 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/UndeployCustomizationHandler.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/UndeployCustomizationHandler.java @@ -30,8 +30,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Context;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/ContextExtensionPoint.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/internal/extensions/ContextBindingsExtensionPoint.java index de64bdb84e0..9217a5e4eae 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/ContextExtensionPoint.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/internal/extensions/ContextBindingsExtensionPoint.java @@ -1,118 +1,78 @@ -/*****************************************************************************
- * Copyright (c) 2015 CEA LIST, Christian W. Damus, and others.
- *
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - adds isVisible implementation
- * Christian W. Damus - bug 469188
- *
- *****************************************************************************/
-package org.eclipse.papyrus.views.properties.extensions;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
-
-/**
- * Handles the extension point org.eclipse.papyrus.views.properties.context
- * Registers the given Context models to the Property View framework
- *
- * @author Camille Letavernier
- */
-public class ContextExtensionPoint {
-
-
- /** The Constant IS_CUSTOMIZABLE. */
- private static final String IS_CUSTOMIZABLE = "isCustomizable";//$NON-NLS-1$
-
- /** The Constant IS_VISIBLE. */
- private static final String APPLIED_BY_DEFAULT = "appliedByDefault";//$NON-NLS-1$
-
- private static final String CONTEXT_MODEL = "contextModel"; //$NON-NLS-1$
-
- private static final String CONTEXT = "context"; //$NON-NLS-1$
-
- private static final String PREFPAGE_BINDING = "preferencePageBinding"; //$NON-NLS-1$
-
- private static final String PAGE = "page"; //$NON-NLS-1$
-
- /** The extension id. */
- private final String EXTENSION_ID = "org.eclipse.papyrus.views.properties.context"; //$NON-NLS-1$
-
- /**
- * Constructor
- */
- public ContextExtensionPoint() {
- IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID);
-
- for (IConfigurationElement e : config) {
- try {
- switch (e.getName()) {
- case CONTEXT:
- processContext(e);
- break;
- case PREFPAGE_BINDING:
- processPrefPageBinding(e);
- break;
- }
-
- } catch (IOException ex) {
- Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$
- } catch (Exception ex) {
- Activator.log.error(ex);
- }
- }
- }
-
- private void processContext(IConfigurationElement e) throws IOException {
- final String contextResource = e.getAttribute(CONTEXT_MODEL);
-
- final boolean isCustomizable;
- if (Arrays.asList(e.getAttributeNames()).contains(IS_CUSTOMIZABLE)) {
- isCustomizable = Boolean.parseBoolean(e.getAttribute(IS_CUSTOMIZABLE));
- } else {
- isCustomizable = true; // Default value
- }
-
- final boolean appliedByDefault;
- if (Arrays.asList(e.getAttributeNames()).contains(APPLIED_BY_DEFAULT)) {
- appliedByDefault = Boolean.parseBoolean(e.getAttribute(APPLIED_BY_DEFAULT));
- } else {
- appliedByDefault = true; // Default value
- }
-
- URI uri = URI.createURI("ppe:/context/" + e.getContributor().getName() + "/" + contextResource); //$NON-NLS-1$ //$NON-NLS-2$
-
- ConfigurationManager.getInstance().addContext(uri, appliedByDefault, isCustomizable);
- }
-
- private void processPrefPageBinding(IConfigurationElement config) {
- boolean valid = true;
-
- String context = config.getAttribute(CONTEXT);
- if ((context == null) || context.isEmpty()) {
- valid = false;
- Activator.log.warn(String.format("Missing context name in preference page binding extension in plug-in %s", config.getContributor().getName()));
- }
-
- String page = config.getAttribute(PAGE);
- if ((page == null) || page.isEmpty()) {
- valid = false;
- Activator.log.warn(String.format("Missing page ID in preference page binding extension in plug-in %s", config.getContributor().getName()));
- }
-
- if (valid) {
- ConfigurationManager.getInstance().registerPreferencePageBinding(context, page);
- }
- }
-}
+/***************************************************************************** + * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, and others. + * + * 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - adds isVisible implementation + * Christian W. Damus - bugs 469188, 485220 + * + *****************************************************************************/ +package org.eclipse.papyrus.views.properties.internal.extensions; + +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.Platform; +import org.eclipse.papyrus.views.properties.Activator; +import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; + +/** + * Handles the extension point <tt>org.eclipse.papyrus.views.properties.context</tt> + * Registers the given Context preference page bindings. + * + * @author Camille Letavernier + */ +public class ContextBindingsExtensionPoint { + + + private static final String PREFPAGE_BINDING = "preferencePageBinding"; //$NON-NLS-1$ + + private static final String CONTEXT = "context"; //$NON-NLS-1$ + + private static final String PAGE = "page"; //$NON-NLS-1$ + + /** The extension id. */ + private final String EXTENSION_ID = "org.eclipse.papyrus.views.properties.context"; //$NON-NLS-1$ + + /** + * Constructor + */ + public ContextBindingsExtensionPoint() { + IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_ID); + + for (IConfigurationElement e : config) { + try { + switch (e.getName()) { + case PREFPAGE_BINDING: + processPrefPageBinding(e); + break; + } + } catch (Exception ex) { + Activator.log.error(ex); + } + } + } + + private void processPrefPageBinding(IConfigurationElement config) { + boolean valid = true; + + String context = config.getAttribute(CONTEXT); + if ((context == null) || context.isEmpty()) { + valid = false; + Activator.log.warn(String.format("Missing context name in preference page binding extension in plug-in %s", config.getContributor().getName())); + } + + String page = config.getAttribute(PAGE); + if ((page == null) || page.isEmpty()) { + valid = false; + Activator.log.warn(String.format("Missing page ID in preference page binding extension in plug-in %s", config.getContributor().getName())); + } + + if (valid) { + ConfigurationManager.getInstance().registerPreferencePageBinding(context, page); + } + } +} diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AbstractModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AbstractModelElementFactory.java index ae45365f6eb..75916f3ad4b 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AbstractModelElementFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AbstractModelElementFactory.java @@ -12,7 +12,7 @@ */ package org.eclipse.papyrus.views.properties.modelelement; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; /** diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElementFactory.java index 7c998fe3f5e..d260454029c 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElementFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/AnnotationModelElementFactory.java @@ -17,8 +17,8 @@ import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
/**
* A ModelElementFactory for AnnotationModelElements
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSource.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSource.java index 9983cc43f2e..b3b40b74607 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSource.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSource.java @@ -29,6 +29,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.LabelProviderChangedEvent;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;
import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
@@ -36,7 +37,6 @@ import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; import org.eclipse.papyrus.infra.widgets.util.INameResolutionHelper;
import org.eclipse.papyrus.infra.widgets.util.IPapyrusConverter;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.swt.graphics.Image;
/**
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSourceFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSourceFactory.java index 0d5e148ecc3..9c3613b80cf 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSourceFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/DataSourceFactory.java @@ -20,13 +20,13 @@ import java.util.Map; import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextRoot;
+import org.eclipse.papyrus.infra.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.environment.ModelElementFactoryDescriptor;
import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
import org.eclipse.papyrus.infra.widgets.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Context;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.views.properties.contexts.DataContextRoot;
-import org.eclipse.papyrus.views.properties.contexts.View;
-import org.eclipse.papyrus.views.properties.environment.ModelElementFactoryDescriptor;
import org.eclipse.papyrus.views.properties.util.PropertiesUtil;
import org.eclipse.papyrus.views.properties.xwt.XWTSection;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElementFactory.java index b7046961463..e414871ec96 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElementFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/EMFModelElementFactory.java @@ -16,8 +16,8 @@ package org.eclipse.papyrus.views.properties.modelelement; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
/**
* A ModelElementFactory for creating {@link EMFModelElement}s
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/ModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/ModelElementFactory.java index b124e7c8846..3402aa2108d 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/ModelElementFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/ModelElementFactory.java @@ -11,7 +11,7 @@ *****************************************************************************/
package org.eclipse.papyrus.views.properties.modelelement;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
/**
* An interface representing ModelElementFactories.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/PreferencesModelElement.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/PreferencesModelElement.java index 7354f1e52a9..a3c1251cd13 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/PreferencesModelElement.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/PreferencesModelElement.java @@ -14,7 +14,7 @@ package org.eclipse.papyrus.views.properties.modelelement; import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
import org.eclipse.papyrus.views.properties.observable.PreferencesObservableValue;
import org.eclipse.ui.preferences.ScopedPreferenceStore;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/PreferencesModelElementFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/PreferencesModelElementFactory.java index 0edcc1a6912..45cf22436f1 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/PreferencesModelElementFactory.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/modelelement/PreferencesModelElementFactory.java @@ -13,7 +13,7 @@ *****************************************************************************/
package org.eclipse.papyrus.views.properties.modelelement;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
public class PreferencesModelElementFactory extends AbstractModelElementFactory<PreferencesModelElement> {
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/preferences/Preferences.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/preferences/Preferences.java index 7e8bfa77f0c..5e69b2b7c83 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/preferences/Preferences.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/preferences/Preferences.java @@ -30,7 +30,7 @@ import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.papyrus.views.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
import org.eclipse.papyrus.views.properties.messages.Messages;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationConflict;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationConflict.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationConflict.java index 2e692ec6ae1..e06cc64c144 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationConflict.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationConflict.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.views.properties.runtime; import java.util.LinkedList;
import java.util.List;
-import org.eclipse.papyrus.views.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
/**
* Represents a conflict in the applied Property view configurations
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationManager.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationManager.java index 5cd16104c9d..ad8b987d10d 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationManager.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationManager.java @@ -44,25 +44,26 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.ContextsFactory;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.Property;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.Tab;
+import org.eclipse.papyrus.infra.properties.environment.CompositeWidgetType;
+import org.eclipse.papyrus.infra.properties.environment.Environment;
+import org.eclipse.papyrus.infra.properties.environment.EnvironmentPackage;
+import org.eclipse.papyrus.infra.properties.environment.LayoutType;
+import org.eclipse.papyrus.infra.properties.environment.Namespace;
+import org.eclipse.papyrus.infra.properties.environment.PropertyEditorType;
+import org.eclipse.papyrus.infra.properties.environment.StandardWidgetType;
+import org.eclipse.papyrus.infra.properties.environment.Type;
+import org.eclipse.papyrus.infra.properties.environment.WidgetType;
+import org.eclipse.papyrus.infra.properties.internal.ContextExtensionPoint;
+import org.eclipse.papyrus.infra.properties.internal.EnvironmentExtensionPoint;
import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Context;
-import org.eclipse.papyrus.views.properties.contexts.ContextsFactory;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.views.properties.contexts.Property;
-import org.eclipse.papyrus.views.properties.contexts.Section;
-import org.eclipse.papyrus.views.properties.contexts.Tab;
-import org.eclipse.papyrus.views.properties.environment.CompositeWidgetType;
-import org.eclipse.papyrus.views.properties.environment.Environment;
-import org.eclipse.papyrus.views.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.views.properties.environment.LayoutType;
-import org.eclipse.papyrus.views.properties.environment.Namespace;
-import org.eclipse.papyrus.views.properties.environment.PropertyEditorType;
-import org.eclipse.papyrus.views.properties.environment.StandardWidgetType;
-import org.eclipse.papyrus.views.properties.environment.Type;
-import org.eclipse.papyrus.views.properties.environment.WidgetType;
-import org.eclipse.papyrus.views.properties.extensions.ContextExtensionPoint;
-import org.eclipse.papyrus.views.properties.extensions.EnvironmentExtensionPoint;
+import org.eclipse.papyrus.views.properties.internal.extensions.ContextBindingsExtensionPoint;
import org.eclipse.papyrus.views.properties.root.PropertiesRoot;
import org.eclipse.papyrus.views.properties.root.RootFactory;
import org.eclipse.papyrus.views.properties.runtime.preferences.ContextDescriptor;
@@ -153,8 +154,9 @@ public class ConfigurationManager { started = true;
- new ContextExtensionPoint();
- new EnvironmentExtensionPoint();
+ new ContextExtensionPoint(this::addContext);
+ new EnvironmentExtensionPoint(this::addEnvironment);
+ new ContextBindingsExtensionPoint();
loadCustomContexts();
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java index 0113bc847a2..dc066669fdf 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java @@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.catalog.PropertiesURIHandler;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.Tab;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.catalog.PropertiesURIHandler;
-import org.eclipse.papyrus.views.properties.contexts.Context;
-import org.eclipse.papyrus.views.properties.contexts.Section;
-import org.eclipse.papyrus.views.properties.contexts.Tab;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.papyrus.views.properties.modelelement.DataSource;
import org.eclipse.papyrus.views.properties.util.EMFURLStreamHandler;
import org.eclipse.papyrus.views.properties.xwt.XWTTabDescriptor;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DisplayEngine.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DisplayEngine.java index f740a6afbfc..9f994f15f96 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DisplayEngine.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DisplayEngine.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.Set;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.views.properties.contexts.Section;
-import org.eclipse.papyrus.views.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.views.properties.modelelement.DataSource;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/EmbeddedDisplayEngine.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/EmbeddedDisplayEngine.java index 8da8123e855..11d74ce12f5 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/EmbeddedDisplayEngine.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/EmbeddedDisplayEngine.java @@ -23,9 +23,9 @@ import java.util.Map; import java.util.Set;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.views.properties.contexts.Section;
-import org.eclipse.papyrus.views.properties.contexts.Tab;
-import org.eclipse.papyrus.views.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.Tab;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.views.properties.xwt.XWTSection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/PreferencesMigrator.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/PreferencesMigrator.java index ccafcc8077f..b51c2fdc3be 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/PreferencesMigrator.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/PreferencesMigrator.java @@ -17,8 +17,8 @@ import java.lang.reflect.Method; import java.util.Locale; import org.eclipse.osgi.util.NLS; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.views.properties.Activator; -import org.eclipse.papyrus.views.properties.contexts.Context; import org.eclipse.papyrus.views.properties.runtime.preferences.ContextDescriptor; import org.eclipse.papyrus.views.properties.runtime.preferences.Preferences; diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/SectionDiscriminator.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/SectionDiscriminator.java index 07dba74905e..db74c6f8775 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/SectionDiscriminator.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/SectionDiscriminator.java @@ -19,7 +19,7 @@ import java.lang.reflect.Proxy; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.papyrus.views.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.Section; /** * A proxy for {@link Section}s that distinguishes multiple occurrences of the same instance via an arbitrary discriminator. diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/TabModel.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/TabModel.java index 4159a28e7e6..ec7da7afdeb 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/TabModel.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/TabModel.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.papyrus.views.properties.contexts.Section; +import org.eclipse.papyrus.infra.properties.contexts.Section; /** diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngine.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngine.java index 948791567d2..205d88369e9 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngine.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngine.java @@ -16,8 +16,8 @@ import java.util.Set; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngine;
-import org.eclipse.papyrus.views.properties.contexts.Context;
-import org.eclipse.papyrus.views.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.View;
public interface ViewConstraintEngine extends ConstraintEngine<View> {
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngineImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngineImpl.java index 424facc1b67..96740132d25 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngineImpl.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngineImpl.java @@ -19,8 +19,8 @@ import java.util.Set; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
import org.eclipse.papyrus.infra.constraints.runtime.DefaultConstraintEngine;
-import org.eclipse.papyrus.views.properties.contexts.Context;
-import org.eclipse.papyrus.views.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.View;
/**
* The implementation for ViewConstraintEngine
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/AbstractContextStorageProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/AbstractContextStorageProvider.java index 969459012f0..42a45bea60d 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/AbstractContextStorageProvider.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/AbstractContextStorageProvider.java @@ -17,8 +17,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.views.properties.Activator; -import org.eclipse.papyrus.views.properties.contexts.Context; /** diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/ContextStorageRegistry.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/ContextStorageRegistry.java index 6a8e95026fa..7cb20248a28 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/ContextStorageRegistry.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/ContextStorageRegistry.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; import org.eclipse.emf.ecore.plugin.RegistryReader; import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.views.properties.Activator; -import org.eclipse.papyrus.views.properties.contexts.Context; /** * This is the ContextStorageRegistry type. Enjoy. diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/IContextStorageProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/IContextStorageProvider.java index a4593e08276..d969faf8b75 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/IContextStorageProvider.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/IContextStorageProvider.java @@ -16,7 +16,7 @@ import java.util.Collections; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; /** diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/IContextStorageProviderListener.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/IContextStorageProviderListener.java index b368ac5bd74..ce1557715f2 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/IContextStorageProviderListener.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/IContextStorageProviderListener.java @@ -13,7 +13,7 @@ package org.eclipse.papyrus.views.properties.storage; import java.util.Collection; -import org.eclipse.papyrus.views.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/workspace/WorkspaceContextStorageProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/workspace/WorkspaceContextStorageProvider.java index f824d0245a4..b337432cf50 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/workspace/WorkspaceContextStorageProvider.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/storage/workspace/WorkspaceContextStorageProvider.java @@ -23,8 +23,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.properties.contexts.Context; import org.eclipse.papyrus.views.properties.Activator; -import org.eclipse.papyrus.views.properties.contexts.Context; import org.eclipse.papyrus.views.properties.storage.AbstractContextStorageProvider; diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/util/PropertiesDisplayHelper.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/util/PropertiesDisplayHelper.java index 7ad2bfabd11..36d8a405c50 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/util/PropertiesDisplayHelper.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/util/PropertiesDisplayHelper.java @@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngine;
-import org.eclipse.papyrus.views.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.papyrus.views.properties.runtime.DisplayEngine;
import org.eclipse.papyrus.views.properties.runtime.EmbeddedDisplayEngine;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/util/PropertiesUtil.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/util/PropertiesUtil.java index efb98ab1bed..5ba66cbbda9 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/util/PropertiesUtil.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/util/PropertiesUtil.java @@ -19,12 +19,12 @@ import java.util.Set; import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextPackage;
+import org.eclipse.papyrus.infra.properties.contexts.Property;
+import org.eclipse.papyrus.infra.properties.environment.Namespace;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Context;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
-import org.eclipse.papyrus.views.properties.contexts.DataContextPackage;
-import org.eclipse.papyrus.views.properties.contexts.Property;
-import org.eclipse.papyrus.views.properties.environment.Namespace;
/**
* A Helper class for miscellaneous elements of the Property view framework
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java index 4e3d23f0d74..a2cea0c0eba 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java @@ -24,13 +24,13 @@ import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Property;
import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
import org.eclipse.papyrus.infra.widgets.editors.AbstractListEditor;
import org.eclipse.papyrus.infra.widgets.editors.AbstractValueEditor;
import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Context;
-import org.eclipse.papyrus.views.properties.contexts.Property;
import org.eclipse.papyrus.views.properties.modelelement.DataSource;
import org.eclipse.papyrus.views.properties.modelelement.DataSourceChangedEvent;
import org.eclipse.papyrus.views.properties.modelelement.IDataSourceListener;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/MultiReferenceEditorWithPropertyView.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/MultiReferenceEditorWithPropertyView.java index 6219107cf0a..7a34e93b3ff 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/MultiReferenceEditorWithPropertyView.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/MultiReferenceEditorWithPropertyView.java @@ -18,11 +18,11 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
import org.eclipse.papyrus.infra.widgets.editors.AbstractListEditor;
import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
import org.eclipse.papyrus.infra.widgets.editors.MultipleReferenceEditor;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.papyrus.views.properties.runtime.EmbeddedDisplayEngine;
import org.eclipse.swt.SWT;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java index 60e231c0522..3dc8589af66 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java @@ -25,12 +25,12 @@ import org.eclipse.core.databinding.observable.list.IObservableList; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.properties.contexts.Context;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.infra.tools.databinding.IMultipleObservableValue;
import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Context;
-import org.eclipse.papyrus.views.properties.contexts.Section;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.papyrus.views.properties.modelelement.DataSource;
import org.eclipse.papyrus.views.properties.modelelement.DataSourceChangedEvent;
import org.eclipse.papyrus.views.properties.modelelement.IDataSourceListener;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTSection.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTSection.java index 4eb0e5a4837..7ab6165545d 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTSection.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTSection.java @@ -25,10 +25,10 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.papyrus.infra.constraints.ConstraintDescriptor;
import org.eclipse.papyrus.infra.constraints.constraints.Constraint;
import org.eclipse.papyrus.infra.constraints.runtime.ConstraintFactory;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.infra.widgets.editors.EditorParentComposite;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Section;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.papyrus.views.properties.modelelement.DataSource;
import org.eclipse.papyrus.views.properties.modelelement.DataSourceFactory;
import org.eclipse.papyrus.views.properties.runtime.DisplayEngine;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTSectionDescriptor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTSectionDescriptor.java index 3b9d738af45..00244171ad3 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTSectionDescriptor.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTSectionDescriptor.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.views.properties.xwt;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.views.properties.contexts.Section;
-import org.eclipse.papyrus.views.properties.contexts.View;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.views.properties.runtime.DisplayEngine;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.views.properties.tabbed.AbstractSectionDescriptor;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptor.java index 74f2fdd285a..c4f3787efdb 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptor.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptor.java @@ -15,10 +15,10 @@ package org.eclipse.papyrus.views.properties.xwt; import java.util.List;
+import org.eclipse.papyrus.infra.properties.contexts.Section;
+import org.eclipse.papyrus.infra.properties.contexts.Tab;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.Section;
-import org.eclipse.papyrus.views.properties.contexts.Tab;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.papyrus.views.properties.runtime.DisplayEngine;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.views.properties.tabbed.AbstractTabDescriptor;
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptorProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptorProvider.java index 037c3f4c5cf..65bbf14b559 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptorProvider.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptorProvider.java @@ -27,8 +27,8 @@ import java.util.Set; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.papyrus.infra.constraints.runtime.ConstraintEngineListener;
import org.eclipse.papyrus.infra.constraints.runtime.ConstraintsChangedEvent;
+import org.eclipse.papyrus.infra.properties.contexts.View;
import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.View;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.papyrus.views.properties.runtime.DefaultDisplayEngine;
import org.eclipse.papyrus.views.properties.runtime.DisplayEngine;
|