Changeset 895

Timestamp:

05/10/12 18:13:06 (13 months ago)

Author:

anders

Message:

Redid the code generation wizard's UI with a file dialog for selecting the location of a DPF DSML/metamodel. The located file is then read and written to a file called metamodel.xmi in a folder called models. This ensures that we always have editor support for a given DSML.

Location:

dpf-model-editor/trunk/plugins/no.hib.dpf.codegen.xpand.ui/src/no/hib/dpf/codegen/xpand/ui

Files:

• DpfMetaModelUIPlugin.java (modified) (1 diff)
• wizards/DpfGeneratorPage.java (modified) (3 diffs)
• wizards/NewDpfGeneratorWizard.java (modified) (12 diffs)

dpf-model-editor/trunk/plugins/no.hib.dpf.codegen.xpand.ui/src/no/hib/dpf/codegen/xpand/ui/DpfMetaModelUIPlugin.java

@@ -296 +296 @@
                         return "";              
                 }
-                
-                //Returns every IFile which matches isValidDsm
-//              public boolean visit(IResource resource) throws CoreException {
-//                      if (resource instanceof IFile) {
-//                              IFile f = (IFile) resource;
-//                              if (isValidDsm(f)) {
-////                                    if (JavaCore.create(f.getParent()) != null) { //dafuq
-//                                              try {
-//                                                      URI uri = URI.createURI(f.getFullPath().toString());
-////                                                    DpfMetamodel p = loadDsm(uri);
-//                                                      Specification spectmp = CoreFactory.eINSTANCE.loadSpecification(uri);
-////                                                    if (p != null) {
-////                                                            fileModels.put(f, p);
-////                                                    }
-//                                                      if(spectmp != null) {
-//                                                              fileModels.put(f, spectmp);
-//                                                      }
-//                                              } catch (Exception e) {
-//                                                      System.out.println();
-//                                              }
-////                                    }
-//                              }
-//                      }
-//                      return true;
-//              }
-                
-//              private boolean isValidDsm(IFile f) {
-//              return !f.isDerived()
-//                              && f.isAccessible()
-//                              && !f.isLinked()
-//                              && (f.getName().endsWith("dsm.xmi") && f.exists());
-//      }
-                
-//              public synchronized final static DpfMetamodel loadDsm(URI uri) {
-//                      Resource r = dpfResourceSet.getResource(uri, false);
-//                      if (r == null) {
-//                              // this resource has not been loaded before...
-//                              // hence, demandLoad it
-//                              r = dpfResourceSet.getResource(uri, true);
-//                      } else {
-//                              if (r.isLoaded()) { // Is this a request to reload the resource?
-//                                      r.unload();
-//                              }
-//                              try {
-//                                      r.load(new HashMap<Object, Object>());
-//                              } catch (IOException e) {
-//                                      throw new RuntimeException(e);
-//                              }
-//                      }
-//
-//                      List<EObject> c = r.getContents();
-//                      if (c.isEmpty()) {
-//                              return null;
-//                      }
-//                      if (c.get(0) instanceof DpfMetamodel) {
-//                              DpfMetamodel p = (DpfMetamodel) c.get(0);
-//                              URIConverter.URI_MAP.put(URI.createURI(uri.lastSegment()), uri);
-//                              return p;
-//                      }
-//                      return null;
-//              }
         }
 }

dpf-model-editor/trunk/plugins/no.hib.dpf.codegen.xpand.ui/src/no/hib/dpf/codegen/xpand/ui/wizards/DpfGeneratorPage.java

@@ -3 +3 @@
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
@@ -13 +17 @@
         private Text projectName, metaModelLocation;
         private Label pname, mml;
+        private Button bml;
         
         protected DpfGeneratorPage() {
@@ -21 +26 @@
 
         @Override
-        public void createControl(Composite parent) {
+        public void createControl(final Composite parent) {
                 Composite comp = new Composite(parent, SWT.NULL);
                 
                 GridLayout gridLayout = new GridLayout();
-                gridLayout.numColumns = 2;
+                gridLayout.numColumns = 3;
                 
                 comp.setLayout(gridLayout);
                 
                 pname = new Label(comp, SWT.RIGHT);
-                pname.setText("Project Name:");
-                
-                projectName = new Text(comp, SWT.SINGLE);
-                projectName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+                pname.setText("Project name:");
+
+                projectName = new Text(comp, SWT.SINGLE | SWT.BORDER);
+                projectName.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1));
                 
                 mml = new Label(comp, SWT.RIGHT);
-                mml.setText("Metamodel Location:");
+                mml.setText("Metamodel location:");
                 
-                metaModelLocation = new Text(comp, SWT.SINGLE);
+                metaModelLocation = new Text(comp, SWT.SINGLE | SWT.BORDER);
                 metaModelLocation.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+                
+                bml = new Button(comp, SWT.PUSH);
+                bml.setText("&Location");
+                bml.addSelectionListener(new SelectionListener() {
+                        
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                FileDialog fd = new FileDialog(parent.getShell());
+                                fd.setFilterExtensions(new String[] {"*.xmi"});
+                                fd.setFilterNames(new String[] {"*.xmi"});
+                                fd.open();
+                                if(!fd.getFileName().isEmpty()) {
+                                        metaModelLocation.setText(fd.getFilterPath() + "/" + fd.getFileName());
+                                }
+                        }
+                        
+                        @Override
+                        public void widgetDefaultSelected(SelectionEvent e) {
+                        }
+                });
                 
                 setControl(comp);

dpf-model-editor/trunk/plugins/no.hib.dpf.codegen.xpand.ui/src/no/hib/dpf/codegen/xpand/ui/wizards/NewDpfGeneratorWizard.java

@@ -12 +12 @@
  *******************************************************************************/
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -29 +31 @@
 import no.hib.dpf.codegen.xpand.ui.properties.DpfMetaModelProperties;
 
+import org.apache.log4j.Logger;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -58 +62 @@
 
         private DpfGeneratorPage page;
-
         private DpfMetaModelProperties props;
-        
         private IConfigurationElement configElement;
         
+        private String workflowContent;
         private String metaModelLocation;
 
-        private String workflowContent;
+        private Logger log;
+        
         
         public NewDpfGeneratorWizard() {
@@ -71 +75 @@
                 super.setWindowTitle("New DPF Xpand Generator Project");
                 setNeedsProgressMonitor(true);
+                log = Logger.getLogger(NewDpfGeneratorWizard.class);
         }
 
@@ -132 +137 @@
                 if (p == null)
                         return;
-
+                
+                //We create a folder where our metamodel/models will reside.
+                IFolder mfolder = p.getFolder("models");
+                if(!mfolder.exists()) {
+                        try {
+                                mfolder.create(false, true, monitor);
+                        } catch (CoreException e) {
+                                log.error("Could not create folder \"models\"", e);
+                        }
+                }
+                
                 String encoding = ResourcesPlugin.getEncoding();
                 EclipseHelper.createFile(".settings/org.eclipse.core.resources.prefs",
@@ -150 +165 @@
                 monitor.worked(1);
                 
-                //Cant access stuff outside of ui thread without this
+                //We can not access stuff outside of ui thread without this
                 Display.getDefault().syncExec(new Runnable() {
                         @Override
@@ -157 +172 @@
                                 try {
                                         props.setNature(true);
-                                        //We use .settings file instead
-//                                      props.setDsmPaths(page.getMetaModelLocation());
-                                        metaModelLocation = page.getMetaModelLocation();
+                                        metaModelLocation = page.getMetaModelLocation(); 
                                 } catch (CoreException e) {
-                                        System.err.println("Problem loading dsmlocation from wizard.");
-                                        e.printStackTrace();
+                                        log.error("Could not load metamodel location from wizard", e);
                                 }
                                 
                                 try {
-                                        WorkflowParser parse = new WorkflowParser(getContentStream("workflowtemplate.txt"));
-                                        parse.setProperty("dpf_metamodel", metaModelLocation);
+                                        WorkflowParser parse = new WorkflowParser(getUIContentStream("workflowtemplate.txt"));
+                                        parse.setProperty("dpf_metamodel", "platform:/resource/" + p.getName() + "/models/metamodel.xmi");
                                         parse.setXpandEntryPoint("template::templ::main FOR dpf");
                                         workflowContent = parse.getXml();
@@ -179 +191 @@
                                         e.printStackTrace();
                                 }
-                                
-                        
                         }
                 });
                 
+                try {
+                        EclipseHelper.createFile("models/metamodel.xmi", p, 
+                                        getContents(new File(metaModelLocation).toURI().toURL().openStream()), monitor);
+                        monitor.worked(1);
+                } catch (MalformedURLException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
                 
                 EclipseHelper.createFile("src/workflow/workflow.mwe", p, workflowContent, monitor);
-                
-                monitor.worked(1);
-                
-                EclipseHelper.createFile("src/template/templ.xpt", p, getContents("xpttemplate.txt"), monitor);
-                
+                monitor.worked(1);
+                
+                EclipseHelper.createFile("src/template/templ.xpt", p, getContentsOfTemplateResource("xpttemplate.txt"), monitor);
                 monitor.worked(1);
                 
@@ -196 +215 @@
                                 p, 
                                 "eclipse.preferences.version=1\n"
-                                + "metamodel.location=" + metaModelLocation, 
+                                + "metamodel.location=" + "platform:/resource/" + p.getName() + "/models/metamodel.xmi", 
                                 new NullProgressMonitor());
                 monitor.worked(1);
+                
         }
 
@@ -215 +235 @@
         }
 
-        private InputStream getContentStream(final String resource) {
+        private String getContents(final InputStream stream) {
+                try {
+                        final InputStream inputStream = stream;
+
+                        final byte[] buffer = new byte[4096];
+                        final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+                        while (true) {
+                                int read;
+                                read = inputStream.read(buffer);
+
+                                if (read == -1) {
+                                        break;
+                                }
+
+                                outputStream.write(buffer, 0, read);
+                        }
+
+                        outputStream.close();
+                        inputStream.close();
+
+                        return outputStream.toString("UTF-8");
+                }
+                catch (final IOException e) {
+                        log.error("Could not load resource", e);
+                        return "";
+                }
+        }
+        
+        private URL findUIResource(String resource) {
                 Bundle b = Platform.getBundle("no.hib.dpf.codegen.xpand.ui");
                 Enumeration<URL> ee = b.findEntries("resources", resource, false);
@@ -224 +273 @@
                         fileURL = ee.nextElement();
                 }
-                try {
-                        return fileURL.openStream();
+                return fileURL;
+        }
+        
+        private String getContentsOfTemplateResource(final String resource) {
+                try {
+                        return getContents(findUIResource(resource).openStream());
+                } catch (IOException e) {
+                        log.error("Could not load local template resource", e);
+                        return "";
+                }
+        }
+        
+        private InputStream getUIContentStream(final String resource) {
+                try {
+                        return findUIResource(resource).openStream();
                 } catch (IOException e) {
                         e.printStackTrace();
@@ -231 +293 @@
                 }
         }
-        
-        private String getContents(final String resource) {
-                Bundle b = Platform.getBundle("no.hib.dpf.codegen.xpand.ui");
-                Enumeration<URL> ee = b.findEntries("resources", resource, false);
-                
-                URL fileURL = null;
-                
-                if(ee.hasMoreElements()) {
-                        fileURL = ee.nextElement();
-                }
-                
-                try {
-                        final InputStream inputStream = fileURL.openStream();
-
-                        final byte[] buffer = new byte[4096];
-                        final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-                        while (true) {
-                                int read;
-                                read = inputStream.read(buffer);
-
-                                if (read == -1) {
-                                        break;
-                                }
-
-                                outputStream.write(buffer, 0, read);
-                        }
-
-                        outputStream.close();
-                        inputStream.close();
-
-                        return outputStream.toString("UTF-8");
-                }
-                catch (final IOException e) {
-                        e.printStackTrace();
-                        return "";
-                }
-        }
-        
         
         /**