Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-02-17 08:46:39 -0500
committerCamille Letavernier2014-02-17 09:04:21 -0500
commit486f94f98343d30f35398005eec21d23af83f64d (patch)
tree0928d168d7d6b2f1cc9ff0469a3024f01e313d6c
parentc751aa7f4cbb644019fa2367b63bf661a9aa2080 (diff)
downloadorg.eclipse.papyrus-486f94f98343d30f35398005eec21d23af83f64d.tar.gz
org.eclipse.papyrus-486f94f98343d30f35398005eec21d23af83f64d.tar.xz
org.eclipse.papyrus-486f94f98343d30f35398005eec21d23af83f64d.zip
417396: [CSS] The CSS Engine shall support label visibility & mask
https://bugs.eclipse.org/bugs/show_bug.cgi?id=417396 - Fix regressions: the Slots compartment is now visible by default in SysML BDD
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml8
-rw-r--r--tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java12
2 files changed, 16 insertions, 4 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
index f24aa0791a9..1e8cbebb084 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
@@ -1618,6 +1618,14 @@
humanReadableType="TargetRole"
type="linklabel_uml_association_target_role">
</mapping>
+ <mapping
+ humanReadableType="slots"
+ type="7001">
+ </mapping>
+ <mapping
+ humanReadableType="slots"
+ type="7035">
+ </mapping>
</diagramMappings>
</extension>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java
index eeb2ddbdaa8..09cccf1cd39 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java
@@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- *
+ *
* CEA LIST - Initial API and implementation
*
*****************************************************************************/
@@ -43,6 +43,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
@@ -61,6 +62,9 @@ public class TestPrepareUtils {
SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());
//getCommandStack().execute(new EMFtoGEFCommandWrapper(changeVisibilityCommand));
getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);
+
+ //Workaround for CSS refresh issue (Bug 416737: [CSS] Setters of the CSS runtime notation API don't take into consideration CSS values)
+ DiagramHelper.refresh(EditorUtils.getDiagramEditPart(), true);
}
public static EObject createElement(IElementType elementType, View containerView) throws Exception {
@@ -123,7 +127,7 @@ public class TestPrepareUtils {
EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
@SuppressWarnings("unchecked")
- Collection<View> views = (Collection<View>)EMFCoreUtil.getReferencers(newObject, erefs);
+ Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
return (View)views.toArray()[0];
}
@@ -143,7 +147,7 @@ public class TestPrepareUtils {
EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
@SuppressWarnings("unchecked")
- Collection<View> views = (Collection<View>)EMFCoreUtil.getReferencers(newView, erefs);
+ Collection<View> views = EMFCoreUtil.getReferencers(newView, erefs);
return (View)views.toArray()[0];
@@ -190,7 +194,7 @@ public class TestPrepareUtils {
EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
@SuppressWarnings("unchecked")
- Collection<View> views = (Collection<View>)EMFCoreUtil.getReferencers(eObject, erefs);
+ Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);
return (View)views.toArray()[0];
}

Back to the top