Changeset 3491 for devel-tools

Timestamp:

Mar 12, 2008, 3:55:00 PM (13 years ago)

Author:

yura

Message:

• Moving all ui intu editor-plugin (in future ui-plugin), other - in rfpdt-plugin.

Location:

devel-tools/trunk/eclipse

Files:

• org.refal.plus.rfpdt.editor/META-INF/MANIFEST.MF (modified) (1 diff)
• org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpEditorPlugin.java (modified) (3 diffs)
• org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/launch/ui/RfpLaunchShortcut.java (modified) (6 diffs)
• org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/ui/wizards/ProjectCreationWizard.java (modified) (2 diffs)
• org.refal.plus.rfpdt/META-INF/MANIFEST.MF (modified) (2 diffs)
• org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/core/RfpCorePlugin.java (modified) (3 diffs)
• org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/launch/LaunchingPlugin.java (modified) (1 diff)

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

@@ -17 +17 @@
  org.refal.plus.rfpdt,
  org.eclipse.jdt.debug,
- org.eclipse.debug.ui
+ org.eclipse.debug.ui,
+ org.eclipse.jdt.launching,
+ org.eclipse.jdt.debug.ui
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpEditorPlugin.java

@@ -6 +6 @@
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
@@ -65 +68 @@
 
     /**
-     * Returns an image descriptor for the image file at the given plug-in
-     * relative path
+     * Returns an image descriptor for the image file at the given plug-in relative path
      * 
      * @param path
@@ -94 +96 @@
         return store;
     }
+
+    private static IWorkbenchWindow getActiveWorkbenchWindow () {
+        return plugin == null ? null : plugin.getWorkbench().getActiveWorkbenchWindow();
+    }
+
+    /**
+     * Convenience method to get the window that owns this action's Shell.
+     */
+    public static Shell getShell () {
+        IWorkbenchWindow window = getActiveWorkbenchWindow();
+        return window == null ? null : window.getShell();
+    }
+
+    public static IWorkbenchPage getActivePage () {
+        IWorkbenchWindow window = getActiveWorkbenchWindow();
+        return window == null ? null : window.getActivePage();
+    }
+
 }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/launch/ui/RfpLaunchShortcut.java

@@ -26 +26 @@
 import org.refal.plus.rfpdt.core.builder.RfpBuilder;
 import org.refal.plus.rfpdt.editor.RfpEditor;
+import org.refal.plus.rfpdt.editor.RfpEditorPlugin;
 import org.refal.plus.rfpdt.launch.IRfpLaunchConfigurationConstants;
-import org.refal.plus.rfpdt.launch.LaunchingPlugin;
 
 /**
@@ -44 +44 @@
             return;
         }
-        MessageDialog.openError(LaunchingPlugin.getShell(), "Cannot Launch Refal Plus application",
+        MessageDialog.openError(RfpEditorPlugin.getShell(), "Cannot Launch Refal Plus application",
                 "The selection is not a Refal Plus file. Please select one .rf file to launch.");
     }
@@ -54 +54 @@
             return;
         }
-        MessageDialog.openError(LaunchingPlugin.getShell(), "Cannot Launch Refal Plus application",
+        MessageDialog.openError(RfpEditorPlugin.getShell(), "Cannot Launch Refal Plus application",
                 "The selection is not a Refal Plus file. Please select one .rf file to launch.");
     }
@@ -134 +134 @@
     private static ILaunchConfiguration chooseConfiguration (List<ILaunchConfiguration> configList, String mode) {
         IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
-        ElementListSelectionDialog dialog = new ElementListSelectionDialog(LaunchingPlugin.getShell(), labelProvider);
+        ElementListSelectionDialog dialog = new ElementListSelectionDialog(RfpEditorPlugin.getShell(), labelProvider);
         dialog.setElements(configList.toArray());
         dialog.setTitle("Launch Configuration Selection");
@@ -196 +196 @@
 
     private static IFile getResource () {
-        IWorkbenchPage page = LaunchingPlugin.getActivePage();
+        IWorkbenchPage page = RfpEditorPlugin.getActivePage();
         if (page == null)
             return null;
@@ -208 +208 @@
         Display.getDefault().asyncExec(new Runnable() {
             public void run () {
-                ErrorDialog.openError(LaunchingPlugin.getShell(), "Cannot Create Configuration",
+                ErrorDialog.openError(RfpEditorPlugin.getShell(), "Cannot Create Configuration",
                         "An exception occurred attempting to create launch configuration", exception.getStatus());
             }

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/ui/wizards/ProjectCreationWizard.java

@@ -18 +18 @@
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 import org.refal.plus.rfpdt.core.RfpCorePlugin;
+import org.refal.plus.rfpdt.editor.RfpEditorPlugin;
 
 public abstract class ProjectCreationWizard extends Wizard implements
@@ -31 +32 @@
                 super();
                 fOperation = operation;
-                setDialogSettings(RfpCorePlugin.getDefault().getDialogSettings());
+                setDialogSettings(RfpEditorPlugin.getDefault().getDialogSettings());
                 setWindowTitle("Choose project name");
                 setNeedsProgressMonitor(true);

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

@@ -11 +11 @@
  org.eclipse.ui,
  org.eclipse.ui.ide,
- org.refal.plus
+ org.refal.plus,
+ org.eclipse.jdt.launching,
+ org.eclipse.debug.core,
+ org.eclipse.jdt.core
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -18 +21 @@
  org.refal.plus.rfpdt.comp.parse,
  org.refal.plus.rfpdt.core,
- org.refal.plus.rfpdt.core.builder
+ org.refal.plus.rfpdt.core.builder,
+ org.refal.plus.rfpdt.launch

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/core/RfpCorePlugin.java

@@ -3 +3 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -11 +11 @@
  * The activator class controls the plug-in life cycle
  */
-public class RfpCorePlugin extends AbstractUIPlugin {
+public class RfpCorePlugin extends Plugin {
 
         public static final String PLUGIN_ID = "org.refal.plus.rfpdt";
@@ -54 +54 @@
          * @return the image descriptor
          */
-        public static ImageDescriptor getImageDescriptor(String path) {
-                return imageDescriptorFromPlugin(PLUGIN_ID, path);
-        }
+//      public static ImageDescriptor getImageDescriptor(String path) {
+//              return imageDescriptorFromPlugin(PLUGIN_ID, path);
+//      }
 
         public static String getPluginId() {

devel-tools/trunk/eclipse/org.refal.plus.rfpdt/src/org/refal/plus/rfpdt/launch/LaunchingPlugin.java

@@ -6 +6 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
-public class LaunchingPlugin extends AbstractUIPlugin {
-    private static LaunchingPlugin plugin;
-
-    private static IWorkbenchWindow getActiveWorkbenchWindow () {
-        return plugin == null ? null : plugin.getWorkbench().getActiveWorkbenchWindow();
-    }
-
-    /**
-     * Convenience method to get the window that owns this action's Shell.
-     */
-    public static Shell getShell () {
-        IWorkbenchWindow window = getActiveWorkbenchWindow();
-        return window == null ? null : window.getShell();
-    }
-
-    public static IWorkbenchPage getActivePage () {
-        IWorkbenchWindow window = getActiveWorkbenchWindow();
-        return window == null ? null : window.getActivePage();
-    }
-
-    public LaunchingPlugin () {
-        super();
-        plugin = this;
-    }
-}
+//public class LaunchingPlugin extends AbstractUIPlugin {
+//    private static LaunchingPlugin plugin;
+//
+//    private static IWorkbenchWindow getActiveWorkbenchWindow () {
+//        return plugin == null ? null : plugin.getWorkbench().getActiveWorkbenchWindow();
+//    }
+//
+//    /**
+//     * Convenience method to get the window that owns this action's Shell.
+//     */
+//    public static Shell getShell () {
+//        IWorkbenchWindow window = getActiveWorkbenchWindow();
+//        return window == null ? null : window.getShell();
+//    }
+//
+//    public static IWorkbenchPage getActivePage () {
+//        IWorkbenchWindow window = getActiveWorkbenchWindow();
+//        return window == null ? null : window.getActivePage();
+//    }
+//
+//    public LaunchingPlugin () {
+//        super();
+//        plugin = this;
+//    }
+//}