diff options
| author | cletavernie | 2012-01-12 16:33:35 +0000 |
|---|---|---|
| committer | cletavernie | 2012-01-12 16:33:35 +0000 |
| commit | aaa0f0a63bf9890ee7911e638a41d8b721d7c2fd (patch) | |
| tree | c3a0567c109cba2de3406ef18fc683e569603484 /plugins/customization | |
| parent | 76fbe55c1db8045c1be47e31f59296ecac6ae157 (diff) | |
| download | org.eclipse.papyrus-aaa0f0a63bf9890ee7911e638a41d8b721d7c2fd.tar.gz org.eclipse.papyrus-aaa0f0a63bf9890ee7911e638a41d8b721d7c2fd.tar.xz org.eclipse.papyrus-aaa0f0a63bf9890ee7911e638a41d8b721d7c2fd.zip | |
359794: [UML - Tools] Content/Label providers
https://bugs.eclipse.org/bugs/show_bug.cgi?id=359794
Diffstat (limited to 'plugins/customization')
7 files changed, 18 insertions, 14 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml index 67ef5f92eb1..6774a9d3314 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.xml @@ -34,7 +34,7 @@ </environment>
</extension>
<extension point="org.eclipse.papyrus.views.properties.context">
- <context contextModel="Model/Customization.ctx" loadDefault="true">
+ <context contextModel="Model/Customization.ctx">
</context>
</extension>
<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java index 4e232a3ff2a..90a70c41652 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/ContextEditorActionBarContributor.java @@ -225,7 +225,7 @@ public class ContextEditorActionBarContributor extends EcoreActionBarContributor * The list of newly created {@link IAction}s
*/
protected Collection<IAction> createChildForView(ISelection selection, View view) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
// Collection<IAction> actions = new LinkedList<IAction>();
// if(view.getContext() == null) {
// return actions;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java index e9d6f0f073e..7bc2139cb37 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ConstraintDescriptorContentProvider.java @@ -70,4 +70,8 @@ public class ConstraintDescriptorContentProvider extends AbstractContextualConte return result;
}
+ public Object[] getElements(Object inputElement) {
+ return getElements();
+ }
+
}
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java index eafd418e3bd..c48fa4efd1e 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DataContextElementContentProvider.java @@ -120,4 +120,8 @@ public class DataContextElementContentProvider extends AbstractFilteredContentPr return elements.toArray(new DataContextElement[elements.size()]);
}
+ public Object[] getElements(Object inputElement) {
+ return getElements();
+ }
+
}
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java index 9522d188aae..e070c7ab8d9 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java @@ -49,4 +49,8 @@ public class EnvironmentContentProvider extends AbstractFilteredContentProvider return contents;
}
+ public Object[] getElements(Object inputElement) {
+ return getElements();
+ }
+
}
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java index 5e24b035403..50541fdfb33 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/PropertyContentProvider.java @@ -11,7 +11,6 @@ *****************************************************************************/
package org.eclipse.papyrus.customization.properties.providers;
-import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -45,17 +44,6 @@ public class PropertyContentProvider extends AbstractContextualContentProvider i return contexts.toArray();
}
- private Collection<Property> findProperties(DataContextElement element) {
- List<Property> result = new LinkedList<Property>();
- result.addAll(element.getProperties());
- if(element instanceof DataContextPackage) {
- for(DataContextElement subElement : ((DataContextPackage)element).getElements()) {
- result.addAll(findProperties(subElement));
- }
- }
- return result;
- }
-
public Object[] getElements(Object inputElement) {
return getElements();
}
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java index 97394acc087..e50515b6b62 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java @@ -58,4 +58,8 @@ public class TabContentProvider extends AbstractContextualContentProvider { return true;
}
+ public Object[] getElements(Object inputElement) {
+ return getElements();
+ }
+
}
|