Просмотр исходного кода

Removed SGraphLoad for compatibility with old meta models

Andreas Mülder 13 лет назад
Родитель
Сommit
1142575b2c

+ 0 - 1
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/SGraphFactoryImpl.java

@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.yakindu.sct.model.sgraph.*;
 import org.yakindu.sct.model.sgraph.Choice;
 import org.yakindu.sct.model.sgraph.ChoiceKind;
 import org.yakindu.sct.model.sgraph.Entry;

+ 0 - 8
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/SGraphPackageImpl.java

@@ -10,21 +10,13 @@
  */
 package org.yakindu.sct.model.sgraph.impl;
 
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
 import org.yakindu.base.base.BasePackage;
 import org.yakindu.sct.model.sgraph.Choice;
 import org.yakindu.sct.model.sgraph.ChoiceKind;

+ 0 - 5
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/resource/SGraphInjectMembersResource.java

@@ -25,7 +25,6 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.IQualifiedNameProvider;
 import org.eclipse.xtext.resource.IEObjectDescription;
@@ -62,10 +61,6 @@ public class SGraphInjectMembersResource extends InjectMembersResource {
 		super(uri);
 	}
 
-	protected XMLLoad createXMLLoad() {
-		return new SGraphLoad(createXMLHelper());
-	}
-
 	@Override
 	public void doLoad(InputStream inputStream, Map<?, ?> options)
 			throws IOException {

+ 0 - 80
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/resource/SGraphLoad.java

@@ -1,80 +0,0 @@
-package org.yakindu.sct.model.sgraph.resource;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFLoad;
-
-/**
- * 
- * @author andreas muelder - Initial contribution and API
- * 
- */
-public class SGraphLoad extends GMFLoad {
-
-	private static final String NS_URI_TO_MIGRATE = "http://www.yakindu.org/sct/2.0.0";
-
-	public SGraphLoad(XMLHelper helper) {
-		super(helper);
-	}
-
-	@Override
-	public void load(XMLResource r, InputStream s,
-			@SuppressWarnings("rawtypes") Map o) throws IOException {
-		IFile file = WorkspaceSynchronizer.getFile(r);
-		if (file != null) {
-			String osString = file.getLocation().makeAbsolute().toOSString();
-			String filecontent = readFileAsString(osString);
-			// TODO: on check the first line for old ns uri, not neccessary to
-			// read
-			// the whole file content
-			if (filecontent.contains(NS_URI_TO_MIGRATE)) {
-				filecontent = migratePreM10Models(filecontent);
-				BufferedWriter writer = new BufferedWriter(new FileWriter(
-						osString));
-				writer.write(filecontent);
-				writer.flush();
-				writer.close();
-			}
-		}
-		super.load(r, s, o);
-	}
-
-	/**
-	 * Migrate the following Model changes:
-	 * 
-	 * <pre>
-	 * 		1. NS URI changed from http://www.yakindu.org/sct/2.0.0 to  http://www.yakindu.org/sct/sgraph/2.0.0
-	 * 		2. State->subRegions renamed to State->regions
-	 * 		3. ExpressionElement#expression renamed to SpecificationElement.specification
-	 * 		4. Scopes, triggers, effects are transient now
-	 * </pre>
-	 * 
-	 */
-	private String migratePreM10Models(String content) {
-		content = content.replace(NS_URI_TO_MIGRATE,
-				"http://www.yakindu.org/sct/sgraph/2.0.0");
-		content = content.replaceAll("expression=\"", "specification=\"");
-		content = content.replaceAll("<subRegions", "<regions");
-		content = content.replaceAll(" </subRegions", "</regions");
-		return content;
-	}
-
-	private String readFileAsString(String filePath) throws java.io.IOException {
-		byte[] buffer = new byte[(int) new File(filePath).length()];
-		BufferedInputStream f = new BufferedInputStream(new FileInputStream(
-				filePath));
-		f.read(buffer);
-		return new String(buffer);
-	}
-}

+ 0 - 1
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/util/SGraphAdapterFactory.java

@@ -15,7 +15,6 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.yakindu.base.base.NamedElement;
-import org.yakindu.sct.model.sgraph.*;
 import org.yakindu.sct.model.sgraph.Choice;
 import org.yakindu.sct.model.sgraph.CompositeElement;
 import org.yakindu.sct.model.sgraph.Declaration;

+ 0 - 1
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/util/SGraphSwitch.java

@@ -14,7 +14,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.yakindu.base.base.NamedElement;
-import org.yakindu.sct.model.sgraph.*;
 import org.yakindu.sct.model.sgraph.Choice;
 import org.yakindu.sct.model.sgraph.CompositeElement;
 import org.yakindu.sct.model.sgraph.Declaration;

+ 0 - 1
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/util/SGraphValidator.java

@@ -21,7 +21,6 @@ import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.yakindu.sct.model.sgraph.*;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.yakindu.sct.model.sgraph.Choice;
 import org.yakindu.sct.model.sgraph.ChoiceKind;