Changeset 3469 for devel-tools/trunk

Timestamp:

Mar 8, 2008, 7:28:09 PM (13 years ago)

Author:

yura

Message:

• Simplification

Location:

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

Files:

• LaunchingPlugin.java (modified) (3 diffs)
• ui/RfpLaunchShortcut.java (modified) (5 diffs)

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

@@ -1 +1 @@
 package org.refal.plus.rfpdt.launch;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
 
 import org.eclipse.swt.widgets.Shell;
@@ -8 +5 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
 
 public class LaunchingPlugin extends AbstractUIPlugin {
-    // The shared instance.
     private static LaunchingPlugin plugin;
 
-    private ResourceBundle resourceBundle;
-
-    public LaunchingPlugin () {
-        super();
-        plugin = this;
-        try {
-            resourceBundle = ResourceBundle.getBundle("org.refal.plus.rfpdt.launch.LaunchingPluginResources");
-        } catch (MissingResourceException x) {
-            resourceBundle = null;
-        }
-    }
-
-    /**
-     * This method is called upon plug-in activation
-     */
-    public void start (BundleContext context) throws Exception {
-        super.start(context);
-    }
-
-    /**
-     * This method is called when the plug-in is stopped
-     */
-    public void stop (BundleContext context) throws Exception {
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance.
-     */
-    public static LaunchingPlugin getDefault () {
-        return plugin;
-    }
-
-    /**
-     * Returns the string from the plugin's resource bundle, or 'key' if not found.
-     */
-    public static String getResourceString (String key) {
-        ResourceBundle bundle = LaunchingPlugin.getDefault().getResourceBundle();
-        try {
-            return (bundle != null) ? bundle.getString(key) : key;
-        } catch (MissingResourceException e) {
-            return key;
-        }
-    }
-
-    /**
-     * Returns the plugin's resource bundle,
-     */
-    public ResourceBundle getResourceBundle () {
-        return resourceBundle;
+    private static IWorkbenchWindow getActiveWorkbenchWindow () {
+        return plugin == null ? null : plugin.getWorkbench().getActiveWorkbenchWindow();
     }
 
@@ -71 +18 @@
     public static Shell getShell () {
         IWorkbenchWindow window = getActiveWorkbenchWindow();
-        if (window != null) {
-            return window.getShell();
-        }
-        return null;
-    }
-
-    public static IWorkbenchWindow getActiveWorkbenchWindow () {
-        return getDefault().getWorkbench().getActiveWorkbenchWindow();
+        return window == null ? null : window.getShell();
     }
 
     public static IWorkbenchPage getActivePage () {
-        IWorkbenchWindow w = getActiveWorkbenchWindow();
-        if (w != null) {
-            return w.getActivePage();
-        }
-        return null;
+        IWorkbenchWindow window = getActiveWorkbenchWindow();
+        return window == null ? null : window.getActivePage();
+    }
+
+    public LaunchingPlugin () {
+        super();
+        plugin = this;
     }
 }

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

@@ -24 +24 @@
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+import org.refal.plus.rfpdt.core.builder.RfpBuilder;
 import org.refal.plus.rfpdt.editor.RfpEditor;
 import org.refal.plus.rfpdt.launch.IRfpLaunchConfigurationConstants;
@@ -57 +58 @@
     }
 
-    static void createConfiguration (ILaunchConfigurationWorkingCopy config) {
+    public static void createConfiguration (ILaunchConfigurationWorkingCopy config) {
         createConfiguration(config, getResource());
     }
@@ -81 +82 @@
     private static String getWorkingDirectory (IFile module) {
         return module.getParent().getFullPath().makeRelative().toString();
-    }
-
-    private static String getModuleName (IFile module) {
-        return module.getProjectRelativePath().removeFileExtension().toString().replace('/', '.');
     }
 
@@ -100 +97 @@
             for (ILaunchConfiguration config : configs)
                 if (config.getAttribute(IRfpLaunchConfigurationConstants.ATTR_MODULE_NAME, "").equals(
-                        getModuleName(module))
+                        RfpBuilder.getModuleName(module))
                         && config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, "").equals(
                                 getWorkingDirectory(module)))
@@ -189 +186 @@
         if (module != null) {
             config.setAttribute(IRfpLaunchConfigurationConstants.ATTR_PROJECT_NAME, module.getProject().getName());
-            config.setAttribute(IRfpLaunchConfigurationConstants.ATTR_MODULE_NAME, getModuleName(module));
+            config.setAttribute(IRfpLaunchConfigurationConstants.ATTR_MODULE_NAME, RfpBuilder.getModuleName(module));
             config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, getWorkingDirectory(module));
         }