perfsonar development work

Author: nemanja.zutic
Date: 2008-12-08 08:55:38 -0500 (Mon, 08 Dec 2008)
New Revision: 4747

Added:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLGraphPanel.java
Removed:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLGraphPanel.java
Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java
Log:
BWCTL tab RTT bug fixed

Deleted: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLGraphPanel.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLGraphPanel.java


Property changes on: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLGraphPanel.java
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java  
  2008-12-08 13:11:46 UTC (rev 4746)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java  
  2008-12-08 13:55:38 UTC (rev 4747)
@@ -34,8 +34,7 @@
        public Document createRequest(MAEndpoint endpoint,
                MetaDataList metadata, String messageType) throws Exception
        {
-                       throw new Exception("Unknown message type! " +
-                               messageType);
+                       throw new Exception("Unknown message type! " +  
messageType);
        }
        
        public Document createRequest(IUserData uData, String messageType)
@@ -50,14 +49,15 @@
                        else return 
createIPPMDataRequest(((RTTUserData)query).getDestinationName(), 
((RTTUserData)query).getSourceName());
                }
                else {
-                       throw new Exception("Unknown message type! " +
-                               messageType);
+                       throw new Exception("Unknown message type! " +  
messageType);
                }
        }
        
        private Document createIPPMDataRequest(String sourceName, String 
destinationName)
                throws Exception
                {
+                       mainComponent.clearInfoLabels();
+               
                        DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
                factory.setNamespaceAware(true);
                            
@@ -80,8 +80,8 @@
                String metadataid1 = "meta1";
                metadata1.setAttribute("id", metadataid1);
                
-               Element subject1 = 
document.createElementNS("http://ggf.org/ns/nmwg/tools/hades/","subject";);
-               subject1.setAttribute("id","subj1");
+               Element subject1 = 
document.createElementNS("http://ggf.org/ns/nmwg/tools/hades","subject";);//
+               subject1.setAttribute("id","subject1");
                
                Element endPointPair = 
document.createElementNS("http://ggf.org/ns/nmwg/topology/2.0/","endPointPair";);
                
@@ -101,7 +101,7 @@
                parameters1.setAttribute("id", "param1");
                
                Element eventType = 
document.createElementNS("http://ggf.org/ns/nmwg/base/2.0/","eventType";);
-               eventType.setTextContent("ippm_aggregated");
+               
eventType.setTextContent("http://ggf.org/ns/nmwg/tools/hades";);
        
                metadata1.appendChild(subject1);
                metadata1.appendChild(parameters1);
@@ -111,8 +111,8 @@
                String metadataid2 = "meta2";
                metadata2.setAttribute("id", metadataid2);
                
-               Element subject2 = 
document.createElementNS("http://ggf.org/ns/nmwg/tools/hades/","subject";);
-               subject2.setAttribute("id","subj2");
+               Element subject2 = 
document.createElementNS("http://ggf.org/ns/nmwg/tools/hades","subject";);//
+               subject2.setAttribute("id","subject2");
                subject2.setAttribute("metadataIdRef","meta1");
                
                Element eventType2 = 
document.createElementNS("http://ggf.org/ns/nmwg/base/2.0/","eventType";);