Changeset 3818

Timestamp:

Jun 21, 2008, 10:15:21 PM (12 years ago)

Author:

yura

Message:

• Module creating and opening.

Location:

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/wizards

Files:

• NewRfpModulePage.java (modified) (3 diffs)
• NewRfpModuleWizard.java (modified) (4 diffs)
• NewRfpProjectOperation.java (modified) (1 diff)

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/wizards/NewRfpModulePage.java

@@ -1 +1 @@
 package org.refal.rfpdt.ui.wizards;
 
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
+import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.undo.CreateFileOperation;
+import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
+import org.refal.rfpdt.core.RfpCore;
+import org.refal.rfpdt.ui.RfpUI;
 
 public class NewRfpModulePage extends NewTypeWizardPage {
@@ -64 +76 @@
         createTypeNameControls(composite, nColumns);
 
+        // Button button = new Button(composite, SWT.CHECK | SWT.LEFT);
+        // button.setLayoutData(new GridData(SWT.LEFT, SWT.LEFT, false, false, 4, 1));
+        // button.setText("Create function $func Main = e");
+
         setControl(composite);
     }
@@ -69 +85 @@
     public void setVisible (boolean visible) {
         super.setVisible(visible);
-        if (visible) {
+        if (visible)
             setFocus();
+    }
+
+    public IFile createModule () throws CoreException, InterruptedException {
+        final IFile file = RfpCore.getRfpProject(getJavaProject().getProject()).getSource(
+                getPackageFragmentRoot().getPath(), getPackageText() + '.' + getTypeName(), "rf");
+        IRunnableWithProgress op = new IRunnableWithProgress() {
+            public void run (IProgressMonitor monitor) {
+                CreateFileOperation op = new CreateFileOperation(file, null, null, "NewFile");
+                try {
+                    PlatformUI.getWorkbench().getOperationSupport().getOperationHistory().execute(op, monitor,
+                            WorkspaceUndoUtil.getUIInfoAdapter(getShell()));
+                } catch (ExecutionException e) {
+                    RfpUI.log(e);
+                }
+            }
+        };
+        try {
+            getContainer().run(true, true, op);
+        } catch (InterruptedException e) {
+            RfpUI.log(e);
+            return null;
+        } catch (InvocationTargetException e) {
+            RfpUI.log(e);
+            return null;
         }
+        return file;
     }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/wizards/NewRfpModuleWizard.java

@@ -1 +1 @@
 package org.refal.rfpdt.ui.wizards;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -6 +7 @@
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 import org.refal.rfpdt.ui.RfpUI;
 
 public class NewRfpModuleWizard extends Wizard implements INewWizard {
-    // private IWorkbench workbench;
+    private IWorkbench workbench;
     private IStructuredSelection selection;
     private NewRfpModulePage page;
@@ -30 +36 @@
 
     public void init (IWorkbench workbench, IStructuredSelection selection) {
-        // this.workbench = workbench;
+        this.workbench = workbench;
         this.selection = selection;
     }
 
     public boolean performFinish () {
+        IFile file = null;
         try {
-            page.createType(null);
+            file = page.createModule();
         } catch (CoreException e) {
             RfpUI.log(e);
@@ -44 +51 @@
             return false;
         }
+        if (file == null)
+            return false;
+        try {
+            IWorkbenchWindow dw = workbench.getActiveWorkbenchWindow();
+            if (dw != null) {
+                BasicNewResourceWizard.selectAndReveal(file, dw);
+                IWorkbenchPage page = dw.getActivePage();
+                if (page != null) {
+                    IDE.openEditor(page, file, true);
+                }
+            }
+        } catch (PartInitException e) {
+            RfpUI.log(e);
+        }
         return true;
     }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/wizards/NewRfpProjectOperation.java

@@ -71 +71 @@
         IProjectDescription desc = null;
 
-        if (isDefaultLocation(projectLocation)) {
+        if (isDefaultLocation(projectLocation))
             desc = null;
-        } else {
+        else {
             desc = result.getWorkspace().newProjectDescription(projectName);
             desc.setLocation(new Path(projectLocation));
         }
 
-        if (!result.exists()) {
+        if (!result.exists())
             result.create(desc, null);
-        }
-        if (!result.isOpen()) {
+        if (!result.isOpen())
             result.open(null);
-        }
         return result;
     }