Changeset 8083

Timestamp:

07/26/08 10:38:51 (5 years ago)

Author:

stedwar2

Message:

Added preference to use Python code from a specified external "tools" directory.

Location:

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie

Files:

• OWDPlugin.java (modified) (6 diffs)
• PreferenceInitializer.java (modified) (1 diff)
• PreferencePage.java (modified) (5 diffs)

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/OWDPlugin.java

@@ -69 +69 @@
     public static final String PREF_WAVE_AUTO_INSTALL =
         PLUGIN_ID + ".preferences.component.install.auto";
+    public static final String PREF_USE_EXTERNAL_TOOLS_DIR =
+        PLUGIN_ID + ".preferences.use.external.tools.dir";
+    public static final String PREF_EXTERNAL_TOOLS_DIR =
+        PLUGIN_ID + ".preferences.external.tools.dir";
 
 
@@ -141 +145 @@
                 {
                         Properties pythonParams = new Properties();
-                        pythonParams.setProperty("python.path",
+            String wavedevBase = getWavedevBase();
+            pythonParams.setProperty("python.path",
                             getPluginFolder() + "/PythonSrc"
                 + System.getProperty("path.separator")
                 + getPluginFolder() + "/PythonSrc/WaveDev/wavedev"
                 + System.getProperty("path.separator")
-                + getPluginFolder()
+                + wavedevBase
                 + System.getProperty("path.separator")
-                + getPluginFolder() + "/WaveDev/wavedev");
+                + wavedevBase + "/WaveDev/wavedev");
                         pythonParams.setProperty(
                             "python.home", getPluginFolder() + "/jython2.2.1");
@@ -167 +172 @@
                     "import WaveDev\n"
                     + "WaveDev.__path__.append('"
-                    + getPluginFolder() + "/WaveDev')"
+                    + wavedevBase + "/WaveDev')"
                     // + "\nprint 'WaveDev.__path__ = ', WaveDev.__path__"
                     );
@@ -173 +178 @@
                     "import WaveDev.wavedev\n"
                     + "WaveDev.wavedev.__path__.append('"
-                    + getPluginFolder() + "/WaveDev/wavedev')"
+                    + wavedevBase + "/WaveDev/wavedev')"
                     // + "\nprint 'WaveDev.wavedev.__path__ = ', "
                     // + "WaveDev.wavedev.__path__"
@@ -197 +202 @@
             OWDPlugin.getDefault().getString(
                 OWDPlugin.PREF_OSSIE_DIR)));
-        mainFrame.setOssiePluginHome(new PyString(getPluginFolder()));
+        mainFrame.setOssiePluginHome(new PyString(getWavedevBase()));
         mainFrame.setIncludePath(new PyString(
             OWDPlugin.getDefault().getString(
@@ -578 +583 @@
 
     // ----------------------------------------------------------
+    private static String getWavedevBase()
+    {
+        String wavedevBase = getPluginFolder();
+        if (getDefault() != null
+            && getDefault().getBoolean(PREF_USE_EXTERNAL_TOOLS_DIR))
+        {
+            wavedevBase = getDefault().getString(PREF_EXTERNAL_TOOLS_DIR);
+            wavedevBase = wavedevBase.replace('\\', '/')
+                .replaceFirst("/$", "");
+        }
+        return wavedevBase;
+    }
+
+
+    // ----------------------------------------------------------
     private static class OutputForwarder
         extends Thread

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/PreferenceInitializer.java

@@ -21 +21 @@
         IPreferenceStore store = OWDPlugin.getDefault().getPreferenceStore();
         store.setDefault(OWDPlugin.PREF_OSSIE_DIR, "/sdr/");
-        store.setDefault(OWDPlugin.PREF_OSSIE_INCLUDE_PATH, "/usr/local/include/ossie/");
-        store.setDefault(OWDPlugin.PREF_STANDARD_IDL_PATH, "/usr/local/include/standardinterfaces/");
-        store.setDefault(OWDPlugin.PREF_CUSTOM_IDL_PATH, "/usr/local/include/custominterfaces/");
+        store.setDefault(
+            OWDPlugin.PREF_OSSIE_INCLUDE_PATH,
+            "/usr/local/include/ossie/");
+        store.setDefault(
+            OWDPlugin.PREF_STANDARD_IDL_PATH,
+            "/usr/local/include/standardinterfaces/");
+        store.setDefault(
+            OWDPlugin.PREF_CUSTOM_IDL_PATH,
+            "/usr/local/include/custominterfaces/");
         store.setDefault(OWDPlugin.PREF_COMP_AUTO_INSTALL, true);
-        store.setDefault(OWDPlugin.PREF_WAVE_AUTO_INSTALL, true);
+        store.setDefault(OWDPlugin.PREF_USE_EXTERNAL_TOOLS_DIR, false);
+        store.setDefault(OWDPlugin.PREF_EXTERNAL_TOOLS_DIR, "");
     }
 

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/PreferencePage.java

@@ -2 +2 @@
 
 import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.DirectoryFieldEditor;
+import org.eclipse.jface.preference.FieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import quicktime.app.spaces.Space;
 
 //-------------------------------------------------------------------------
@@ -42 +49 @@
     protected void createFieldEditors()
     {
-        addField(new StringFieldEditor(
+        addField(new LabelFieldEditor(
+            "Changes only affect new editors/windows.",
+            getFieldEditorParent()));
+        addField(new SpacerFieldEditor(getFieldEditorParent()));
+
+        addField(new DirectoryFieldEditor(
             OWDPlugin.PREF_OSSIE_DIR,
-            "OSSIE installation directory:",
-            getFieldEditorParent()));
-        addField(new StringFieldEditor(
+            "OSSIE install directory:",
+            getFieldEditorParent()));
+        addField(new DirectoryFieldEditor(
             OWDPlugin.PREF_OSSIE_INCLUDE_PATH,
             "OSSIE include path:",
             getFieldEditorParent()));
-        addField(new StringFieldEditor(
+        addField(new DirectoryFieldEditor(
             OWDPlugin.PREF_STANDARD_IDL_PATH,
             "Standard IDL path:",
             getFieldEditorParent()));
-        addField(new StringFieldEditor(
+        addField(new DirectoryFieldEditor(
             OWDPlugin.PREF_CUSTOM_IDL_PATH,
             "Custom IDL path:",
@@ -67 +79 @@
             + "install on build",
             getFieldEditorParent()));
+
+        addField(new SpacerFieldEditor(getFieldEditorParent()));
+        useToolsDir = new BooleanFieldEditor(
+            OWDPlugin.PREF_USE_EXTERNAL_TOOLS_DIR,
+            "Use WaveDev code from external tools directory",
+            getFieldEditorParent());
+        addField(useToolsDir);
+        toolsDirParent = getFieldEditorParent();
+        toolsDir = new DirectoryFieldEditor(
+            OWDPlugin.PREF_EXTERNAL_TOOLS_DIR,
+            "External tools directory:",
+            toolsDirParent);
+        addField(toolsDir);
+        if (!useToolsDir.getBooleanValue())
+        {
+            toolsDir.setEnabled(false, toolsDirParent);
+        }
     }
 
@@ -75 +104 @@
         // Nothing to do
     }
+
 
     // ----------------------------------------------------------
@@ -83 +113 @@
         return super.performOk();
     }
+
+
+    // ----------------------------------------------------------
+    @Override
+    public void propertyChange(PropertyChangeEvent event)
+    {
+        super.propertyChange(event);
+        if (event.getSource() == useToolsDir)
+        {
+            System.out.println("propertyChange() called. tools = "
+                + useToolsDir.getBooleanValue());
+            toolsDir.setEnabled(useToolsDir.getBooleanValue(), toolsDirParent);
+            checkState();
+        }
+        else if (event.getSource() == toolsDir)
+        {
+            System.out.println("propertyChange() for tools dir");
+            String value = toolsDir.getStringValue();
+            if (value != null)
+            {
+                value = value.replaceFirst(
+                    "(\\\\|/)WaveDev((\\\\|/)wavedev)?$", "");
+                toolsDir.setStringValue(value);
+            }
+            checkState();
+        }
+    }
+
+
+    // ----------------------------------------------------------
+    @Override
+    protected void checkState()
+    {
+        super.checkState();
+        if (useToolsDir != null && useToolsDir.getBooleanValue())
+        {
+            String value = toolsDir.getStringValue();
+            if (value == null || "".equals(value))
+            {
+                setErrorMessage(
+                    "An external tools directory must be specified.");
+                setValid(false);
+            }
+            else
+            {
+                setErrorMessage(null);
+                setValid(true);
+            }
+        }
+        else
+        {
+            setValid(true);
+            setErrorMessage(null);
+        }
+    }
+
+
+    // ----------------------------------------------------------
+    /**
+     * A field editor for displaying labels not associated with other widgets.
+     */
+    private static class LabelFieldEditor
+        extends FieldEditor
+    {
+        // All labels can use the same preference name since they don't
+        // store any preference.
+        public LabelFieldEditor(String value, Composite parent)
+        {
+            super("label", value, parent);
+        }
+
+        // Adjusts the field editor to be displayed correctly
+        // for the given number of columns.
+        protected void adjustForNumColumns(int numColumns)
+        {
+            ((GridData) label.getLayoutData()).horizontalSpan = numColumns;
+        }
+
+        // Fills the field editor's controls into the given parent.
+        protected void doFillIntoGrid(Composite parent, int numColumns)
+        {
+            label = getLabelControl(parent);
+
+            GridData gridData = new GridData();
+            gridData.horizontalSpan = numColumns;
+            gridData.horizontalAlignment = GridData.FILL;
+            gridData.grabExcessHorizontalSpace = false;
+            gridData.verticalAlignment = GridData.CENTER;
+            gridData.grabExcessVerticalSpace = false;
+
+            label.setLayoutData(gridData);
+        }
+
+        // Returns the number of controls in the field editor.
+        public int getNumberOfControls()
+        {
+            return 1;
+        }
+
+        // Labels do not persist any preferences, so these methods are empty.
+        protected void doLoad() {}
+        protected void doLoadDefault() {}
+        protected void doStore() {}
+
+        private Label label;
+    }
+
+
+    // ----------------------------------------------------------
+    /**
+     * A field editor for adding space to a preference page.
+     */
+    private static class SpacerFieldEditor
+        extends LabelFieldEditor
+    {
+        // Implemented as an empty label field editor.
+        public SpacerFieldEditor(Composite parent)
+        {
+            super("", parent);
+        }
+    }
+
+
+    //~ Instance/static variables .............................................
+
+    private BooleanFieldEditor useToolsDir;
+    private DirectoryFieldEditor toolsDir;
+    private Composite toolsDirParent;
 }