Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/facet')
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java22
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore7
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/plugin.xml4
-rw-r--r--plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/schema/modeldeclaration.exsd (renamed from plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd)0
4 files changed, 17 insertions, 16 deletions
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java
index 7c55f248153..03f85f9b10d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/CustomizedTreeContentProvider.java
@@ -53,7 +53,7 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
private final IContentPropertiesHandler contentHandler;
private Object previousInput;
private Object[] rootElements;
-
+
private final Map<EObjectCacheElement, TreeElement> cache;
private class EObjectCacheElement {
@@ -309,7 +309,7 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
return result;
}
-
+
private Collection<? extends Object> createReferenceProxies(final List<EReference> allReferences, final EObjectTreeElement parent) {
final EObject eObject = parent.getEObject();
@@ -325,7 +325,7 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
else{
System.err.println("Do not Create an eReference"+ eReference+" create directly its childreen");
}
-
+
}
}
return result;
@@ -344,7 +344,7 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
return getChildren(element).length > 0;
}
-
+
public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {
// nothing to do
@@ -379,9 +379,9 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
}
return result.booleanValue();
}
-
-
-
+
+
+
private Collection<? extends Object> createReferences(final EObjectTreeElement treeElement) {
final EObject eObject = treeElement.getEObject();
final EClass eClass = eObject.eClass();
@@ -433,9 +433,11 @@ public class CustomizedTreeContentProvider implements ICustomizedTreeContentProv
List<TreeElement> result = new LinkedList<TreeElement>();
for(EAttribute eAttribute : allAttributes) {
- TreeElement eAttributeTreeElement = getEAttributeProxy(eAttribute, treeElement);
- if(eAttributeTreeElement != null) {
- result.add(eAttributeTreeElement);
+ if(isVisible(eObject, eAttribute)) {
+ TreeElement eAttributeTreeElement = getEAttributeProxy(eAttribute, treeElement);
+ if(eAttributeTreeElement != null) {
+ result.add(eAttributeTreeElement);
+ }
}
}
return result;
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore
index abfe156bb49..aef41489788 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacet-0.2.0.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="efacet"
- nsURI="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet" nsPrefix="efacet">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="efacet" nsURI="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"
+ nsPrefix="efacet">
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
<details key="validationDelegates" value="org.eclipse.ocl.ecore.OCL"/>
</eAnnotations>
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/plugin.xml
index 70f247917db..6cbede919c4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/plugin.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/plugin.xml
@@ -16,8 +16,8 @@
-->
<plugin>
<extension-point id="modelViewer" name="%model.viewer.extension-point.name" schema="schema/modelViewer.exsd"/>
- <extension-point id="org.eclipse.papyrus.emf.facet.util.emf.core.catalogmanager" name="%extension-point.name" schema="schema/catalogmanager.exsd"/>
- <extension-point id="org.eclipse.papyrus.emf.facet.util.emf.core.modeldeclaration" name="%extension-point.name.0" schema="schema/org.eclipse.papyrus.emf.facet.util.emf.core.modeldeclaration.exsd"/>
+ <extension-point id="catalogmanager" name="%extension-point.name" schema="schema/catalogmanager.exsd"/>
+ <extension-point id="modeldeclaration" name="%extension-point.name.0" schema="schema/modeldeclaration.exsd"/>
<extension-point id="serialization" name="%serialization.extension-point.name" schema="schema/serialization.exsd"/>
<extension
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/schema/modeldeclaration.exsd
index 74b74ace336..74b74ace336 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/schema/modeldeclaration.exsd

Back to the top