X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax.ui%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2Fui%2Fwizard%2FSchemaConversionWizard.java;h=627381bfd84277adc17ad27210106d4c464431fb;hb=fb01c21839aea801224aeb82b64bd261120619d5;hp=fae0a576deffcbae1383198979e1612a30e36433;hpb=ada38ab0a1a98dcb413bef3273064da36ce2d273;p=simantics%2Finterop.git

diff --git a/org.simantics.xml.sax.ui/src/org/simantics/xml/sax/ui/wizard/SchemaConversionWizard.java b/org.simantics.xml.sax.ui/src/org/simantics/xml/sax/ui/wizard/SchemaConversionWizard.java
index fae0a57..627381b 100644
--- a/org.simantics.xml.sax.ui/src/org/simantics/xml/sax/ui/wizard/SchemaConversionWizard.java
+++ b/org.simantics.xml.sax.ui/src/org/simantics/xml/sax/ui/wizard/SchemaConversionWizard.java
@@ -10,11 +10,9 @@ import org.simantics.xml.sax.SchemaConverter;
 
 public class SchemaConversionWizard extends Wizard implements IImportWizard {
 
-//	FileSelectionPage fileselectionPage;
-//	FileSelectionPage configurationSelectionPage;
-//	DirectorySelectionPage pluginSelectionPage;
-	InputSelectionPage inputSelectionPage ;
+	InputSelectionPage inputSelectionPage;
 	ImportProcessPage importProcessPage;
+	SchemaCombinationPage schemaCombinationPage;
 	
 	public SchemaConversionWizard() {
 		setWindowTitle("XML Schema conversion");
@@ -22,7 +20,6 @@ public class SchemaConversionWizard extends Wizard implements IImportWizard {
 
 	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		// TODO Auto-generated method stub
 
 	}
 
@@ -36,21 +33,17 @@ public class SchemaConversionWizard extends Wizard implements IImportWizard {
 	
 	@Override
 	public void addPages() {
-//		fileselectionPage = new FileSelectionPage();
-//		fileselectionPage.setFilterExtensions(new String[]{"*.xsd"});
-//		fileselectionPage.setFilterNames(new String[]{"XML schema files"});
-//		pluginSelectionPage = new DirectorySelectionPage();
-//		addPage(fileselectionPage);
-//		addPage(pluginSelectionPage);
 		addPage(inputSelectionPage = new InputSelectionPage());
 		addPage(importProcessPage = new ImportProcessPage());
+		addPage(schemaCombinationPage = new SchemaCombinationPage());
 	}
 	
 	public void doConversion() throws Exception {
 		SchemaConverter converter = new SchemaConverter();
-//		File inputFile = new File(fileselectionPage.getFilename());
-//		File outputPlugin = new File(pluginSelectionPage.getFilename());
-		
+		converter.setCreateExporter(inputSelectionPage.createExporter);
+		converter.setCreateImporter(inputSelectionPage.createImporter);
+		converter.setCreatePGraph(inputSelectionPage.createPGraph);
+
 		File inputFile = new File(inputSelectionPage.getSchemaFilename());
 		File configurationFile = null;
 		if (inputSelectionPage.getConfigurationFilename() != null)
@@ -58,6 +51,8 @@ public class SchemaConversionWizard extends Wizard implements IImportWizard {
 		File outputPlugin = new File(inputSelectionPage.getPluginFilename());
 		
 		converter.convertSchema(inputFile,configurationFile,outputPlugin);
+		
+		schemaCombinationPage.setOutputPlugin(outputPlugin);
 	}
 
 }