perfsonar development work

Author: nina
Date: 2007-10-28 16:21:36 -0400 (Sun, 28 Oct 2007)
New Revision: 3006

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/TimeValueResponseListener.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/PerfsonarTimeSeries.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataDetailsPane.java
Log:
Fixes for Bug234
https://bugzilla.perfsonar.net/show_bug.cgi?id=234

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java  
  2007-10-28 20:18:15 UTC (rev 3005)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java  
  2007-10-28 20:21:36 UTC (rev 3006)
@@ -66,7 +66,7 @@
         */
        public AbstractUserData() {
                super();
-               maData  =  new MAEndpoint("http://selena.acad.bg:8090";);
+               maData  =  new MAEndpoint("Service address not 
assigned,,,,,");
                qr = new QueryResponse();
        }
        /**
@@ -74,6 +74,7 @@
         */
        public void clear() {
                qr.clear();
+        setResponse(AbstractUserData.C_STATUS,NULL_DATA);
                setChanged();
                notifyObservers();
                
@@ -248,6 +249,7 @@
        }
        public void makeQueryFromResponse() {
                qr.makeQueryFromResponse();
+        setResponse(AbstractUserData.C_STATUS,NULL_DATA);
        }
        public boolean isNotificationEnabled() {
                return notificationEnabled;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2007-10-28 20:18:15 UTC (rev 3005)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2007-10-28 20:21:36 UTC (rev 3006)
@@ -24,6 +24,7 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
 
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarResponse;
@@ -252,8 +253,8 @@
             String messageType, IPerfsonarResponse response, boolean 
runInThread) {
            try {
             //in order to clear the status bar if an error had occurred on 
the previous requests
-            firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_ERROR,
-                    null,null
+            firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_CLEAR,
+                    null,messageType
                     ));
                //Makes different nodes for each endpoint, in order to create 
aggregated requests
             for (int i=0; i < queryList.size();i++)
@@ -281,23 +282,28 @@
 
                for (int i=0; i < queries.size(); i++) {
                        MetaDataList d = queries.get(i);
-                   IPerfsonarRequest mr = 
getMARequest(d.get(0).getEndpoint());
-                               if (mr != null)  {
-                                       
mr.makeRequest(d.get(0).getEndpoint(), d, messageType, response, parallel &  
runInThread);
-                               }
+                try {
+                   IPerfsonarRequest mr = 
getMARequest(d.get(0).getEndpoint());
+                               if (mr != null)  
+                                       
mr.makeRequest(d.get(0).getEndpoint(), d, messageType, response, parallel &  
runInThread);
+                               } catch (PSException x) {
+                    fireAxisCallException(d, x);            
+                }
+                
                }
 
 
                Enumeration keys = list.keys();
                while (keys.hasMoreElements()) {
                    MetaDataList d = list.get(keys.nextElement());
+                   try {
+                   IPerfsonarRequest mr = 
getMARequest(d.get(0).getEndpoint());
+                               if (mr != null)  
+                                       
mr.makeRequest(d.get(0).getEndpoint(), d, messageType, response, parallel & 
runInThread);
 
-                   IPerfsonarRequest mr = 
getMARequest(d.get(0).getEndpoint());
-                               if (mr != null)  {
-
-                                       
mr.makeRequest(d.get(0).getEndpoint(), d, messageType, response, parallel & 
runInThread);
-
-                               }
+                               } catch (PSException x) {
+                    fireAxisCallException(d, x);            
+                }
                }
 
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/TimeValueResponseListener.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/TimeValueResponseListener.java
   2007-10-28 20:18:15 UTC (rev 3005)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/TimeValueResponseListener.java
   2007-10-28 20:21:36 UTC (rev 3006)
@@ -42,9 +42,10 @@
                super.process(request, uData, response);
                timeValueResponse.initializeResponse();
                try {
-               request.process(uData, response, this);
+                   request.process(uData, response, this);
                } catch (Exception x) {
                        logger.error(x);
+            timeValueResponse.clear();
                }
                timeValueResponse.finalizeResponse();
                

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-10-28 20:18:15 UTC (rev 3005)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-10-28 20:21:36 UTC (rev 3006)
@@ -174,6 +174,9 @@
                return new SmartMARequest() {
                        @Override
                        public IPerfsonarRequest createMARequest(MAEndpoint 
endpoint) throws PSException {
+                if ((endpoint == null) || 
(endpoint.getEndpoint().equals(""))) 
+                        throw new PSException("No service address!");
+
                                IPerfsonarSchema schema = 
endpoint.getSchema();
                                if (schema.equals("NMWG2v2")) return new 
MARequest_NMWG2();
                                else if (schema.equals("NMWG2v2_netutil")) 
return new MARequest_NMWG2_Netutil();

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
    2007-10-28 20:18:15 UTC (rev 3005)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
    2007-10-28 20:21:36 UTC (rev 3006)
@@ -121,8 +121,13 @@
         Node eventType = 
((org.w3c.dom.Element)metadata).getElementsByTagNameNS(URI_nmwg[nmwg_version],"eventType").item(0);
         if (eventType != null) {
             String event = eventType.getFirstChild().getNodeValue();
-            if (event.startsWith("error."))
-                fireAxisCallException(userData, new 
PSException(userData,event));
+            if (event.startsWith("error.")) {
+                PSException x = new PSException(userData,event);
+                logger.error(event);
+                fireAxisCallException(userData, x);
+                userData.setResponse(AbstractUserData.C_STATUS,event);
+                
+            }    
             else {    
                 if (userData.isInput())
                     userData.getEndpoint().setEvent(event,0);

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/PerfsonarTimeSeries.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/PerfsonarTimeSeries.java
       2007-10-28 20:18:15 UTC (rev 3005)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/PerfsonarTimeSeries.java
       2007-10-28 20:21:36 UTC (rev 3006)
@@ -128,12 +128,25 @@
                if (!userData.equals(this.userData)) 
                        clear();
            this.userData = userData;
+        //System.out.println(userData);
                try {
-                       timeStart = Long
+                       long newtimeStart = Long
                                        .parseLong(userData.getStartTime()) * 
1000;
-                       timeEnd = Long.parseLong(userData.getEndTime()) * 
1000;
+                       long newtimeEnd = 
Long.parseLong(userData.getEndTime()) * 1000;
 
+                       if ((newtimeEnd != timeEnd) || (newtimeStart != 
timeStart)) {
+                           /*
+                System.out.println("Current\t"+title+"\t"+timeStart + 
"\t-->\t" + timeEnd + "\tPoints="+series.getItemCount());
+                System.out.println("New\t"+title+"\t"+newtimeStart + 
"\t-->\t" + newtimeEnd);
+                */
+                series.clear();
+            }    
+            setTimeEnd(newtimeEnd);
+            setTimeStart(newtimeStart);
+            
                } catch (Exception x) {
+            logger.error(x);
+            series.clear();
                }
                fireDatasetChanged();
        }
@@ -145,6 +158,7 @@
 
        public void finalizeResponse() {
                series.setNotify(true);
+        
        }
        @Override
        public String toString() {
@@ -152,6 +166,26 @@
                        return userData.toString();
                else return "";
        }
+
+
+    public synchronized long getTimeEnd() {
+        return timeEnd;
+    }
+
+
+    public synchronized void setTimeEnd(long timeEnd) {
+        this.timeEnd = timeEnd;
+    }
+
+
+    public synchronized long getTimeStart() {
+        return timeStart;
+    }
+
+
+    public synchronized void setTimeStart(long timeStart) {
+        this.timeStart = timeStart;
+    }
        
 
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java 
2007-10-28 20:18:15 UTC (rev 3005)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java 
2007-10-28 20:21:36 UTC (rev 3006)
@@ -240,7 +240,7 @@
         sp.setPreferredSize(new Dimension(350,200));
         p.add(sp,BorderLayout.CENTER);
         
-        Object[] options = {"OK",
+        Object[] options = {"Hide",
                 "Clear"
                 };
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataDetailsPane.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataDetailsPane.java
       2007-10-28 20:18:15 UTC (rev 3005)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataDetailsPane.java
       2007-10-28 20:21:36 UTC (rev 3006)
@@ -108,7 +108,10 @@
                this.title = title;
                label = new JLabel();
                label.setMinimumSize(new Dimension(Integer.MAX_VALUE,18));
-               label.setText(userData.getEndpoint().getTitle());
+        if (userData.getEndpoint() == null)
+            label.setText("Unknown");
+        else    
+            label.setText(userData.getEndpoint().getTitle());
                table = new 
UserDataTable(dataList,columns,options_editable,query,enableColumn);
                //table.setBackground(getBackground());
                pane = new JScrollPane(table);