Changeset 4055 for devel-tools

Timestamp:

Jan 10, 2009, 5:48:24 PM (12 years ago)

Author:

yura

Message:

• Eclipse 3.2 compatibility (second step).
• No warnings in Mainfest.mf and plugin.xml.
• Refactoring.

Location:

devel-tools/trunk/eclipse

Files:

• org.refal.rfpdt.core/META-INF/MANIFEST.MF (modified) (1 diff)
• org.refal.rfpdt.ui/META-INF/MANIFEST.MF (modified) (1 diff)
• org.refal.rfpdt.ui/plugin.xml (modified) (2 diffs)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/wizards/NewRfpModuleWizard.java (modified) (2 diffs)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/wizards/NewRfpModuleWizardPage.java (moved) (moved from devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/wizards/NewRfpModulePage.java) (4 diffs)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/wizards/RfpContainerWizardPage.java (moved) (moved from devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/launching/RfpContainerWizardPage.java) (1 diff)

devel-tools/trunk/eclipse/org.refal.rfpdt.core/META-INF/MANIFEST.MF

@@ -15 +15 @@
  org.refal.rfpdt.lib
 Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/META-INF/MANIFEST.MF

@@ -24 +24 @@
  org.refal.rfpdt.core
 Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/plugin.xml

@@ -56 +56 @@
       <key
             commandId="org.refal.rfpdt.launch.shortcut.debug"
-            contextId="org.eclipse.ui.globalScope"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M3+M2+D R"/>
       <key
             commandId="org.refal.rfpdt.launch.shortcut.run"
-            contextId="org.eclipse.ui.globalScope"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M3+M2+X R"/>
@@ -409 +407 @@
          point="org.eclipse.jdt.ui.classpathContainerPage">
       <classpathContainerPage
-            class="org.refal.rfpdt.ui.launching.RfpContainerWizardPage"
-            id="org.refal.rfpdt.ui.rfpContainerPage"
+            class="org.refal.rfpdt.ui.wizards.RfpContainerWizardPage"
+            id="org.refal.rfpdt.launching.rfpContainer"
             name="Refal Plus Library">
       </classpathContainerPage>

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

@@ -17 +17 @@
     private IWorkbench workbench;
     private IStructuredSelection selection;
-    private NewRfpModulePage page;
+    private NewRfpModuleWizardPage page;
 
     public NewRfpModuleWizard () {
@@ -28 +28 @@
     public void addPages () {
         super.addPages();
-        page = new NewRfpModulePage();
+        page = new NewRfpModuleWizardPage();
         page.setTitle("Refal Plus Module");
         page.setDescription("Create a Refal Plus module");

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

@@ -3 +3 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
+
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceStatus;
+import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
@@ -19 +22 @@
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.SWT;
@@ -28 +30 @@
 import org.eclipse.swt.widgets.Button;
 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.parser.RfpCharacter;
 import org.refal.rfpdt.ui.RfpUI;
 
-public class NewRfpModulePage extends NewTypeWizardPage {
+public class NewRfpModuleWizardPage extends NewTypeWizardPage {
     private Button button;
     private boolean buttonValue = false;
 
-    public NewRfpModulePage () {
+    public NewRfpModuleWizardPage () {
         super(false, "NewRfpModulePage");
     }
@@ -174 +173 @@
 
     public IFile createModule () throws CoreException, InterruptedException {
-        final IFile file = RfpCore.getRfpProject(getProject()).getSource(getPackageFragmentRoot().getPath(),
+        IFile file = RfpCore.getRfpProject(getProject()).getSource(getPackageFragmentRoot().getPath(),
                 getPackageText() + '.' + getTypeName(), "rf");
-        IRunnableWithProgress op = new IRunnableWithProgress() {
-            public void run (IProgressMonitor monitor) {
-                CreateFileOperation op = new CreateFileOperation(file, null, getInputStream(), "NewFile");
-                try {
-                    PlatformUI.getWorkbench().getOperationSupport().getOperationHistory().execute(op, monitor,
-                            WorkspaceUndoUtil.getUIInfoAdapter(getShell()));
-                } catch (ExecutionException e) {
-                    RfpUI.log(e);
+        try {
+            // Create a new file resource in the workspace
+            IPath path = file.getFullPath();
+            IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+            int numSegments = path.segmentCount();
+            if (numSegments > 2 && !root.getFolder(path.removeLastSegments(1)).exists())
+                // If the direct parent of the path doesn't exist, try to
+                // create the necessary directories.
+                for (int i = numSegments - 2; i > 0; i--) {
+                    IFolder folder = root.getFolder(path.removeLastSegments(i));
+                    if (!folder.exists())
+                        folder.create(false, true, null);
                 }
+            file.create(getInputStream(), false, null);
+        } catch (CoreException e) {
+            // If the file already existed locally, just refresh to get contents
+            if (e.getStatus().getCode() == IResourceStatus.PATH_OCCUPIED)
+                file.refreshLocal(IResource.DEPTH_ZERO, null);
+            else {
+                RfpUI.log(e);
+                return null;
             }
-        };
-        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/RfpContainerWizardPage.java

@@ -1 @@
-package org.refal.rfpdt.ui.launching;
+package org.refal.rfpdt.ui.wizards;
 
 import java.net.URL;