merge

org.eventb.texteditor.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eventb.texteditor.feature"
       label="Camille TextEditor"
-      version="3.1.1.qualifier"
+      version="3.1.2.qualifier"
       provider-name="Heinrich-Heine University Dusseldorf"
       plugin="org.eventb.texteditor.ui">
 
@@ -10,6 +10,7 @@
       A text editor for the Rodin platform to edit Event-B models
 -----------------------------------------------------------
 Release History:
+3.1.2 - Fix some more bugs regarding theory parsing, fix saving changes to seen contexts.
 3.1.1 - Fix parsing of theory operators with more than one operand
 3.1.0 - Initial release for Rodin 3.1
 3.0.3 - Fix bugs / regressions intruduces by the Rodin 3.0 migration
@@ -188,21 +189,21 @@ Inc. in the United States, other countries, or both.
          id="org.eventb.texteditor.ui"
          download-size="0"
          install-size="0"
-         version="3.1.1.qualifier"
+         version="3.1.2.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eventb.texttools"
          download-size="0"
          install-size="0"
-         version="3.1.1.qualifier"
+         version="3.1.2.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.eventb.texteditor.parsers"
          download-size="0"
          install-size="0"
-         version="3.1.1.qualifier"
+         version="3.1.2.qualifier"
          unpack="false"/>
 
 </feature>

org.eventb.texteditor.feature/pom.xml

@@ -6,11 +6,11 @@
 		<parent>
 			<groupId>org.eventb.texteditor</groupId>
 			<artifactId>org.eventb.texteditor.parent</artifactId>
-			<version>3.1.1.qualifier</version>
+			<version>3.1.2.qualifier</version>
 			<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
 		</parent>
 		<groupId>org.eventb.texteditor</groupId>
 		<artifactId>org.eventb.texteditor.feature</artifactId>
-		<version>3.1.1.qualifier</version>
+		<version>3.1.2.qualifier</version>
 		<packaging>eclipse-feature</packaging>
 	</project>

org.eventb.texteditor.parent/pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.eventb.texteditor</groupId>
   	<artifactId>org.eventb.texteditor.parent</artifactId>
-  	<version>3.1.1.qualifier</version>
+  	<version>3.1.2.qualifier</version>
 
 	<packaging>pom</packaging>
 

org.eventb.texteditor.parsers/build.gradle

@@ -2,10 +2,6 @@ apply plugin: 'java'
 
 repositories {
         mavenCentral()
-	maven {
-		name "cobra"
-		url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo"
-	}
 }
 
 def parser_version = '2.4.40'

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.1.1.qualifier</version>
+    <version>3.1.2.qualifier</version>
   </parent>
 
   <artifactId>org.eventb.texteditor.parsers</artifactId>

org.eventb.texteditor.repository/category.xml

@@ -2,7 +2,7 @@
 <site>
 
 
-	<feature url="features/org.eventb.texteditor.feature_3.1.1.qualifier.jar" id="org.eventb.texteditor.feature" version="3.1.1.qualifier">
+	<feature url="features/org.eventb.texteditor.feature_3.1.2.qualifier.jar" id="org.eventb.texteditor.feature" version="3.1.2.qualifier">
 		<category name="org.eventb.texteditor.feature.category"/>
 	</feature>
 

org.eventb.texteditor.repository/pom.xml

@@ -6,14 +6,14 @@
     <parent>
       <groupId>org.eventb.texteditor</groupId>
       <artifactId>org.eventb.texteditor.parent</artifactId>
-      <version>3.1.1.qualifier</version>
+      <version>3.1.2.qualifier</version>
       <relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
     </parent>
 
 
     <groupId>org.eventb.texteditor</groupId>
     <artifactId>org.eventb.texteditor.repository</artifactId>
-    <version>3.1.1.qualifier</version>
+    <version>3.1.2.qualifier</version>
     <packaging>eclipse-repository</packaging>
 
 

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.1.1.qualifier
+Bundle-Version: 3.1.2.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eventb.texteditor.ui.TextEditorPluginImplementation
 Require-Bundle: org.eventb.texttools;bundle-version="[3.1.0,3.2.0)";visibility:=reexport,

org.eventb.texteditor.ui/pom.xml

@@ -6,14 +6,13 @@
 		<parent>
 			<groupId>org.eventb.texteditor</groupId>
 			<artifactId>org.eventb.texteditor.parent</artifactId>
-			<version>3.1.1.qualifier</version>
+			<version>3.1.2.qualifier</version>
 			<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
 		</parent>
 
 		<groupId>org.eventb.texteditor</groupId>
 		<artifactId>org.eventb.texteditor.ui</artifactId>
-		<version>3.1.1.qualifier</version>
+		<version>3.1.2.qualifier</version>
 		<packaging>eclipse-plugin</packaging>
 
 	</project>
-	

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.1.1.qualifier
+Bundle-Version: 3.1.2.qualifier
 Bundle-Activator: org.eventb.texttools.TextToolsPlugin
 Require-Bundle: org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)",
  org.eventb.emf.formulas;bundle-version="[1.4.0,2.0.0)",

org.eventb.texttools/pom.xml

@@ -6,14 +6,13 @@
 		<parent>
 			<groupId>org.eventb.texteditor</groupId>
 			<artifactId>org.eventb.texteditor.parent</artifactId>
-			<version>3.1.1.qualifier</version>
+			<version>3.1.2.qualifier</version>
 			<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
 		</parent>
 
 		<groupId>org.eventb.texteditor</groupId>
 		<artifactId>org.eventb.texttools</artifactId>
-		<version>3.1.1.qualifier</version>
+		<version>3.1.2.qualifier</version>
 		<packaging>eclipse-plugin</packaging>
 
 	</project>
-