Skip to content
Snippets Groups Projects
Commit 24de23e2 authored by Erlend Stav's avatar Erlend Stav
Browse files

Updated transformations and commands to also include tests

parent 596440b9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 72 additions and 76 deletions
transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/handlers/TransformOntUML2Java.java
+ 0
− 25
View file @ 24de23e2
......@@ -21,14 +21,12 @@ package org.universaal.tools.transformationcommand.handlers;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.window.Window;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
import org.eclipse.ui.handlers.HandlerUtil;
import org.universaal.tools.transformationcommand.activator.Activator;
import org.universaal.tools.transformationcommand.preferences.PreferenceConstants;
public class TransformOntUML2Java extends TransformationHandler {
//static final String TRANSFORMATION_FILENAME = "transformations/ontUML2JavaV2.m2t";
......@@ -64,29 +62,6 @@ public class TransformOntUML2Java extends TransformationHandler {
e.printStackTrace();
}
}
@Override
protected String getRootDirectoryFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
String directory = store.getString(PreferenceConstants.P_UML2JAVA_ROOTPATH);
return directory;
}
@Override
protected String getJavaDirectoryFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
String directory = store.getString(PreferenceConstants.P_UML2JAVA_JAVAPATH);
return directory;
}
@Override
protected boolean getAbsolutePathBooleanFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
boolean absolutePath = store.getBoolean(PreferenceConstants.P_UML2JAVA_ABSOLUTE_BOOLEAN);
return absolutePath;
}
@Override
protected boolean dualMetamodel() {
......
transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/handlers/TransformServiceModelEMF2Java.java
+ 0
− 24
View file @ 24de23e2
......@@ -18,9 +18,7 @@
*/
package org.universaal.tools.transformationcommand.handlers;
import org.eclipse.jface.preference.IPreferenceStore;
import org.universaal.tools.transformationcommand.activator.Activator;
import org.universaal.tools.transformationcommand.preferences.PreferenceConstants;
public class TransformServiceModelEMF2Java extends TransformationHandler {
static final String TRANSFORMATION_FILENAME = "transformations/serviceModelEMF2Java.m2t";
......@@ -31,28 +29,6 @@ public class TransformServiceModelEMF2Java extends TransformationHandler {
setFileAndBundleName(TRANSFORMATION_FILENAME, THIS_BUNDLE_NAME);
}
@Override
protected String getRootDirectoryFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
String directory = store.getString(PreferenceConstants.P_UML2JAVA_ROOTPATH);
return directory;
}
@Override
protected String getJavaDirectoryFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
String directory = store.getString(PreferenceConstants.P_UML2JAVA_JAVAPATH);
return directory;
}
@Override
protected boolean getAbsolutePathBooleanFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
boolean absolutePath = store.getBoolean(PreferenceConstants.P_UML2JAVA_ABSOLUTE_BOOLEAN);
return absolutePath;
}
@Override
protected boolean dualMetamodel() {
// TODO Auto-generated method stub
......
transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/handlers/TransformServiceModelUML2Java.java
+ 0
− 24
View file @ 24de23e2
......@@ -18,9 +18,7 @@
*/
package org.universaal.tools.transformationcommand.handlers;
import org.eclipse.jface.preference.IPreferenceStore;
import org.universaal.tools.transformationcommand.activator.Activator;
import org.universaal.tools.transformationcommand.preferences.PreferenceConstants;
public class TransformServiceModelUML2Java extends TransformationHandler {
static final String TRANSFORMATION_FILENAME = "transformations/serviceModelUML2Java.m2t";
......@@ -31,28 +29,6 @@ public class TransformServiceModelUML2Java extends TransformationHandler {
setFileAndBundleName(TRANSFORMATION_FILENAME, THIS_BUNDLE_NAME);
}
@Override
protected String getRootDirectoryFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
String directory = store.getString(PreferenceConstants.P_UML2JAVA_ROOTPATH);
return directory;
}
@Override
protected String getJavaDirectoryFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
String directory = store.getString(PreferenceConstants.P_UML2JAVA_JAVAPATH);
return directory;
}
@Override
protected boolean getAbsolutePathBooleanFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
boolean absolutePath = store.getBoolean(PreferenceConstants.P_UML2JAVA_ABSOLUTE_BOOLEAN);
return absolutePath;
}
@Override
protected boolean dualMetamodel() {
// TODO Auto-generated method stub
......
transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/handlers/TransformationHandler.java
+ 38
− 3
View file @ 24de23e2
......@@ -44,6 +44,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.m2e.core.MavenPlugin;
......@@ -63,6 +64,8 @@ import org.eclipse.ui.console.IConsoleManager;
import org.eclipse.ui.console.MessageConsole;
import org.eclipse.ui.console.MessageConsoleStream;
import org.eclipse.ui.handlers.HandlerUtil;
import org.universaal.tools.transformationcommand.activator.Activator;
import org.universaal.tools.transformationcommand.preferences.PreferenceConstants;
/**
......@@ -269,6 +272,8 @@ public abstract class TransformationHandler extends AbstractHandler implements E
execMgr.setRootDirectory(findRootDirectory(project));
System.setProperty("org.universaal.tools.transformationcommand.javadir",
getTrimmedJavaDirectoryFromPreferences() );
System.setProperty("org.universaal.tools.transformationcommand.testdir",
getTrimmedTestDirectoryFromPreferences() );
System.setProperty("org.universaal.tools.transformationcommand.javaowlsupport",
generateOWLSupport);
......@@ -354,10 +359,40 @@ public abstract class TransformationHandler extends AbstractHandler implements E
return javaDir.substring(1);
return javaDir;
}
private String getTrimmedTestDirectoryFromPreferences() {
// Strip away any leading "/" in directory name
String javaDir = getTestDirectoryFromPreferences();
if (javaDir.charAt(0)=='/')
return javaDir.substring(1);
return javaDir;
}
// The following methods can be overriden in subclasses if different preferences and directories are wanted
protected String getRootDirectoryFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
String directory = store.getString(PreferenceConstants.P_UML2JAVA_ROOTPATH);
return directory;
}
protected String getJavaDirectoryFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
String directory = store.getString(PreferenceConstants.P_UML2JAVA_JAVAPATH);
return directory;
}
protected boolean getAbsolutePathBooleanFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
boolean absolutePath = store.getBoolean(PreferenceConstants.P_UML2JAVA_ABSOLUTE_BOOLEAN);
return absolutePath;
}
protected abstract String getRootDirectoryFromPreferences();
protected abstract String getJavaDirectoryFromPreferences();
protected abstract boolean getAbsolutePathBooleanFromPreferences();
protected String getTestDirectoryFromPreferences() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
String directory = store.getString(PreferenceConstants.P_UML2JAVA_TESTPATH);
return directory;
}
protected abstract boolean dualMetamodel();
protected abstract String getSourceFileSuffix();
......
transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/preferences/PreferenceConstants.java
+ 1
− 0
View file @ 24de23e2
......@@ -23,5 +23,6 @@ public class PreferenceConstants {
public static final String P_UML2JAVA_ROOTPATH = "uml2javarootpath";
public static final String P_UML2JAVA_JAVAPATH = "uml2javajavapath";
public static final String P_UML2JAVA_ABSOLUTE_BOOLEAN = "uml2javarelativepathboolean";
public static final String P_UML2JAVA_TESTPATH = "uml2javatestpath";
}
transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/preferences/PreferenceInitializer.java
+ 2
− 0
View file @ 24de23e2
......@@ -29,6 +29,8 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
store.setDefault(PreferenceConstants.P_UML2JAVA_JAVAPATH,
"src/main/java");
store.setDefault(PreferenceConstants.P_UML2JAVA_TESTPATH,
"src/test/java");
store.setDefault(PreferenceConstants.P_UML2JAVA_ROOTPATH,
"");
store.setDefault(PreferenceConstants.P_UML2JAVA_ABSOLUTE_BOOLEAN,
......
transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/preferences/Uml2JavaPreferencePage.java
+ 3
− 0
View file @ 24de23e2
......@@ -32,6 +32,7 @@ extends FieldEditorPreferencePage
implements IWorkbenchPreferencePage {
StringFieldEditor javaPathName;
StringFieldEditor testPathName;
StringFieldEditor rootPathName;
BooleanFieldEditor absoluteBoolean;
......@@ -52,10 +53,12 @@ implements IWorkbenchPreferencePage {
absoluteBoolean = new BooleanFieldEditor(PreferenceConstants.P_UML2JAVA_ABSOLUTE_BOOLEAN, "Use absolute path.", getFieldEditorParent());
rootPathName = new StringFieldEditor(PreferenceConstants.P_UML2JAVA_ROOTPATH, "Please enter the desired root output path (blank for project root)", getFieldEditorParent());
javaPathName = new StringFieldEditor(PreferenceConstants.P_UML2JAVA_JAVAPATH, "Please enter the relative subdirectory within the root for Java files.", getFieldEditorParent());
testPathName = new StringFieldEditor(PreferenceConstants.P_UML2JAVA_TESTPATH, "Please enter the relative subdirectory within the root for Java test files.", getFieldEditorParent());
addField(absoluteBoolean);
addField(rootPathName);
addField(javaPathName);
addField(testPathName);
}
......
transformations/org.universaal.tools.transformationcommand/transformations/OntologyUML2Java_1_1_0.m2t
+ 28
− 0
View file @ 24de23e2
......@@ -28,6 +28,7 @@ texttransformation OntologyUML2Java_1_1_0 (in uml:"http://www.eclipse.org/uml2/3
var projectInfo: Hashtable
var importedModels: Hashtable
var javaBasePath:String
var testBasePath:String
var javaOWLSupport:String
var datatypeImportMap:Hashtable
......@@ -48,6 +49,7 @@ texttransformation OntologyUML2Java_1_1_0 (in uml:"http://www.eclipse.org/uml2/3
var ontologyNameList:Hashtable
javaBasePath = getEnv("org.universaal.tools.transformationcommand.javadir")
testBasePath = getEnv("org.universaal.tools.transformationcommand.testdir")
javaOWLSupport = getEnv("org.universaal.tools.transformationcommand.javaowlsupport")
if (self.hasStereotype("owlOntology")) {
......@@ -122,6 +124,10 @@ texttransformation OntologyUML2Java_1_1_0 (in uml:"http://www.eclipse.org/uml2/3
StdOut.println("Handling activator of :" + self.name)
self.generateActivator(ontologyNameList)
StdOut.println("Generating test:" + self.name)
self.generateTest()
//StdOut.println("Generating the POM file")
//create the POM file for the project
......@@ -209,6 +215,28 @@ public class Activator implements BundleActivator {
}
uml.Model::generateTest() {
file( testBasePath + "/org/universAAL/ontology/test/ArtifactIntegrationTest.java" )
"package org.universAAL.ontology.test;
import org.universAAL.itests.IntegrationTest;
/**
* Here developer's of this artifact should code their integration tests.
*
*/
public class ArtifactIntegrationTest extends IntegrationTest {
public void testComposite() {
logAllBundles();
}
}
"
}
uml.Package::generatMainOntologyClassStaticImports() {
'import org.universAAL.middleware.owl.IntRestriction;
import org.universAAL.middleware.owl.FloatRestriction;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment