Changeset 7695

Timestamp:

05/30/08 16:52:01 (5 years ago)

Author:

Snyder.Jason

Message:

fixed logic so it actually works

Files:

• ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/dialogs/nodeBooterDialog.java (modified) (10 diffs)

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/dialogs/nodeBooterDialog.java

@@ -6 +6 @@
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -24 +28 @@
 public class nodeBooterDialog extends Dialog
 {
-        private String deviceManagerFilePath = "/sdr/nodes/default_GPP_node/";
+
         private String deviceManagerFileName;
-
-        private String domainManagerFilePath = "                            ";
+        private String deviceManagerFile = "/sdr/nodes/default_GPP_node/DeviceManager.dcd.xml";
+        
+
         private String domainManagerFileName;
-
-        private boolean defaultDeviceManager = true;
-        private boolean defaultDomainManager = true;
+        private String domainManagerFile = "/sdr/domain/DomainManager.dmd.xml";
+        
+
 
         private String[] command;
@@ -42 +47 @@
 
         private ProcessBuilder processBuilder;
+    private Button specifyDeviceManager;
+    private Button specifyDomainManager;
+    private Button deviceBrowseButton;
+    private Button domainBrowseButton;
 
 
@@ -54 +63 @@
                 comp.setLayout(new GridLayout(3, false));
                 
-                Label deviceManagerLabel = new Label(comp, SWT.NONE);
-                deviceManagerLabel.setText("Choose a Device Manager");
-
-                deviceManagerText = new Text(comp, SWT.BORDER);
+                specifyDeviceManager = new Button(comp, SWT.CHECK);
+                specifyDeviceManager.setSelection(true);
+                specifyDeviceManager.addSelectionListener(new SelectionListener()
+                {
+
+            public void widgetDefaultSelected(SelectionEvent e)
+            {
+                // TODO Auto-generated method stub
+                
+            }
+
+            public void widgetSelected(SelectionEvent e)
+            {
+                if(nodeBooterDialog.this.specifyDeviceManager.getSelection())
+                    nodeBooterDialog.this.deviceBrowseButton.setEnabled(true);
+                else
+                    nodeBooterDialog.this.deviceBrowseButton.setEnabled(false);
+                
+            }
+                    
+                    
+                });
+                
+                specifyDeviceManager.setText("Choose a Device Manager");
+                
+
+                deviceManagerText = new Text(comp, SWT.BORDER | SWT.READ_ONLY);
                 deviceManagerText.setText("DeviceManager.dcd.xml");
-
-                Button deviceBrowseButton = new Button(comp, SWT.PUSH | SWT.CENTER);
+                
+                
+
+                deviceBrowseButton = new Button(comp, SWT.PUSH | SWT.CENTER);
                 deviceBrowseButton.setText("Browse");
+                
                 deviceBrowseButton.addSelectionListener(new SelectionAdapter()
                 {
@@ -67 +102 @@
                         {
 
-                                defaultDeviceManager = false;
                                 deviceManagerSelector = new FileDialog(comp.getShell(), SWT.SINGLE);
                                 deviceManagerSelector.setText("Select a Device Manager");
@@ -77 +111 @@
 
                                 //open the dialog and get the full path and file name
-                                deviceManagerFilePath = deviceManagerSelector.open();
+                                deviceManagerFile = deviceManagerSelector.open();
                                 deviceManagerFileName = deviceManagerSelector.getFileName();
-
-                                deviceManagerText.setSize(200, 20);
+                                
+                                
+
+                                //deviceManagerText.setSize(200, 20);
                                 deviceManagerText.setText(deviceManagerFileName);
 
@@ -87 +123 @@
                 });
 
-                Label domainManagerLabel = new Label(comp, SWT.NONE);
-                domainManagerLabel.setText("Choose a Domain Manager");
-
-                domainManagerText = new Text(comp, SWT.BORDER);
-                domainManagerText.setText("");
-
-                Button domainBrowseButton = new Button(comp, SWT.PUSH | SWT.CENTER);
+                specifyDomainManager = new Button(comp, SWT.CHECK);
+                specifyDomainManager.setSelection(true);
+                specifyDomainManager.addSelectionListener(new SelectionListener()
+                {
+
+            public void widgetDefaultSelected(SelectionEvent e)
+            {
+                // TODO Auto-generated method stub
+                
+            }
+
+            public void widgetSelected(SelectionEvent e)
+            {
+                if(nodeBooterDialog.this.specifyDomainManager.getSelection())
+                    nodeBooterDialog.this.domainBrowseButton.setEnabled(true);
+                else
+                    nodeBooterDialog.this.domainBrowseButton.setEnabled(false);
+                
+            }
+                    
+                });
+                
+                
+                specifyDomainManager.setText("Choose a Domain Manager");
+                
+
+                domainManagerText = new Text(comp, SWT.BORDER | SWT.READ_ONLY);
+                domainManagerText.setText("DomainManager.dmd.xml");
+        
+
+                domainBrowseButton = new Button(comp, SWT.PUSH | SWT.CENTER);
                 domainBrowseButton.setText("Browse");
+                
                 domainBrowseButton.addSelectionListener(new SelectionAdapter()
                 {
@@ -100 +161 @@
                         {
 
-                                defaultDomainManager = false;
                                 domainManagerSelector = new FileDialog(comp.getShell(), SWT.SINGLE);
                                 domainManagerSelector.setText("Select a Domain Manager");
-                                domainManagerSelector.setFilterPath("/sdr/nodes/default_GPP_node/");
-
-                                //only allow .dcd.xml files to be chosen
-                                String[] filterExt = {"*.dcd.xml"};
+                                domainManagerSelector.setFilterPath("/sdr/domain/");
+
+                                //only allow .dmd.xml files to be chosen
+                                String[] filterExt = {"*.dmd.xml"};
                                 domainManagerSelector.setFilterExtensions(filterExt);
 
                                 //open the dialog and get the full path and file name
-                                domainManagerFilePath = domainManagerSelector.open();
+                                domainManagerFile = domainManagerSelector.open();
                                 domainManagerFileName = domainManagerSelector.getFileName();
 
-                                domainManagerText.setSize(200, 20);
+                                //domainManagerText.setSize(200, 20);
                                 domainManagerText.setText(domainManagerFileName);
 
@@ -127 +187 @@
                 if(buttonId == IDialogConstants.OK_ID)
                 {
-                        Process p;
-                        try
-                        {
-                                //Set the name again in case the user changed the text in the textbox
-                                deviceManagerFileName = deviceManagerText.getText();
-
-                                //strip /sdr/ from the filename path because nodebooter has to be run out of /sdr
-                                //deviceManagerFilePath = deviceManagerFilePath.substring(5);
-
-                                //get just the path of the file without the filename (again, in case the user edited the file name)
-                                if(!defaultDeviceManager)
-                                        deviceManagerFilePath = deviceManagerFilePath.substring(0, deviceManagerFilePath.length() - deviceManagerFileName.length());
-
-                                //place the commands and arguments into an array and create a processBuilder
-                                command = new String[] {"sh","-c", "nodeBooter", "-D", "-d", deviceManagerFilePath + deviceManagerFileName};
-                                processBuilder = new ProcessBuilder(command);
-
-                                //Set the working directory to /sdr
-                                File workingDirectory = new File("/sdr");
-                                processBuilder.directory(workingDirectory);
-
-                                for (String s:command)
+                    boolean exit = true;
+                    try
+                        {
+                            deviceManagerFile = stripSDR(deviceManagerFile);
+                domainManagerFile = stripSDR(domainManagerFile);
+                
+                                if( !specifyDeviceManager.getSelection() && !specifyDomainManager.getSelection())
                                 {
-                    log.debug("buttonPressed(): " + s);
+                                    errorMsg("NodeBooter Error", "Please specify a device manager or a domain manager");
+                                    exit = false;
                                 }
-
-                                //run the command
-                                p = processBuilder.start();
-
-                                //catch command output in a scanner
-                                Scanner scan = new Scanner(p.getInputStream());
-
-                                //create a new console and add it to the console manager
-                                MessageConsole myConsole = OWDPlugin.getOssieConsole(true);
-                                MessageConsoleStream out = myConsole.newMessageStream();
-
-                                if (!scan.hasNextLine())
+                                else
                                 {
-                                        out.println("No output produced");
+                                if (!specifyDeviceManager.getSelection() && specifyDomainManager.getSelection())
+                                    command = new String[] {"nodeBooter", "-D" + domainManagerFile};
+                                else if(specifyDeviceManager.getSelection() && !specifyDomainManager.getSelection())
+                                    command = new String[] {"nodeBooter", "-d", deviceManagerFile};
+                                else    
+                                        command = new String[] {"nodeBooter", "-D" + domainManagerFile, "-d", deviceManagerFile};
+                                        
+                                processBuilder = new ProcessBuilder(command);
+        
+                                //Set the working directory to /sdr
+                                File workingDirectory = new File("/sdr");
+                                processBuilder.directory(workingDirectory);
+    
+                                for (String s:command)
+                                {
+                        log.debug("buttonPressed(): " + s);
+                                }
+    
+                                boolean result = OWDPlugin.runWithConsole(processBuilder, true);
+                                log.debug(result);
                                 }
-                                while (scan.hasNextLine())
-                                {
-                                        out.println(scan.nextLine());
-                                }
                         }
                         catch (Exception e)
@@ -178 +228 @@
 
                         //call the super to close the dialog
+                        if(exit)
+                            super.buttonPressed(buttonId);
+                        else
+                            exit = true;
+                
+                }
+                else
+                {
                         super.buttonPressed(buttonId);
                 }
-                else
-                {
-                        super.buttonPressed(buttonId);
-                }
-        }
+        }
+        
+        private String stripSDR(String input)
+        {
+            String output = input;
+            if(input.substring(0, 5).equals("/sdr/"))
+                output = input.substring(5);
+            return output;
+        }
+        private void errorMsg(String title, String message)
+    {
+        MessageDialog.openError(getShell(), title, message);
+    }
 
     private static final Logger log =