PROBPLUGIN-35

de.prob.ui/plugin.xml

@@ -563,23 +563,6 @@
       </with>
             </enabledWhen>
       </handler>
-      <handler
-            commandId="de.prob.ui.classic.export">
-         <class
-               class="de.prob.ui.eventb.ExportClassicHandler">
-         </class>
-                              <enabledWhen>
-      <with
-            variable="selection">
-         <iterate
-               operator="or">
-            <instanceof
-                  value="org.eventb.core.IEventBRoot">
-            </instanceof>
-         </iterate>
-      </with>
-            </enabledWhen>
-      </handler>
       <handler
             commandId="de.prob.ui.classic.open">
          <class
@@ -995,7 +978,7 @@
                </with>
             </visibleWhen>
             <command
-                  commandId="de.prob.ui.classic.export"
+                  commandId="de.prob.ui.newcore.export"
                   icon="icons/prob_mini_logo.gif"
                   label="Export for use in ProB classic"
                   style="push">
@@ -1006,12 +989,6 @@
                   label="Open in ProB classic"
                   style="push">
             </command>
-            <command
-                  commandId="de.prob.ui.newcore.export"
-                  icon="icons/prob_mini_logo.gif"
-                  label="Export for new core (experimental)"
-                  style="push">
-            </command>
          </menu>
          <separator
                name="de.prob.ui.separator1"

de.prob.ui/src/de/prob/ui/eventb/ExportClassicHandler.java

@@ -28,6 +28,11 @@ import de.prob.core.translator.TranslationFailedException;
 import de.prob.eventb.translator.TranslatorFactory;
 import de.prob.logging.Logger;
 
+/**
+ * @author bendisposto
+ * @deprecated Use ExpprtNewCoreHandler instead
+ */
+@Deprecated
 public class ExportClassicHandler extends AbstractHandler implements IHandler {
 
 	public Object execute(final ExecutionEvent event) throws ExecutionException {

de.prob.ui/src/de/prob/ui/eventb/ExportNewCoreHandler.java

 package de.prob.ui.eventb;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -18,7 +17,6 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -30,7 +28,6 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eventb.core.IEventBRoot;
 import org.eventb.core.IMachineRoot;
-import org.eventb.emf.core.EventBNamedCommentedComponentElement;
 import org.eventb.emf.core.Project;
 import org.eventb.emf.persistence.ProjectResource;
 import org.osgi.service.prefs.BackingStoreException;

de.prob.ui/src/de/prob/ui/eventb/OpenClassicHandler.java

@@ -35,8 +35,7 @@ public class OpenClassicHandler extends AbstractHandler implements IHandler {
 			if (root != null) {
 				final File temp = createTempFile();
 				final String tmp = temp.getAbsolutePath();
-				ExportClassicHandler.exportToClassic(tmp, root);
-
+				ExportNewCoreHandler.exportToClassic(tmp, root);
 				runProBClassic(location, tmp);
 			}
 		}