Changeset 10471

Timestamp:

10/25/10 15:01:24 (3 years ago)

Author:

Snyder.Jason

Message:

starting alf, wavedash, or nodeBooter now checks to see if the naming service is running and starts it if necessary

Location:

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/actionSets

Files:

• ALF.java (modified) (2 diffs)
• NodeBooter.java (modified) (3 diffs)
• WaveDash.java (modified) (4 diffs)

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/actionSets/ALF.java

@@ -6 +6 @@
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import edu.vt.ossie.OWDPlugin;
+import static edu.vt.ossie.NodeBooterUtils.namingServiceIsRunning;
 import static edu.vt.ossie.NodeBooterUtils.nodeBooterIsRunning;
+import static edu.vt.ossie.NodeBooterUtils.startNamingService;
 import static edu.vt.ossie.NodeBooterUtils.startNodeBooterWithDefaults;
 /**
@@ -35 +37 @@
         public void run(IAction action)
         {
+                
+                //start the naming service if necessary
+        if(!namingServiceIsRunning())
+                startNamingService();
+        
                 //check to see if nodebooter is running
                 //if not, start it up with the domain and device managers from 

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/actionSets/NodeBooter.java

@@ -6 +6 @@
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import edu.vt.ossie.dialogs.NodeBooterDialog;
+import static edu.vt.ossie.NodeBooterUtils.namingServiceIsRunning;
+import static edu.vt.ossie.NodeBooterUtils.startNamingService;
 
 /**
@@ -11 +13 @@
  * 
  *
- * @author $Author: Snyder.Jason $
+ * @author $Author$
  * @version $Id
  */
@@ -36 +38 @@
         try
         {
+                //start the naming service if necessary
+                if(!namingServiceIsRunning())
+                        startNamingService();
+                
             NodeBooterDialog dialog = new NodeBooterDialog(window.getShell());
             dialog.open();

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/actionSets/WaveDash.java

@@ -3 +3 @@
 import static edu.vt.ossie.NodeBooterUtils.nodeBooterIsRunning;
 import static edu.vt.ossie.NodeBooterUtils.startNodeBooterWithDefaults;
+import static edu.vt.ossie.NodeBooterUtils.namingServiceIsRunning;
+import static edu.vt.ossie.NodeBooterUtils.startNamingService;
 
+import org.apache.log4j.Logger;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
@@ -37 +40 @@
         {
                 
+                if(!namingServiceIsRunning())
+                        startNamingService();
+                
                 //check to see if nodebooter is running
                 //if not, start it up with the domain and device managers from 
@@ -42 +48 @@
                 if(!nodeBooterIsRunning())
                 {
+                        log.debug("starting nodebooter");
                         startNodeBooterWithDefaults();
                 }
@@ -57 +64 @@
             // Nothing to do
         }
+        
+        private static final Logger log =
+        OWDPlugin.getLogManager().getLogger(WaveDash.class);
 
 }