Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2017-03-24 13:57:14 +0000
committerFlorian Noyrit2017-03-24 14:23:43 +0000
commitbed34aa30cdedbba9d0360f6e66af7c7a3010620 (patch)
treecd0b38dcccd4760896b4d440b7e286957ff2abdb /plugins/infra/ui
parent172c9b0b63ba3be2c93ff710a8b7b4d288db633e (diff)
downloadorg.eclipse.papyrus-bed34aa30cdedbba9d0360f6e66af7c7a3010620.tar.gz
org.eclipse.papyrus-bed34aa30cdedbba9d0360f6e66af7c7a3010620.tar.xz
org.eclipse.papyrus-bed34aa30cdedbba9d0360f6e66af7c7a3010620.zip
Bug 510451 - multiple fixes in architecture framework support
- Fix a typo in the name of the property ADElement::description - Fixed failing test cases - Enabled NLS markers in architecture framework genmodels - Changed the order of the switch architecture context menu actions - Removed confusing log message about elementtypeset registerd but not bound - Fixed new model wizard load template combo box - Fix AF API working when layout is saved locally Change-Id: Ifb509afcdffca348cd028094e181677b8f6d9ee4 Signed-off-by: Maged Elaasar <melaasar@gmail.com>
Diffstat (limited to 'plugins/infra/ui')
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml6
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/navigator/ViewpointFilter.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml
index b054f1d1de6..3bfb8f0a3c8 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/plugin.xml
@@ -68,11 +68,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?before=newelements">
- <separator
- name="architecture"
- visible="true">
- </separator>
+ locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=tools">
<command
commandId="org.eclipse.papyrus.infra.ui.architecture.commands.ChangeArchitectureContext"
icon="icons/full/obj16/ArchitectureContext.gif"
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/navigator/ViewpointFilter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/navigator/ViewpointFilter.java
index f7aa52d6320..2253cb01498 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/navigator/ViewpointFilter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/navigator/ViewpointFilter.java
@@ -17,6 +17,8 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableVersioningUtils;
import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
import org.eclipse.papyrus.infra.widgets.providers.AbstractTreeFilter;
@@ -40,7 +42,9 @@ public class ViewpointFilter extends AbstractTreeFilter {
public boolean isVisible(Viewer viewer, Object parentElement, Object element) {
if (element instanceof EObjectTreeElement) {
EObject eObj = ((EObjectTreeElement)element).getEObject();
- if (eObj instanceof Diagram || eObj instanceof Table) {
+ if (eObj instanceof Diagram && DiagramVersioningUtils.isOfCurrentPapyrusVersion((Diagram)eObj)) {
+ return ViewPrototype.get(eObj) != ViewPrototype.UNAVAILABLE_VIEW;
+ } else if (eObj instanceof Table && TableVersioningUtils.isOfCurrentPapyrusVersion((Table)eObj)) {
return ViewPrototype.get(eObj) != ViewPrototype.UNAVAILABLE_VIEW;
}
}

Back to the top