perfsonar development work

Author: gijs
Date: 2007-07-24 04:39:17 -0400 (Tue, 24 Jul 2007)
New Revision: 2564

Added:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java
Removed:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/UserData.java
Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequestAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/QueryResultPanel.java
Log:
renamed classes to get some consistency 

Copied: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java 
(from rev 2563, 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java)

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequestAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequestAction.java
  2007-07-24 08:36:12 UTC (rev 2563)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequestAction.java
  2007-07-24 08:39:17 UTC (rev 2564)
@@ -23,18 +23,18 @@
        private static final long serialVersionUID = -97086740851913593L;
        protected MAEndpointList endpoints;
 
-       public FlowSARequestAction(IPerfsonarRequest request, UserData 
userData,
+       public FlowSARequestAction(IPerfsonarRequest request, FlowSAUserData 
userData,
                        MAEndpointList endpoints) {
                this(request, userData, endpoints, "Query",
                                IPerfsonarTab.defaultGroupQuery);
        }
 
-       public FlowSARequestAction(IPerfsonarRequest request, UserData 
userData,
+       public FlowSARequestAction(IPerfsonarRequest request, FlowSAUserData 
userData,
                        MAEndpointList endpoints, String arg0, String group) {
                this(request, userData, endpoints, arg0, null, group);
        }
 
-       public FlowSARequestAction(IPerfsonarRequest request, UserData 
userData,
+       public FlowSARequestAction(IPerfsonarRequest request, FlowSAUserData 
userData,
                        MAEndpointList endpoints, String arg0, Icon arg1, 
String group) {
                super(request, userData, arg0, arg1, group);
                this.endpoints = endpoints;

Copied: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java 
(from rev 2558, 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/UserData.java)

Deleted: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java

Deleted: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/UserData.java

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/QueryResultPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/QueryResultPanel.java
      2007-07-24 08:36:12 UTC (rev 2563)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/QueryResultPanel.java
      2007-07-24 08:39:17 UTC (rev 2564)
@@ -6,7 +6,7 @@
 import java.util.Observer;
 
 
-import org.perfsonar.perfsonarui.flowsa.UserData;
+import org.perfsonar.perfsonarui.flowsa.FlowSAUserData;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.ui.PluginMainPanel;
 
@@ -15,7 +15,7 @@
        private static final long serialVersionUID = 1L;
 
        public QueryResultPanel(Component parentFrame, IPerfsonarTab model,
-                       org.perfsonar.perfsonarui.flowsa.UserData userData) {
+                       org.perfsonar.perfsonarui.flowsa.FlowSAUserData 
userData) {
                super(parentFrame, model);
 
                userData.addObserver(this);
@@ -38,7 +38,7 @@
 
        public void update(Observable o, Object arg) {
                //cardLayout.show(this, "top");
-               String qt = ((UserData)o).getQuery(UserData.QUERYTYPE);
+               String qt = 
((FlowSAUserData)o).getQuery(FlowSAUserData.QUERYTYPE);
                ((CardLayout)this.getLayout()).show(this, qt);
        }