Merge "Bug 553171 - [Moka-Incubation][Libraries] Some libraries provide by Moka-Incubation seems not usefull"
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ConnectorConstraint.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ConnectorConstraint.java
index 0e1b924..fc4cb31 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ConnectorConstraint.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/validation/ConnectorConstraint.java
@@ -104,6 +104,9 @@
 				
 				return problems.isEmpty()? ctx.createSuccessStatus() :
 		            ConstraintStatus.createMultiStatus(ctx, problems);
+			}else if (fmiPort1 == null && fmiPort2 != null || fmiPort1 != null && fmiPort2 ==null) {
+				String message =   "Can't mix ports and busses";
+				return ConstraintStatus.createStatus(ctx, Arrays.asList(part1, role1, part2, role2),message);
 			}
 			
 		}
diff --git a/features/org.eclipse.papyrus.moka.annotations.feature/feature.properties b/features/org.eclipse.papyrus.moka.annotations.feature/feature.properties
index c285d25..caed53b 100644
--- a/features/org.eclipse.papyrus.moka.annotations.feature/feature.properties
+++ b/features/org.eclipse.papyrus.moka.annotations.feature/feature.properties
@@ -15,7 +15,7 @@
 providerName=Eclipse Modeling Project 
 
 # description property - text of the "Feature Description"
-description=MOKA custom fUML libraries annotation tools
+description=Model library generator (based on java annotations) for Executable UML.
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties b/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties
index db4738a..f8e64ad 100644
--- a/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties
+++ b/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties
@@ -15,7 +15,7 @@
 providerName=Eclipse Modeling Project 
 
 # description property - text of the "Feature Description"
-description=FMI 2.0 based cosimulation in Papyrus
+description=FMI standard for co-simulation implementation and integration.
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.properties b/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.properties
index 97f7acc..3c36a7e 100644
--- a/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.properties
+++ b/features/org.eclipse.papyrus.moka.fmi.scripting.feature/feature.properties
@@ -15,7 +15,7 @@
 providerName=Eclipse Modeling Project 
 
 # description property - text of the "Feature Description"
-description=Moka Scripting (Incubation)
+description=Helpers to simplify the control of Moka engine with scripting languages, and integration of a Scripting language editor in Papyrus properties view.
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.properties b/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.properties
index 06b56aa..1c6dd9f 100644
--- a/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.properties
+++ b/features/org.eclipse.papyrus.moka.instancespecification.feature/feature.properties
@@ -15,7 +15,7 @@
 providerName=Eclipse Modeling Project 
 
 # description property - text of the "Feature Description"
-description=Moka instance specification tools
+description=Libraries to efficiently manage and edit UML instance specifications.
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.papyrus.moka.parametric.feature/feature.properties b/features/org.eclipse.papyrus.moka.parametric.feature/feature.properties
index 3c7174f..57c1524 100644
--- a/features/org.eclipse.papyrus.moka.parametric.feature/feature.properties
+++ b/features/org.eclipse.papyrus.moka.parametric.feature/feature.properties
@@ -15,7 +15,7 @@
 providerName=Eclipse Modeling Project 
 
 # description property - text of the "Feature Description"
-description=Moka Parametric
+description=Execution engine for SysML parametrics, using Python or JavaScript as equation language.
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.papyrus.moka.simex.feature/feature.properties b/features/org.eclipse.papyrus.moka.simex.feature/feature.properties
index 02288c2..0ec2883 100644
--- a/features/org.eclipse.papyrus.moka.simex.feature/feature.properties
+++ b/features/org.eclipse.papyrus.moka.simex.feature/feature.properties
@@ -15,7 +15,7 @@
 providerName=Eclipse Modeling Project 
 
 # description property - text of the "Feature Description"
-description=MOKA Simex tools
+description=Papyrus helpers to boost executable UML models design.
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.papyrus.moka.visualization.feature/feature.properties b/features/org.eclipse.papyrus.moka.visualization.feature/feature.properties
index d2bd72e..401ffed 100644
--- a/features/org.eclipse.papyrus.moka.visualization.feature/feature.properties
+++ b/features/org.eclipse.papyrus.moka.visualization.feature/feature.properties
@@ -15,7 +15,7 @@
 providerName=Eclipse Modeling Project 
 
 # description property - text of the "Feature Description"
-description=MOKA visualization tools
+description=Nebula XY Graph integration in Papyrus (UI) / UML profile enabling time series modeling.
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"