Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-12-02 05:39:15 -0500
committercletavernie2011-12-02 05:39:15 -0500
commit957670bd5a8486c43ae64bcf1236e97233f239b7 (patch)
tree3cf81351e56b0b363a3bc8b00ee5b192a39c59e1 /plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor
parent3e2ac08b16b65bfe3e5525879fa1a5a6f94190ee (diff)
downloadorg.eclipse.papyrus-957670bd5a8486c43ae64bcf1236e97233f239b7.tar.gz
org.eclipse.papyrus-957670bd5a8486c43ae64bcf1236e97233f239b7.tar.xz
org.eclipse.papyrus-957670bd5a8486c43ae64bcf1236e97233f239b7.zip
Merge the following revisions to the trunk : 6269, 6278-6280, 6284, 6293, 6299, 6330, 6332, 6333, 6335
364359: [Property View] The UML property view does not use the ServiceEdit https://bugs.eclipse.org/bugs/show_bug.cgi?id=364359 364583: [Property View - XWT Resource] Null pointer exception in the XWT Formatter https://bugs.eclipse.org/bugs/show_bug.cgi?id=364583 364588: [Property view - Widgets] There should be a widget for editing a set of File paths https://bugs.eclipse.org/bugs/show_bug.cgi?id=364588 364586: [Property View - UML] There should be a better support for editing UML Datatype instances https://bugs.eclipse.org/bugs/show_bug.cgi?id=364586 364588: [Property view - Widgets] There should be a widget for editing a set of File paths https://bugs.eclipse.org/bugs/show_bug.cgi?id=364588 364588: [Property view - Widgets] There should be a widget for editing a set of File paths https://bugs.eclipse.org/bugs/show_bug.cgi?id=364588 358077: [Property View - UML] The UML property view should be improved for usability concerns https://bugs.eclipse.org/bugs/show_bug.cgi?id=358077 364135: [Property View] Bad section refresh with dynamic sections https://bugs.eclipse.org/bugs/show_bug.cgi?id=364135 365281: [Property view] The constraints should be able to handle a global selection https://bugs.eclipse.org/bugs/show_bug.cgi?id=365281 365282: [UML - Property View] Edit the provided and required interfaces from the property view https://bugs.eclipse.org/bugs/show_bug.cgi?id=365282 365291: [Property View] BigListItems are ignored in ModelContentProvider https://bugs.eclipse.org/bugs/show_bug.cgi?id=365291 Also removed some empty folders
Diffstat (limited to 'plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor')
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF3
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsEditor.java2
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentEditor.java2
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/PropertiesEditorPlugin.java2
-rw-r--r--plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiEditor.java2
5 files changed, 10 insertions, 1 deletions
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
index ffde805488f..6190ffafa15 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.views.properties.model.edit;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.emf.ecore.editor;bundle-version="2.7.0"
Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsEditor.java
index c20e0efe206..b15d00abc95 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/contexts/presentation/ContextsEditor.java
@@ -166,6 +166,7 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
import org.eclipse.papyrus.views.properties.contexts.provider.ContextsItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesEditorPlugin;
import org.eclipse.papyrus.views.properties.environment.provider.EnvironmentItemProviderAdapterFactory;
import org.eclipse.papyrus.views.properties.ui.provider.UiItemProviderAdapterFactory;
@@ -708,6 +709,7 @@ public class ContextsEditor
adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ContextsItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new UiItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
// Create the command stack that will notify this editor as commands are executed.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentEditor.java
index 29998d6e56b..c67ce65b392 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/EnvironmentEditor.java
@@ -166,6 +166,7 @@ import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
import org.eclipse.papyrus.views.properties.contexts.provider.ContextsItemProviderAdapterFactory;
import org.eclipse.papyrus.views.properties.environment.provider.EnvironmentItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
import org.eclipse.papyrus.views.properties.ui.provider.UiItemProviderAdapterFactory;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -706,6 +707,7 @@ public class EnvironmentEditor
adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ContextsItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new UiItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
// Create the command stack that will notify this editor as commands are executed.
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/PropertiesEditorPlugin.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/PropertiesEditorPlugin.java
index b70d37cbaff..528406a51fb 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/PropertiesEditorPlugin.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/environment/presentation/PropertiesEditorPlugin.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.ui.EclipseUIPlugin;
import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
/**
* This is the central singleton for the Properties editor plugin.
@@ -49,6 +50,7 @@ public final class PropertiesEditorPlugin extends EMFPlugin {
public PropertiesEditorPlugin() {
super
(new ResourceLocator [] {
+ EcoreEditPlugin.INSTANCE,
});
}
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiEditor.java
index f9b019d9ce2..437049534ec 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.editor/src-gen/org/eclipse/papyrus/views/properties/ui/presentation/UiEditor.java
@@ -170,6 +170,7 @@ import org.eclipse.papyrus.views.properties.environment.presentation.PropertiesE
import org.eclipse.papyrus.views.properties.environment.provider.EnvironmentItemProviderAdapterFactory;
import org.eclipse.papyrus.views.properties.ui.provider.UiItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -708,6 +709,7 @@ public class UiEditor
adapterFactory.addAdapterFactory(new EnvironmentItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ContextsItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new UiItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
// Create the command stack that will notify this editor as commands are executed.

Back to the top