IssueZilla 11240 - Ensure unoil.jar is mounted before executing commands.

3 files changed, 17 insertions, 6 deletions

diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
index c72a9c46b885..0c63c966131e 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BuildParcelAction.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-02-20 11:59:21 $
+ *  last change: $Author: toconnor $ $Date: 2003-03-04 12:11:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,12 +73,16 @@ import org.openide.compiler.Compiler;
 import org.openide.compiler.CompilerJob;
 import org.openide.compiler.CompilerTask;
 
+import org.openoffice.netbeans.modules.office.utils.FrameworkJarChecker;
+
 public class BuildParcelAction extends BuildAllAction {
     public String getName() {
         return "Build";
     }
 
     protected void performAction(Node[] activatedNodes) {
+        FrameworkJarChecker.mountDependencies();
+
         for (int i = 0; i < activatedNodes.length; i++) {
             Vector v = new Vector(1);
             v.addElement(activatedNodes[i]);
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
index 57cacfe3910d..ebc3a6ad3b32 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CompileParcelAction.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-02-20 11:59:21 $
+ *  last change: $Author: toconnor $ $Date: 2003-03-04 12:11:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,12 +64,15 @@ package org.openoffice.netbeans.modules.office.actions;
 import org.openide.nodes.Node;
 import org.openide.actions.CompileAllAction;
 
+import org.openoffice.netbeans.modules.office.utils.FrameworkJarChecker;
+
 public class CompileParcelAction extends CompileAllAction {
     public String getName() {
         return "Compile";
     }
 
     protected void performAction(Node[] activatedNodes) {
+        FrameworkJarChecker.mountDependencies();
         super.performAction(activatedNodes);
     }
 }
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
index 6b602d5d3500..0f700c98f75c 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ConfigureParcelAction.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-02-20 11:59:21 $
+ *  last change: $Author: toconnor $ $Date: 2003-03-04 12:11:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,6 +66,8 @@ import org.openide.util.HelpCtx;
 import org.openide.util.RequestProcessor;
 import org.openide.util.actions.CookieAction;
 
+import org.openoffice.netbeans.modules.office.utils.FrameworkJarChecker;
+
 public class ConfigureParcelAction extends CookieAction {
 
     public java.lang.String getName() {
@@ -86,6 +88,8 @@ public class ConfigureParcelAction extends CookieAction {
 
     protected void performAction(final Node[] activatedNodes)
     {
+        FrameworkJarChecker.mountDependencies();
+
         RequestProcessor.getDefault().post(new Runnable() {
             public void run() {
                 for (int i = 0; i < activatedNodes.length; i++) {