org.eventb.texteditor.feature/feature.xml

@@ -2,13 +2,14 @@
 <feature
       id="org.eventb.texteditor.feature"
       label="Camille TextEditor"
-      version="3.5.0.qualifier"
+      version="3.5.1.qualifier"
       provider-name="Heinrich-Heine University Dusseldorf"
       plugin="org.eventb.texteditor.ui">
 
    <description>
       A text editor for the Rodin platform to edit Event-B models
 --- Release History ---
+3.5.1 - Fix "Empty label" error when adding a variant to a machine
 3.5.0 - Compatibility with EventB-EMF 7.0.0 - fixes CamilleX dependency conflict. Fixed OOM error when top-level end keyword is missing.
 3.4.1 - Internal updates to the build process - no visible changes.
 3.4.0 - Release for Rodin 3.5 and related dependencies

org.eventb.texteditor.feature/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eventb.texteditor</groupId>
 		<artifactId>org.eventb.texteditor.parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>3.5.1-SNAPSHOT</version>
 		<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
 	</parent>
 

org.eventb.texteditor.parent/pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.eventb.texteditor</groupId>
 	<artifactId>org.eventb.texteditor.parent</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>3.5.1-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 

org.eventb.texteditor.parsers/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Parsers for Camille
 Bundle-SymbolicName: org.eventb.texteditor.parsers
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
 Bundle-Activator: org.eventb.texteditor.parsers.Activator
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

org.eventb.texteditor.parsers/pom.xml

@@ -6,7 +6,7 @@
 		<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
 		<groupId>org.eventb.texteditor</groupId>
 		<artifactId>org.eventb.texteditor.parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>3.5.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eventb.texteditor.parsers</artifactId>

org.eventb.texteditor.repository/category.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eventb.texteditor.feature_3.5.0.qualifier.jar" id="org.eventb.texteditor.feature" version="3.5.0.qualifier">
+   <feature url="features/org.eventb.texteditor.feature_3.5.1.qualifier.jar" id="org.eventb.texteditor.feature" version="3.5.1.qualifier">
       <category name="org.eventb.texteditor.feature.category"/>
    </feature>
 

org.eventb.texteditor.repository/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eventb.texteditor</groupId>
 		<artifactId>org.eventb.texteditor.parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>3.5.1-SNAPSHOT</version>
 		<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
 	</parent>
 

org.eventb.texteditor.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Camille Texteditor
 Bundle-SymbolicName: org.eventb.texteditor.ui;singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eventb.texteditor.ui.TextEditorPluginImplementation
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)",
@@ -16,11 +16,11 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)",
  org.eclipse.ui.workbench.texteditor,
  org.eventb.core;bundle-version="[3.1.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.1.0,4.0.0)",
- org.eventb.emf.core;bundle-version="[4.0.0,7.0.0)",
- org.eventb.emf.formulas;bundle-version="[1.4.0,3.0.0)",
- org.eventb.emf.persistence;bundle-version="[3.1.1,5.0.0)";visibility:=reexport,
- org.eventb.texteditor.parsers;bundle-version="[3.5.0,3.6.0)",
- org.eventb.texttools;bundle-version="[3.5.0,3.6.0)";visibility:=reexport,
+ org.eventb.emf.core;bundle-version="[5.0.0,7.0.0)",
+ org.eventb.emf.formulas;bundle-version="[1.5.0,3.0.0)",
+ org.eventb.emf.persistence;bundle-version="[3.6.0,5.0.0)";visibility:=reexport,
+ org.eventb.texteditor.parsers;bundle-version="[3.5.1,3.6.0)",
+ org.eventb.texttools;bundle-version="[3.5.1,3.6.0)";visibility:=reexport,
  org.eventb.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.rodinp.core;bundle-version="[1.7.0,2.0.0)",
  org.rodinp.keyboard.core;bundle-version="[2.0.0,3.0.0)",

org.eventb.texteditor.ui/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eventb.texteditor</groupId>
 		<artifactId>org.eventb.texteditor.parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>3.5.1-SNAPSHOT</version>
 		<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
 	</parent>
 

org.eventb.texttools/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Event-B EMF Texttools
 Bundle-SymbolicName: org.eventb.texttools;singleton:=true
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.5.1.qualifier
 Bundle-Activator: org.eventb.texttools.TextToolsPlugin
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
@@ -15,10 +15,10 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)",
  org.eventb.core;bundle-version="[3.1.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.1.0,4.0.0)",
- org.eventb.emf.core;bundle-version="[4.0.0,7.0.0)",
- org.eventb.emf.formulas;bundle-version="[1.4.0,3.0.0)",
- org.eventb.emf.persistence;bundle-version="[3.1.1,5.0.0)",
- org.eventb.texteditor.parsers;bundle-version="[3.5.0,3.6.0)",
+ org.eventb.emf.core;bundle-version="[5.0.0,7.0.0)",
+ org.eventb.emf.formulas;bundle-version="[1.5.0,3.0.0)",
+ org.eventb.emf.persistence;bundle-version="[3.6.0,5.0.0)",
+ org.eventb.texteditor.parsers;bundle-version="[3.5.1,3.6.0)",
  org.rodinp.core;bundle-version="[1.7.0,2.0.0)"
 Bundle-Vendor: Heinrich-Heine University Dusseldorf
 Bundle-ClassPath: .

org.eventb.texttools/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eventb.texteditor</groupId>
 		<artifactId>org.eventb.texteditor.parent</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
+		<version>3.5.1-SNAPSHOT</version>
 		<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
 	</parent>
 

org.eventb.texttools/src/org/eventb/texttools/internal/parsing/TransformationVisitor.java

@@ -11,29 +11,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Stack;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eventb.emf.core.EventBCommented;
-import org.eventb.emf.core.EventBElement;
-import org.eventb.emf.core.EventBNamed;
-import org.eventb.emf.core.EventBNamedCommentedPredicateElement;
-import org.eventb.emf.core.EventBObject;
-import org.eventb.emf.core.context.Axiom;
-import org.eventb.emf.core.context.Context;
-import org.eventb.emf.core.context.ContextFactory;
-import org.eventb.emf.core.machine.Action;
-import org.eventb.emf.core.machine.Convergence;
-import org.eventb.emf.core.machine.Event;
-import org.eventb.emf.core.machine.Guard;
-import org.eventb.emf.core.machine.Invariant;
-import org.eventb.emf.core.machine.Machine;
-import org.eventb.emf.core.machine.MachineFactory;
-import org.eventb.emf.core.machine.Variant;
-import org.eventb.texttools.TextPositionUtil;
-import org.eventb.texttools.model.texttools.TextRange;
-import org.eventb.texttools.model.texttools.TexttoolsFactory;
-
 import de.be4.eventb.core.parser.analysis.DepthFirstAdapter;
 import de.be4.eventb.core.parser.node.AAction;
 import de.be4.eventb.core.parser.node.AAnticipatedConvergence;
@@ -67,6 +44,30 @@ import de.hhu.stups.sablecc.patch.IToken;
 import de.hhu.stups.sablecc.patch.PositionedNode;
 import de.hhu.stups.sablecc.patch.SourcePosition;
 
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eventb.core.IVariant;
+import org.eventb.emf.core.EventBCommented;
+import org.eventb.emf.core.EventBElement;
+import org.eventb.emf.core.EventBNamed;
+import org.eventb.emf.core.EventBNamedCommentedPredicateElement;
+import org.eventb.emf.core.EventBObject;
+import org.eventb.emf.core.context.Axiom;
+import org.eventb.emf.core.context.Context;
+import org.eventb.emf.core.context.ContextFactory;
+import org.eventb.emf.core.machine.Action;
+import org.eventb.emf.core.machine.Convergence;
+import org.eventb.emf.core.machine.Event;
+import org.eventb.emf.core.machine.Guard;
+import org.eventb.emf.core.machine.Invariant;
+import org.eventb.emf.core.machine.Machine;
+import org.eventb.emf.core.machine.MachineFactory;
+import org.eventb.emf.core.machine.Variant;
+import org.eventb.texttools.TextPositionUtil;
+import org.eventb.texttools.model.texttools.TextRange;
+import org.eventb.texttools.model.texttools.TexttoolsFactory;
+
 public class TransformationVisitor extends DepthFirstAdapter {
 
 	private IDocument document;
@@ -217,6 +218,9 @@ public class TransformationVisitor extends DepthFirstAdapter {
 		TextPositionUtil.annotatePosition(newNode, createTextRange(node));
 
 		handleComment(newNode, node.getComments());
+		// Work around an Event-B EMF bug that sets an explicit empty label and suppresses the default label.
+		// TODO Allow a label here in the Camille grammar?
+		newNode.setName(IVariant.DEFAULT_LABEL);
 
 		final TFormula exprToken = node.getExpression();
 		final String exprString = exprToken.getText();

org.eventb.texttools/src/org/eventb/texttools/prettyprint/MachinePrintSwitch.java

@@ -251,7 +251,7 @@ public class MachinePrintSwitch extends MachineSwitch<Boolean> implements
 				printer.appendLineBreak();
 			}
 
-			printer.appendWithLineBreak(VARIANT);
+			printer.appendWithSpace(VARIANT);
 			printer.increaseIndentLevel();
 
 			for (final Variant variant : variants) {