perfsonar development work

Author: nina
Date: 2008-04-18 13:40:20 -0400 (Fri, 18 Apr 2008)
New Revision: 3734

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataTableModel.java
Log:
A fix for http://bugzilla.perfsonar.net/show_bug.cgi?id=386
If the interface is not found , the corresponding IUserdata.getEndpoint 
returns uninitialized MAEndpoint object, with a default eventtype 
"utilization". Fixed to return null and related checks introduced.

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java  
  2008-04-18 14:40:28 UTC (rev 3733)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java  
  2008-04-18 17:40:20 UTC (rev 3734)
@@ -66,7 +66,7 @@
         */
        public AbstractUserData() {
                super();
-               maData  =   new MAEndpoint("Service address not 
assigned,,,,,");
+               maData  =  null;//new MAEndpoint("Service address not 
assigned,,,,,");
                qr = new QueryResponse();
        }
        /**
@@ -98,7 +98,8 @@
        public void setEndpoint(MAEndpoint endpoint) {
         if (endpoint==null) maData =null;
         else {
-
+            if (maData == null) 
+                maData = new MAEndpoint("Service address not assigned,,,,,");
            maData.setTitle(endpoint.getTitle());
                maData.setEndpoint(endpoint.getEndpoint());
                maData.setSchema(endpoint.getSchema());

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2008-04-18 14:40:28 UTC (rev 3733)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2008-04-18 17:40:20 UTC (rev 3734)
@@ -287,8 +287,8 @@
                    IUserData data  = (IUserData) queryList.get(i);
                    MAEndpoint e = data.getEndpoint();
 
+                if (e == null) continue;
 
-
                    MetaDataList d = (MetaDataList)list.get(e.toString());
                    if (d == null) {
                        d = new MetaDataList(null);

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataTableModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataTableModel.java
     2008-04-18 14:40:28 UTC (rev 3733)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataTableModel.java
     2008-04-18 17:40:20 UTC (rev 3734)
@@ -24,6 +24,7 @@
 
 import javax.swing.table.AbstractTableModel;
 
+import org.perfsonar.perfsonarui.AbstractUserData;
 import org.perfsonar.perfsonarui.ma.UserData;
 import org.perfsonar.perfsonarui.plugins.IUserData;
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
@@ -89,7 +90,10 @@
                        case 9: {return 
data.getResponse(UserData.names[UserData.INDEX_IFBITS_OUT]);}
             case 10: {return 
data.getResponse(UserData.names[UserData.INDEX_INERRORS]);}
             case 11: {return 
data.getResponse(UserData.names[UserData.INDEX_OUTDISCARDS]);}
-                       case 12: {return data.getEndpoint().getTitle();}
+                       case 12: {if (data.getEndpoint()==null) 
+                        return AbstractUserData.NULL_DATA;
+                                   else return data.getEndpoint().getTitle();
+            }
             case 13: {
                 return data.getResponse(IUserData.C_STATUS);
                 }