perfsonar development work

Author: nemanja.zutic
Date: 2009-07-10 10:08:11 -0400 (Fri, 10 Jul 2009)
New Revision: 5224

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java
Log:
Fix for bug 801

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
    2009-07-10 14:04:05 UTC (rev 5223)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
    2009-07-10 14:08:11 UTC (rev 5224)
@@ -17,6 +17,7 @@
 import javax.swing.ButtonModel;
 import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JRadioButton;
@@ -108,6 +109,8 @@
        protected JTextArea result;
        
        protected BWCTLGraphPanel graph;
+       
+       protected boolean secondRTTrequest = false;
 
        public BWCTLMainComponent(Component parentComponent, IPerfsonarTab 
psModel) {
                super(parentComponent, psModel, new GridLayout());
@@ -583,4 +586,16 @@
        public void clearGraph(){
                graph.clearChart();
        }
+       
+       public void showRTTNotice(){
+               String message = "Estimate RTT functionality is limited to a 
set of predefined measurement points.\nOne or both of the selected MP is not 
in that set and RTT cannot be estimated.\nPlease enter RTT manualy";
+               String title = "NOTE";
+               if(secondRTTrequest){
+                       
JOptionPane.showMessageDialog(this,message,title,JOptionPane.INFORMATION_MESSAGE);
+                       infoLabelLine1.setText("Please enter the estimated 
RTT manualy");
+                       infoLabelLine2.setText("    ");
+                       secondRTTrequest = false;
+               }
+               else secondRTTrequest = true;
+       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java  
  2009-07-10 14:04:05 UTC (rev 5223)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java  
  2009-07-10 14:08:11 UTC (rev 5224)
@@ -55,7 +55,12 @@
        
        private Document createIPPMDataRequest(String sourceName, String 
destinationName)
                throws Exception
-               {
+               {       
+                       if(sourceName.equals("none") || 
destinationName.equals("none")) {
+                               this.mainComponent.showRTTNotice();
+                               throw new Exception("Unsupported endpoint for 
RTT request");
+                       }
+                       
                        mainComponent.clearInfoLabels();
                
                        DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();