Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2975 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui org/perfsonar/perfsonarui/flowsa org/perfsonar/perfsonarui/flowsa/components org/perfsonar/perfsonarui/ippm/ui/actions org/perfsonar/perfsonarui/links org/perfsonar/perfsonarui/linkstatus org/perfsonar/perfsonarui/lookingglass org/perfsonar/perfsonarui/ma/ui/actions org/perfsonar/perfsonarui/playground org/perfsonar/perfsonarui/test/flowsa org/perfsonar/perfsonarui/ui org/perfsonar/perfsonarui/ui/actions

Subject: perfsonar development work

List archive

perfsonar: r2975 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui org/perfsonar/perfsonarui/flowsa org/perfsonar/perfsonarui/flowsa/components org/perfsonar/perfsonarui/ippm/ui/actions org/perfsonar/perfsonarui/links org/perfsonar/perfsonarui/linkstatus org/perfsonar/perfsonarui/lookingglass org/perfsonar/perfsonarui/ma/ui/actions org/perfsonar/perfsonarui/playground org/perfsonar/perfsonarui/test/flowsa org/perfsonar/perfsonarui/ui org/perfsonar/perfsonarui/ui/actions


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2975 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui org/perfsonar/perfsonarui/flowsa org/perfsonar/perfsonarui/flowsa/components org/perfsonar/perfsonarui/ippm/ui/actions org/perfsonar/perfsonarui/links org/perfsonar/perfsonarui/linkstatus org/perfsonar/perfsonarui/lookingglass org/perfsonar/perfsonarui/ma/ui/actions org/perfsonar/perfsonarui/playground org/perfsonar/perfsonarui/test/flowsa org/perfsonar/perfsonarui/ui org/perfsonar/perfsonarui/ui/actions
  • Date: Thu, 18 Oct 2007 21:04:22 -0400
Author: michael.bischoff
Date: 2007-10-18 21:04:22 -0400 (Thu, 18 Oct 2007)
New Revision: 2975

Added:

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMARequest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMAResponse.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMAUserData.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/StatisticsPanel.java
Removed:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAResponse.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/Result.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/DefaultResultModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultView.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractPerfsonarResponse.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/DebugPerfsonarResponse.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoMARequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/PSLogger.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarRequestsPool.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/OptionsPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/RawSpecificsPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/RouterPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/SpecificsPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopParametersPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopSpecificsPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/actions/IPPMMetadataKeyRequest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/links/GeoSpatialPlacingAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksSearchAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksTracerouteSearchAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LiveUpdateAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/GeoSpatialPlacingAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LiveStatusUpdateAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LookupServiceAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/StatusAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/TopologyAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRefreshActionAll.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequestAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/test/flowsa/RequestTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/EchoAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/MetadataRequestAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/PerfsonarRequestAction.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SetupDataRequestAction.java
branches/perfsonarui/src/plugins.flowsa.classes
branches/perfsonarui/src/resources.files
Log:


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
2007-10-19 01:01:16 UTC (rev 2974)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -178,7 +178,7 @@

//setRunning(false);
//TODO the connection might be still active - is there way to stop
it?
- call.setTimeout(0);
+ call.setTimeout(Integer.valueOf(0));
call = null;
//TODO this is wrong, service is a static var ...
service = null;

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractPerfsonarResponse.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractPerfsonarResponse.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractPerfsonarResponse.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -37,7 +37,7 @@
*
*/
public abstract class AbstractPerfsonarResponse implements
IPerfsonarResponse {
- protected int countInitiated = 0;;
+ protected int countInitiated = 0;
protected int countCompleted = 0;
protected int countErrors = 0;
protected int countResult = 0;
@@ -172,8 +172,8 @@
logger.info("Response object is null!");
} else {
if (response instanceof Vector) {
- for (int i=0; i < ((Vector)response).size();
i++) {
- Object o = ((Vector) response).get(i);
+ for (int i=0; i <
((Vector<?>)response).size(); i++) {
+ Object o = ((Vector<?>)
response).get(i);
if (o instanceof SOAPBodyElement) {
try {
process(request,
uData, ((SOAPBodyElement)o).getAsDocument());

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
2007-10-19 01:01:16 UTC (rev 2974)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -115,7 +115,8 @@
}
public Document getResponse() {
Object o = qr.query_response[1].get(DOCUMENT_RESPONSE);
- if ((o != null) && (o instanceof Document)) return
(Document)o; else return null;
+ if ((o != null) && (o instanceof Document)) return
(Document)o;
+ return null;
}
/**
* Sets response parameter/value pair

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/DebugPerfsonarResponse.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/DebugPerfsonarResponse.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/DebugPerfsonarResponse.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -55,10 +55,10 @@
@Override
public void processingCompleted(IPerfsonarRequest request) {
super.callCompleted(request);
-
logger.debug(PerfsonarResponseEvent.COMMAND_PROCESSINGCOMPLETED+"\t"+request);
-
+
logger.debug(PerfsonarResponseEvent.COMMAND_PROCESSINGCOMPLETED+"\t"+request);

}

+ @Override
public void callException(PerfsonarResponseEvent e) {

logger.debug(PerfsonarResponseEvent.COMMAND_CALLEXCEPTION+"\t"+e.getRequest());
logger.debug(e.getException());

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoMARequest.java
2007-10-19 01:01:16 UTC (rev 2974)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoMARequest.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -148,13 +148,13 @@
Iterator<org.w3c.dom.Element> i = metadataChain.iterator();
while (i.hasNext()) {
org.w3c.dom.Element metadata = i.next();
- String result = getText((org.w3c.dom.Element)metadata);
+ String result = getText(metadata);
if (result != null)
((EchoResponse) listener).setStatus(result);
}

- if (data instanceof org.w3c.dom.Element) {
- String result = getText((org.w3c.dom.Element)data);
+ if (data != null) {
+ String result = getText(data);
if (result != null)
((EchoResponse)
listener).setStatusExplanation(result);
}

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java
2007-10-19 01:01:16 UTC (rev 2974)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -84,23 +84,21 @@
public String getFullMessage() {
if (maEndpoint == null)
return super.getMessage();
- else {
- StringBuffer b = new StringBuffer();
- b.append(super.getMessage());
- b.append("\n");
- b.append(maEndpoint.getTitle());
- b.append(" at ");
- b.append(maEndpoint.getEndpoint());
- b.append("\n");
- if (getCause() != null)
- b.append(getCause());
- return b.toString();
- }
+ StringBuffer b = new StringBuffer();
+ b.append(super.getMessage());
+ b.append("\n");
+ b.append(maEndpoint.getTitle());
+ b.append(" at ");
+ b.append(maEndpoint.getEndpoint());
+ b.append("\n");
+ if (getCause() != null)
+ b.append(getCause());
+ return b.toString();
}
@Override
public String toString() {
if (maEndpoint != null) return super.toString() + " " + maEndpoint;
- else return super.toString();
+ return super.toString();
}

}

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/PSLogger.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PSLogger.java
2007-10-19 01:01:16 UTC (rev 2974)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PSLogger.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -22,12 +22,6 @@
import java.io.PrintWriter;
import java.io.StringWriter;

-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
import org.w3c.dom.Document;

/**
@@ -96,8 +90,7 @@
* uses the java.net.URLClassLoader. */
//if (false) throw new ClassNotFoundException(); // NOPMD

- log4jLogger =
(org.apache.log4j.Category)org.apache.log4j.Category
- .getInstance( classname
);
+ log4jLogger = org.apache.log4j.Category.getInstance( classname );
/*
} catch (ClassNotFoundException e) {
tostdout = true;

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarRequestsPool.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarRequestsPool.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarRequestsPool.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -50,16 +50,16 @@
public IPerfsonarRequest getRequest() throws Exception {
IPerfsonarRequest con = null;

- java.util.Enumeration cons = connections.keys();
+ java.util.Enumeration<IPerfsonarRequest> cons =
connections.keys();

synchronized (connections) {

int n = 0;
while(cons.hasMoreElements()) {
n++;
- con = (IPerfsonarRequest)cons.nextElement();
+ con = cons.nextElement();

- Boolean b = (Boolean)connections.get(con);
+ Boolean b = connections.get(con);
if (b == Boolean.FALSE) {
// So we found an unused connection.
// Update the Hashtable to show this one's taken
@@ -91,9 +91,9 @@
synchronized (connections) {
IPerfsonarRequest con;

- java.util.Enumeration cons = connections.keys();
+ java.util.Enumeration<IPerfsonarRequest> cons =
connections.keys();
while (cons.hasMoreElements()) {
- con = (IPerfsonarRequest)cons.nextElement();
+ con = cons.nextElement();
if (con == returned) {
//connections.put(con, Boolean.FALSE);
connections.remove(con);
@@ -112,11 +112,11 @@
super.finalize();
}
public void close() throws Throwable {
- java.util.Enumeration cons = connections.keys();
+ java.util.Enumeration<IPerfsonarRequest> cons =
connections.keys();

synchronized (connections) {
while(cons.hasMoreElements()) {
- IPerfsonarRequest con =
(IPerfsonarRequest)cons.nextElement();
+ IPerfsonarRequest con = cons.nextElement();
connections.remove(con);
con.close();
con = null;
@@ -126,11 +126,11 @@
}

public void interrupt() throws Throwable {
- java.util.Enumeration cons = connections.keys();
+ java.util.Enumeration<IPerfsonarRequest> cons =
connections.keys();

synchronized (connections) {
while(cons.hasMoreElements()) {
- IPerfsonarRequest con =
(IPerfsonarRequest)cons.nextElement();
+ IPerfsonarRequest con = cons.nextElement();
con.interrupt();
}
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
2007-10-19 01:01:16 UTC (rev 2974)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -54,11 +54,11 @@
@Override
public boolean equals(Object obj) {
if (obj instanceof IPerfsonarSchema) return
((IPerfsonarSchema) obj).getSchema().equals(schema);
- else
- return getSchema().equals(obj.toString());
+ return getSchema().equals(obj.toString());
}

- public int hashCode() {
+ @Override
+ public int hashCode() {
int hash = 7;
int var_code = (null == schema ? 0 : schema.hashCode());
hash = 31 * hash + var_code;

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2007-10-19 01:01:16 UTC (rev 2974)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -153,6 +153,10 @@

}

+ /**
+ * blocks if there are still requests running
+ * @return
+ */
public synchronized int isReady() {

while (getRequestsRunning() > 0) {

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

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

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

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

Copied:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMARequest.java
(from rev 2957,
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java)

Copied:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMAResponse.java
(from rev 2957,
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAResponse.java)

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java

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

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

Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/DefaultResultModel.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/OptionsPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/OptionsPanel.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/OptionsPanel.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -25,7 +25,7 @@
import javax.swing.event.ChangeListener;

import org.jdesktop.layout.GroupLayout;
-import org.perfsonar.perfsonarui.flowsa.FlowSAUserData;
+import org.perfsonar.perfsonarui.flowsa.FlowsaMAUserData;
import org.perfsonar.perfsonarui.plugins.IUserData;

public class OptionsPanel extends JPanel {
@@ -34,7 +34,7 @@

private IUserData model;

- public OptionsPanel(FlowSAUserData model) {
+ public OptionsPanel(FlowsaMAUserData model) {
super(null);
this.model = model;

@@ -46,25 +46,25 @@
configureLayout(queryTypePanel, routerPanel, periodPanel,
specificsPanel);
}

- protected JPanel createSpecificsPanel(FlowSAUserData model) {
+ protected JPanel createSpecificsPanel(FlowsaMAUserData model) {
JPanel panel = new SpecificsPanel(model);

panel.setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED));
return panel;
}

- protected JPanel createPeriodPanel(final FlowSAUserData model) {
+ protected JPanel createPeriodPanel(final FlowsaMAUserData model) {
Calendar calendar = Calendar.getInstance();
final DateTimeModel endTimeModel = new
DefaultDateTimeModel(calendar);
calendar.roll(Calendar.MINUTE, -1);
final DateTimeModel startTimeModel = new
DefaultDateTimeModel(calendar);
startTimeModel.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
-
model.setQuery(FlowSAUserData.STARTMOMENT,String.valueOf(startTimeModel.getValue().getTime()/1000));
+
model.setQuery(FlowsaMAUserData.STARTMOMENT,String.valueOf(startTimeModel.getValue().getTime()/1000));
}
});
endTimeModel.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
-
model.setQuery(FlowSAUserData.ENDMOMENT,String.valueOf(endTimeModel.getValue().getTime()/1000));
+
model.setQuery(FlowsaMAUserData.ENDMOMENT,String.valueOf(endTimeModel.getValue().getTime()/1000));
}
});

@@ -73,21 +73,21 @@
return picker;
}

- protected JComponent createRouterPanel(final FlowSAUserData model) {
+ protected JComponent createRouterPanel(final FlowsaMAUserData model) {
JComponent panel = new RouterPanel(model);
panel.setBorder(BorderFactory.createTitledBorder("Routers:"));
return panel;
}

- protected JPanel createQueryTypePanel(final FlowSAUserData model) {
+ protected JPanel createQueryTypePanel(final FlowsaMAUserData model) {
JPanel panel = new JPanel(null);
panel.setBorder(BorderFactory.createTitledBorder("Type:"));

- final JComboBox box = new JComboBox(new
DefaultComboBoxModel(FlowSAUserData.QueryType.values()));
+ final JComboBox box = new JComboBox(new
DefaultComboBoxModel(FlowsaMAUserData.QueryType.values()));
box.addActionListener(new AbstractAction(){
private static final long serialVersionUID = 1L;
public void actionPerformed(ActionEvent e) {
- model.setQuery(FlowSAUserData.QUERYTYPE,
String.valueOf(box.getSelectedItem()));
+ model.setQuery(FlowsaMAUserData.QUERYTYPE,
String.valueOf(box.getSelectedItem()));
}
});


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/RawSpecificsPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/RawSpecificsPanel.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/RawSpecificsPanel.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -13,7 +13,7 @@
import javax.swing.event.ListDataListener;

import org.jdesktop.layout.GroupLayout;
-import org.perfsonar.perfsonarui.flowsa.FlowSAUserData;
+import org.perfsonar.perfsonarui.flowsa.FlowsaMAUserData;
import org.perfsonar.perfsonarui.ui.panels.DefaultModifiableListModel;
import org.perfsonar.perfsonarui.ui.panels.JDualListItemSelector;
import org.perfsonar.perfsonarui.ui.panels.ModifiableListModel;
@@ -25,7 +25,7 @@

private static final long serialVersionUID = 1L;

- public RawSpecificsPanel(FlowSAUserData model) {
+ public RawSpecificsPanel(FlowsaMAUserData model) {
JComponent filterComponent = createFilterComponent(model);
JComponent aggregationRuleComponent =
createAggregationComponent(model);
JComponent fieldComponent = createFieldComponent(model);
@@ -33,7 +33,7 @@
setLayout(createLayout(filterComponent,
aggregationRuleComponent, fieldComponent));
}

- protected JComponent createFieldComponent(final FlowSAUserData model)
{
+ protected JComponent createFieldComponent(final FlowsaMAUserData
model) {
ModifiableListModel<String> avail = new
DefaultModifiableListModel<String>();
avail.addAll(Arrays.asList(new String[] {
"MsecFirstSeen",
"MsecLastSeen","AddressFamily","SrcAS","DstAS","InputIF",
@@ -49,9 +49,9 @@
}
String value = builder.toString();
if(!value.equals("")) {
-
model.setQuery(FlowSAUserData.RAWFIELDS, value);
+
model.setQuery(FlowsaMAUserData.RAWFIELDS, value);
} else {
-
model.setQuery(FlowSAUserData.RAWFIELDS, "N/A");
+
model.setQuery(FlowsaMAUserData.RAWFIELDS, "N/A");
}
}
public void intervalAdded(ListDataEvent e) {/*
ignored */}
@@ -66,15 +66,15 @@
return fieldPanel;
}

- protected JComponent createAggregationComponent(final FlowSAUserData
model) {
+ protected JComponent createAggregationComponent(final
FlowsaMAUserData model) {
final JTextArea aggregationRuleField = new JTextArea(3,20);
aggregationRuleField.addCaretListener(new CaretListener() {
public void caretUpdate(CaretEvent e) {
String value = aggregationRuleField.getText();
if(value != null && !value.equals("")) {
-
model.setQuery(FlowSAUserData.RAWAGGREGATION, value);
+
model.setQuery(FlowsaMAUserData.RAWAGGREGATION, value);
} else {
-
model.setQuery(FlowSAUserData.RAWAGGREGATION, "N/A");
+
model.setQuery(FlowsaMAUserData.RAWAGGREGATION, "N/A");
}
aggregationRuleField.requestFocusInWindow();
}
@@ -86,16 +86,16 @@
return aggregationRuleComponent;
}

- protected JComponent createFilterComponent(final FlowSAUserData
model) {
+ protected JComponent createFilterComponent(final FlowsaMAUserData
model) {
final JTextArea filterField = new JTextArea(3,20);
filterField.setEditable(true);
filterField.addCaretListener(new CaretListener() {
public void caretUpdate(CaretEvent e) {
String value = filterField.getText();
if(value != null && !value.equals("")) {
-
model.setQuery(FlowSAUserData.RAWFILTER, value);
+
model.setQuery(FlowsaMAUserData.RAWFILTER, value);
} else {
-
model.setQuery(FlowSAUserData.RAWFILTER, "N/A");
+
model.setQuery(FlowsaMAUserData.RAWFILTER, "N/A");
}
filterField.requestFocusInWindow();
}

Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultModel.java

Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultView.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/RouterPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/RouterPanel.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/RouterPanel.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -14,7 +14,7 @@
import javax.swing.ScrollPaneConstants;

import org.jdesktop.layout.GroupLayout;
-import org.perfsonar.perfsonarui.flowsa.FlowSAUserData;
+import org.perfsonar.perfsonarui.flowsa.FlowsaMAUserData;
import org.perfsonar.perfsonarui.flowsa.Router;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.ui.panels.CheckListModel;
@@ -25,7 +25,7 @@
public class RouterPanel extends JPanel {
private static final long serialVersionUID = 1L;

- public RouterPanel(FlowSAUserData model) {
+ public RouterPanel(FlowsaMAUserData model) {
JComponent list = createRouterList(model);

setLayout(createLayoutManager(list));
@@ -52,7 +52,7 @@
return layout;
}

- private JComponent createRouterList(final FlowSAUserData model) {
+ private JComponent createRouterList(final FlowsaMAUserData model) {
final CheckListModel<Router> checkListModel = new
DefaultCheckListModel<Router>();
checkListModel.addItem(new
Router("xsr01.asd001a.surf.net","SURFnet6 Core Router Amsterdam1"));
final JCheckList<Router> list = new
JCheckList<Router>(checkListModel);
@@ -81,11 +81,11 @@
builder.append(" ");
}
String routers = builder.toString();
- if(routers !=
model.getQuery(FlowSAUserData.ROUTERS)) {
+ if(routers !=
model.getQuery(FlowsaMAUserData.ROUTERS)) {
if(!routers.equals("")) {
-
model.setQuery(FlowSAUserData.ROUTERS, routers);
+
model.setQuery(FlowsaMAUserData.ROUTERS, routers);
} else {
-
model.setQuery(FlowSAUserData.ROUTERS, "N/A");
+
model.setQuery(FlowsaMAUserData.ROUTERS, "N/A");
}
}
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/SpecificsPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/SpecificsPanel.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/SpecificsPanel.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -7,15 +7,15 @@
import javax.swing.JComponent;
import javax.swing.JPanel;

-import org.perfsonar.perfsonarui.flowsa.FlowSAUserData;
-import org.perfsonar.perfsonarui.flowsa.FlowSAUserData.QueryType;
+import org.perfsonar.perfsonarui.flowsa.FlowsaMAUserData;
+import org.perfsonar.perfsonarui.flowsa.FlowsaMAUserData.QueryType;

public class SpecificsPanel extends JPanel {

private static final long serialVersionUID = 1L;
protected JComponent currentPanel;

- public SpecificsPanel(final FlowSAUserData model) {
+ public SpecificsPanel(final FlowsaMAUserData model) {
super(new BorderLayout());
final JComponent rawPanel = createRawPanel(model);
final JComponent statisticsPanel =
createStatisticsPanel(model);
@@ -23,7 +23,7 @@

model.addObserver(new Observer() {
public void update(Observable o, Object arg) {
- String typeValue =
model.getQuery(FlowSAUserData.QUERYTYPE);
+ String typeValue =
model.getQuery(FlowsaMAUserData.QUERYTYPE);
QueryType type = QueryType.get(typeValue);
switch (type) {
case RAW:
@@ -42,7 +42,7 @@
}
});

- String typeValue = model.getQuery(FlowSAUserData.QUERYTYPE);
+ String typeValue = model.getQuery(FlowsaMAUserData.QUERYTYPE);
QueryType type = QueryType.get(typeValue);
switch (type) {
case RAW:
@@ -73,19 +73,19 @@
}
}

- private JComponent createTopPanel(FlowSAUserData model) {
+ private JComponent createTopPanel(FlowsaMAUserData model) {
JPanel panel = new TopSpecificsPanel(model);

panel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEmptyBorder(1,
1, 1, 1), "Topdata specifics"));
return panel;
}

- private JComponent createStatisticsPanel(FlowSAUserData model) {
+ private JComponent createStatisticsPanel(FlowsaMAUserData model) {
JPanel panel = new JPanel();

panel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEmptyBorder(1,
1, 1, 1), "no specifics"));
return panel;
}

- private JComponent createRawPanel(FlowSAUserData model) {
+ private JComponent createRawPanel(FlowsaMAUserData model) {
JPanel panel = new RawSpecificsPanel(model);

panel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEmptyBorder(1,
1, 1, 1), "Raw specifics"));
return panel;

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/StatisticsPanel.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopParametersPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopParametersPanel.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopParametersPanel.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -1,33 +1,37 @@
package org.perfsonar.perfsonarui.flowsa.components;

+import static org.jdesktop.layout.GroupLayout.BASELINE;
+import static org.jdesktop.layout.GroupLayout.DEFAULT_SIZE;
+import static org.jdesktop.layout.GroupLayout.LEADING;
+import static org.jdesktop.layout.GroupLayout.PREFERRED_SIZE;
+import static org.jdesktop.layout.GroupLayout.TRAILING;
+import static org.jdesktop.layout.LayoutStyle.RELATED;
+
import java.awt.LayoutManager;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;

+import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSeparator;
import javax.swing.JSpinner;
-import javax.swing.JToggleButton;
import javax.swing.SpinnerNumberModel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;

import org.jdesktop.layout.GroupLayout;
-import org.perfsonar.perfsonarui.flowsa.FlowSAUserData;
+import org.perfsonar.perfsonarui.flowsa.FlowsaMAUserData;

-import static org.jdesktop.layout.GroupLayout.*;
-import static org.jdesktop.layout.LayoutStyle.*;
-
public class TopParametersPanel extends JPanel {

private static final long serialVersionUID = 1L;

- public TopParametersPanel(FlowSAUserData model) {
+ public TopParametersPanel(FlowsaMAUserData model) {
JComponent elementLabel = createElementLabel(model);
JComponent orderByLabel = createOrderByLabel(model);
JComponent elementBox = createElementBox(model);
@@ -39,44 +43,44 @@
setLayout(createLayout(elementLabel, orderByLabel,
elementBox, orderByBox, flowAmountLabel, flowAmountSelector,
groupProtocolsSelector));
}

- private JComponent createFlowAmountLabel(FlowSAUserData model) {
+ private JComponent createFlowAmountLabel(FlowsaMAUserData model) {
return new JLabel("Number of Flows:");
}

- private JComponent createFlowAmountSelector(final FlowSAUserData
model) {
+ private JComponent createFlowAmountSelector(final FlowsaMAUserData
model) {
final SpinnerNumberModel spinnerModel = new
SpinnerNumberModel(10, 0, 1000, 5);
final JSpinner selector = new JSpinner(spinnerModel);
selector.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
- model.setQuery(FlowSAUserData.TOPNUMBER,
spinnerModel.getNumber().toString());
+ model.setQuery(FlowsaMAUserData.TOPNUMBER,
spinnerModel.getNumber().toString());
selector.requestFocusInWindow();
}
});
- model.setQuery(FlowSAUserData.TOPNUMBER,
spinnerModel.getNumber().toString());
+ model.setQuery(FlowsaMAUserData.TOPNUMBER,
spinnerModel.getNumber().toString());
return selector;
}

- private JComponent createGroupProtocolsSelector(final FlowSAUserData
model) {
- final JToggleButton selector = new JToggleButton("Group
transport protocols");
+ private JComponent createGroupProtocolsSelector(final
FlowsaMAUserData model) {
+ final JCheckBox selector = new JCheckBox("Group transport
protocols");
selector.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if(selector.isSelected()) {
-
model.setQuery(FlowSAUserData.TOPTRANSGROUP, "yes");
+
model.setQuery(FlowsaMAUserData.TOPTRANSGROUP, "yes");
} else {
-
model.setQuery(FlowSAUserData.TOPTRANSGROUP, "no");
+
model.setQuery(FlowsaMAUserData.TOPTRANSGROUP, "no");
}
requestFocusInWindow();
}
});
if(selector.isSelected()) {
- model.setQuery(FlowSAUserData.TOPTRANSGROUP, "yes");
+ model.setQuery(FlowsaMAUserData.TOPTRANSGROUP, "yes");
} else {
- model.setQuery(FlowSAUserData.TOPTRANSGROUP, "no");
+ model.setQuery(FlowsaMAUserData.TOPTRANSGROUP, "no");
}
return selector;
}

- private JComponent createOrderByBox(final FlowSAUserData model) {
+ private JComponent createOrderByBox(final FlowsaMAUserData model) {
final JComboBox box = new JComboBox(
new javax.swing.DefaultComboBoxModel(
new String[] {
@@ -86,15 +90,15 @@
);
box.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
- model.setQuery(FlowSAUserData.TOPORDERBY,
String.valueOf(box.getSelectedItem()));
+ model.setQuery(FlowsaMAUserData.TOPORDERBY,
String.valueOf(box.getSelectedItem()));
box.requestFocusInWindow();
}
});
- model.setQuery(FlowSAUserData.TOPORDERBY,
String.valueOf(box.getSelectedItem()));
+ model.setQuery(FlowsaMAUserData.TOPORDERBY,
String.valueOf(box.getSelectedItem()));
return box;
}

- private JComponent createElementBox(final FlowSAUserData model) {
+ private JComponent createElementBox(final FlowsaMAUserData model) {
final JComboBox box = new JComboBox(
new javax.swing.DefaultComboBoxModel(
new String[] {
@@ -104,19 +108,19 @@
);
box.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
- model.setQuery(FlowSAUserData.TOPELEMENTS,
String.valueOf(box.getSelectedItem()));
+ model.setQuery(FlowsaMAUserData.TOPELEMENTS,
String.valueOf(box.getSelectedItem()));
box.requestFocusInWindow();
}
});
- model.setQuery(FlowSAUserData.TOPELEMENTS,
String.valueOf(box.getSelectedItem()));
+ model.setQuery(FlowsaMAUserData.TOPELEMENTS,
String.valueOf(box.getSelectedItem()));
return box;
}

- private JComponent createOrderByLabel(FlowSAUserData model) {
+ private JComponent createOrderByLabel(FlowsaMAUserData model) {
return new JLabel("Order by:");
}

- private JComponent createElementLabel(FlowSAUserData model) {
+ private JComponent createElementLabel(FlowsaMAUserData model) {
return new JLabel("Element:");
}


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopSpecificsPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopSpecificsPanel.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopSpecificsPanel.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -13,12 +13,12 @@
import org.jdesktop.layout.GroupLayout;
import static org.jdesktop.layout.GroupLayout.*;
import static org.jdesktop.layout.LayoutStyle.*;
-import org.perfsonar.perfsonarui.flowsa.FlowSAUserData;
+import org.perfsonar.perfsonarui.flowsa.FlowsaMAUserData;

public class TopSpecificsPanel extends JPanel {
private static final long serialVersionUID = 1L;

- public TopSpecificsPanel(FlowSAUserData model) {
+ public TopSpecificsPanel(FlowsaMAUserData model) {
JComponent parametersComponent =
createParametersComponent(model);
JComponent aggregationRuleComponent =
createAggregationComponent(model);
JComponent filterComponent = createFilterComponent(model);
@@ -26,22 +26,22 @@
setLayout(createLayout(parametersComponent,
aggregationRuleComponent,filterComponent));
}

- private JComponent createParametersComponent(FlowSAUserData model) {
+ protected JComponent createParametersComponent(FlowsaMAUserData
model) {
JComponent component = new TopParametersPanel(model);

component.setBorder(BorderFactory.createTitledBorder("Parameters"));
return component;
}

- protected JComponent createFilterComponent(final FlowSAUserData
model) {
+ protected JComponent createFilterComponent(final FlowsaMAUserData
model) {
final JTextArea filterField = new JTextArea(3,20);
filterField.setEditable(true);
filterField.addCaretListener(new CaretListener() {
public void caretUpdate(CaretEvent e) {
String value = filterField.getText();
if(value != null && !value.equals("")) {
-
model.setQuery(FlowSAUserData.TOPFILTER, value);
+
model.setQuery(FlowsaMAUserData.TOPFILTER, value);
} else {
-
model.setQuery(FlowSAUserData.TOPFILTER, "N/A");
+
model.setQuery(FlowsaMAUserData.TOPFILTER, "N/A");
}
filterField.requestFocusInWindow();
}
@@ -53,15 +53,15 @@
return filterComponent;
}

- protected JComponent createAggregationComponent(final FlowSAUserData
model) {
+ protected JComponent createAggregationComponent(final
FlowsaMAUserData model) {
final JTextArea aggregationRuleField = new JTextArea(3,20);
aggregationRuleField.addCaretListener(new CaretListener() {
public void caretUpdate(CaretEvent e) {
String value = aggregationRuleField.getText();
if(value != null && !value.equals("")) {
-
model.setQuery(FlowSAUserData.TOPAGGREGATION, value);
+
model.setQuery(FlowsaMAUserData.TOPAGGREGATION, value);
} else {
-
model.setQuery(FlowSAUserData.TOPAGGREGATION, "N/A");
+
model.setQuery(FlowsaMAUserData.TOPAGGREGATION, "N/A");
}
aggregationRuleField.requestFocusInWindow();
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/actions/IPPMMetadataKeyRequest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/actions/IPPMMetadataKeyRequest.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/actions/IPPMMetadataKeyRequest.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -79,8 +79,8 @@
}

@Override
- public void run(ActionEvent arg0) {
- if (request == null) return;
+ public Object run(ActionEvent arg0) {
+ if (request == null) return null; //TODO check if this should
silently fail.
try {
enableActions(true);

@@ -159,6 +159,7 @@

JOptionPane.showMessageDialog(frame,x,"Error",JOptionPane.ERROR_MESSAGE);
logger.error(x);
}
+ return null;
}

protected void handleException(Exception x, MAEndpoint endpoint) {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/GeoSpatialPlacingAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/GeoSpatialPlacingAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/GeoSpatialPlacingAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -71,7 +71,7 @@
@param event event information
*/

- public void run(ActionEvent event)
+ public Object run(ActionEvent event)
{
VertexEdgeGraph<Router, Interface> graph = model.getGraph();
graph.setSuppressUpdate(true);
@@ -100,7 +100,7 @@
if(isInterrupted())
{
graph.setSuppressUpdate(false);
- return;
+ return null;
}

request.fireStatusMessage("Retrieving DNS LOC
lookup " + (i + 1) + "/" + count);
@@ -129,7 +129,7 @@
if(isInterrupted())
{
graph.setSuppressUpdate(false);
- return;
+ return null;
}

request.fireStatusMessage("Retrieving
GeoIpTool lookup " + (i + 1) + "/" + count);
@@ -224,7 +224,7 @@
if(isInterrupted())
{
graph.setSuppressUpdate(false);
- return;
+ return null;
}

//Create the map projection, add all the points, set the x,y
coordinates of each router, and set the background image of the graph
@@ -249,13 +249,15 @@
graph.setStretchBackgroundImage(true);
graph.setBackgroundImage(projection.getImage());
graph.setSuppressUpdate(false);
+
+ return null;
}

/**
Called when the action is done. This is not used
*/

- public void done()
+ public void done(Object result)
{

}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksSearchAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksSearchAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksSearchAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -79,7 +79,7 @@
@param event event information
*/

- public void run(ActionEvent event)
+ public Object run(ActionEvent event)
{
VertexEdgeGraph<Router, Interface> graph = model.getGraph();
graph.clear();
@@ -90,7 +90,7 @@
String [] ips =
TracerouteParser.parseIPs(model.getTracerouteText());
int count = ips.length;

- if(count <= 1) return;
+ if(count <= 1) return null;
request.fireStatusMessage("Creating vertices");
Map<String, Router> routers = new HashMap<String, Router>();
for(int i = 0; i < count; i++)
@@ -138,7 +138,7 @@
{ //Respond to user pushing the stop button
graph.clear();
graph.setSuppressUpdate(false);
- return;
+ return null;
}

int total = metadataThreads.size();
@@ -164,7 +164,7 @@
{ //Respond to user pushing the stop
button
graph.clear();

graph.setSuppressUpdate(false);
- return;
+ return null;
}
}
}
@@ -217,7 +217,7 @@
{ //Respond to user pushing the stop
button
graph.clear();

graph.setSuppressUpdate(false);
- return;
+ return null;
}
}
}
@@ -235,13 +235,14 @@

request.fireStatusMessage("Completed");
graph.setSuppressUpdate(false);
+ return null;
}

/**
Called when the action is done. This is not used
*/

- public void done()
+ public void done(Object result)
{

}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksTracerouteSearchAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksTracerouteSearchAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksTracerouteSearchAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -62,7 +62,7 @@
@param event event information
*/

- public void run(ActionEvent event)
+ public Object run(ActionEvent event)
{
request.fireStatusMessage("Collecting user input");
Object ip = JOptionPane.showInputDialog(null, "Enter ip",
"Traceroute", JOptionPane.INFORMATION_MESSAGE);
@@ -73,11 +73,12 @@
shell.setIp((String)ip);
String result = shell.run();

- if(isInterrupted()) return;
+ if(isInterrupted()) return null;

model.setTracerouteText(result);
super.run(event);
}
+ return null;
}

/**

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LiveUpdateAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LiveUpdateAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LiveUpdateAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -63,7 +63,7 @@
@param event event information
*/

- public void run(ActionEvent event)
+ public Object run(ActionEvent event)
{
request.fireStatusMessage("Performing live update");
VertexEdgeGraph<Router, Interface> graph = model.getGraph();
@@ -88,13 +88,15 @@

try{Thread.currentThread().sleep(500);}catch(Exception e){}
}
request.fireStatusMessage("Live update ended");
+
+ return null;
}

/**
Called when the action is done. This is not used
*/

- public void done()
+ public void done(Object result)
{

}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/GeoSpatialPlacingAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/GeoSpatialPlacingAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/GeoSpatialPlacingAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -74,7 +74,7 @@
@param event event information
*/

- public void run(ActionEvent event)
+ public Object run(ActionEvent event)
{
ArrayList<Node> nodes = new
ArrayList<Node>(model.getTopology().getNodes());
int count = nodes.size();
@@ -125,7 +125,7 @@

for(int i = 0; i < count; i++)
{
- if(isInterrupted()) return;
+ if(isInterrupted()) return null;

request.fireStatusMessage("Retrieving DNS LOC
lookup " + (i + 1) + "/" + count);
try{lookups[i].join();}catch(Exception e){}
@@ -149,7 +149,7 @@

for(int i = 0; i < count; i++)
{
- if(isInterrupted()) return;
+ if(isInterrupted()) return null;

request.fireStatusMessage("Retrieving
GeoIpTool lookup " + (i + 1) + "/" + count);
try{lookups[i].join();}catch(Exception e){}
@@ -166,7 +166,7 @@
position[i] = bermuda();
}

- if(isInterrupted()) return;
+ if(isInterrupted()) return null;

VertexEdgeGraph<Node, Link> graph = model.getGraph();
graph.setSuppressUpdate(true);
@@ -193,14 +193,15 @@
graph.setStretchBackgroundImage(true);
graph.setBackgroundImage(projection.getImage());
graph.setSuppressUpdate(false);
+
+ return null;
}

/**
Called when the action is done. This is not used
*/

- public void done()
- {
+ public void done(Object result) {

}


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LiveStatusUpdateAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LiveStatusUpdateAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LiveStatusUpdateAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -52,13 +52,14 @@
@param event event information
*/

- public void run(ActionEvent event)
+ public Object run(ActionEvent event)
{
while(!isInterrupted())
{
super.run(event);

try{Thread.currentThread().sleep(10000);}catch(Exception e){}
}
+ return null;
}

/**

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LookupServiceAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LookupServiceAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LookupServiceAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -52,17 +52,18 @@
Called when the action is started
@param event event information
*/
- public void run(ActionEvent event)
+ public Object run(ActionEvent event)
{
LookupServiceRequest lookupServiceRequest = new
LookupServiceRequest(model.getEndpointList(), model.getTopology().getLinks());
Map<Link, MAEndpoint> statusEndpointMap =
lookupServiceRequest.requestStatusEndpointMap();
model.setStatusEndpointMap(statusEndpointMap);
+ return null;
}

/**
Called when the action is done. This is not used
*/
- public void done()
+ public void done(Object result)
{

}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/StatusAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/StatusAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/StatusAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -66,14 +66,14 @@
Called when the action is started
@param event event information
*/
- public void run(ActionEvent event)
+ public Object run(ActionEvent event)
{
StatusRequest statusRequest = new
StatusRequest(model.getEndpointList(), model.getTopology().getLinks(),
model.getStatusEndpointMap());
Map<Link, Status> linkStates =
statusRequest.requestLinkStates();

if(isInterrupted())
{
- return;
+ return null;
}

model.setLinkStates(linkStates);
@@ -92,12 +92,14 @@
}

graph.setSuppressUpdate(false);
+
+ return null;
}

/**
Called when the action is done. This is not used
*/
- public void done()
+ public void done(Object result)
{

}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/TopologyAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/TopologyAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/TopologyAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -56,14 +56,14 @@
Called when the action is started
@param event event information
*/
- public void run(ActionEvent event)
+ public Object run(ActionEvent event)
{
TopologyRequest topologyRequest = new
TopologyRequest(model.getEndpointList());
Topology topology = topologyRequest.requestTopology();

if(isInterrupted())
{
- return;
+ return null;
}

ArrayList<Node> nodes = new
ArrayList<Node>(topology.getNodes());
@@ -132,12 +132,14 @@

model.setTopology(topology);
graph.setSuppressUpdate(false);
+
+ return null;
}

/**
Called when the action is done. This is not used
*/
- public void done()
+ public void done(Object result)
{

}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -61,12 +61,12 @@
}

@Override
- public void run(ActionEvent arg0) {
+ public Object run(ActionEvent arg0) {
//System.out.println("Selected item:
"+parent.getWebserviceComboBox().getSelectedItem());

//System.out.println("Number of endpoints: " + endpoints.size());

- if (request == null) return;
+ if (request == null) return null; //TODO check if this should
silently fail
try {
enableActions(true);

@@ -150,9 +150,10 @@

JOptionPane.showMessageDialog(frame,x,"Error",JOptionPane.ERROR_MESSAGE);
logger.error(x);
}
+ return null;
}
@Override
- public void done() {
+ public void done(Object result) {
}

public MetaDataList getDataList() {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -182,9 +182,9 @@
*/

@Override
- public void run(ActionEvent arg0) {
+ public Object run(ActionEvent arg0) {

- if (request == null) return;
+ if (request == null) return null; //TODO check if this should
silently fail

dataList.clear();
updateSearchList(searchText, dataList);
@@ -227,6 +227,8 @@
} else {
request.fireStatusMessage("Query cancelled. Data
retrieved from " + dataList.size() + " interfaces.");

}
+
+ return null;
}

public synchronized Vector getSearchText() {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRefreshActionAll.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRefreshActionAll.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRefreshActionAll.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -67,10 +67,10 @@
}

@Override
- public void run(ActionEvent arg0) {
+ public Object run(ActionEvent arg0) {
ready = 0;
request.fireStatusMessage("");
- if (request == null) return;
+ if (request == null) return null; //TODO check if this should
silently fail
//long timeNow =
Calendar.getInstance(TimeZone.getDefault()).getTimeInMillis()/1000 - 660;
//double p = 100.0/dataList.size();
dataList.setTimeInterval(timeInterval);
@@ -119,6 +119,7 @@
userData.assign(d);
}
*/
+ return null;
}

public synchronized long getTimeInterval() {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -61,10 +61,10 @@
}

@Override
- public void run(ActionEvent arg0) {
+ public Object run(ActionEvent arg0) {
//if (dataList.getProgress() > 0) return;
dataList.setTimeInterval(timeInterval);
- if (request == null) return;
+ if (request == null) return null; //TODO check if this should
silently fail

dataList.clear();
//actions.getJobStatus().setPercent(0);
@@ -73,7 +73,7 @@
for (int i=0; i < endpoints.size();i++) {

if (isInterrupted()) {
- return;
+ return null;
}

MAEndpoint mae = endpoints.get(i);
@@ -101,7 +101,7 @@
if (request instanceof SmartMARequest)
((SmartMARequest) request).isReady();
*/
- if (isInterrupted()) return;
+ if (isInterrupted()) return null;
if (dataList.size() > 0) {
request.fireStatusMessage("Metadata
retrieved.");

@@ -129,6 +129,7 @@
} else logger.info("---- "+ this + " ---
INTERRUPTED");
} else request.fireStatusMessage("No metadata
found.");

+ return null;

}


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -58,7 +58,7 @@
this.shell = shell;
}
@Override
- public void run(ActionEvent arg0) {
+ public Object run(ActionEvent arg0) {
searchText.clear();
request.fireStatusMessage("IP address input");
Object ip = JOptionPane.showInputDialog(frame, "IP address",
"Traceroute",JOptionPane.PLAIN_MESSAGE, null,null, shell.getIp());
@@ -69,6 +69,7 @@
request.fireStatusMessage("Retrieving utilization
data... ");
super.run(arg0);
}
+ return null;
}
}


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequestAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequestAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequestAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -63,8 +63,8 @@
}

@Override
- public void run(ActionEvent arg0) {
- if (request == null) return ;
+ public Object run(ActionEvent arg0) {
+ if (request == null) return null; //TODO check if this should
silently fail.


try {
@@ -124,11 +124,11 @@
logger.error(x);
}

-
+ return null;
}

@Override
- public void done() {
+ public void done(Object result) {
/*
* Anything that is needed to finalize after request (run()
method) is completed.
*

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/flowsa/RequestTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/flowsa/RequestTest.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/flowsa/RequestTest.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -2,23 +2,23 @@

import junit.framework.TestCase;

-import org.perfsonar.perfsonarui.flowsa.FlowSARequest;
-import org.perfsonar.perfsonarui.flowsa.FlowSAUserData;
+import org.perfsonar.perfsonarui.flowsa.FlowsaMARequest;
+import org.perfsonar.perfsonarui.flowsa.FlowsaMAUserData;
import org.w3c.dom.Document;

public class RequestTest extends TestCase {

- private FlowSAUserData fakeUserData;
+ private FlowsaMAUserData fakeUserData;

public void testCreateRawRequest() {
- FlowSARequest request = new FlowSARequest();
+ FlowsaMARequest request = new FlowsaMARequest();

- fakeUserData = new FlowSAUserData();
- fakeUserData.setQuery(FlowSAUserData.ROUTERS, "test arthur");
- fakeUserData.setQuery(FlowSAUserData.RAWAGGREGATION,
"aggregation rule");
- fakeUserData.setQuery(FlowSAUserData.RAWFILTER, "filter
rule");
- fakeUserData.setQuery(FlowSAUserData.RAWFIELDS,
"AddressFamily TimeFirstSeen MsecFirstSeen");
- fakeUserData.setQuery(FlowSAUserData.QUERYTYPE, "Raw");
+ fakeUserData = new FlowsaMAUserData();
+ fakeUserData.setQuery(FlowsaMAUserData.ROUTERS, "test
arthur");
+ fakeUserData.setQuery(FlowsaMAUserData.RAWAGGREGATION,
"aggregation rule");
+ fakeUserData.setQuery(FlowsaMAUserData.RAWFILTER, "filter
rule");
+ fakeUserData.setQuery(FlowsaMAUserData.RAWFIELDS,
"AddressFamily TimeFirstSeen MsecFirstSeen");
+ fakeUserData.setQuery(FlowsaMAUserData.QUERYTYPE, "Raw");

Document requestDocument;
try {
@@ -31,11 +31,11 @@
}

public void testCreateStatRequest() {
- FlowSARequest request = new FlowSARequest();
+ FlowsaMARequest request = new FlowsaMARequest();

- fakeUserData = new FlowSAUserData();
- fakeUserData.setQuery(FlowSAUserData.ROUTERS, "test arthur");
- fakeUserData.setQuery(FlowSAUserData.QUERYTYPE,
"Statistical");
+ fakeUserData = new FlowsaMAUserData();
+ fakeUserData.setQuery(FlowsaMAUserData.ROUTERS, "test
arthur");
+ fakeUserData.setQuery(FlowsaMAUserData.QUERYTYPE,
"Statistical");

Document requestDocument;
try {
@@ -48,14 +48,14 @@
}

public void testCreateTopRequest() {
- FlowSARequest request = new FlowSARequest();
+ FlowsaMARequest request = new FlowsaMARequest();

- fakeUserData = new FlowSAUserData();
- fakeUserData.setQuery(FlowSAUserData.ROUTERS, "test arthur");
- fakeUserData.setQuery(FlowSAUserData.RAWAGGREGATION,
"aggregation rule");
- fakeUserData.setQuery(FlowSAUserData.RAWFILTER, "filter
rule");
- fakeUserData.setQuery(FlowSAUserData.RAWFIELDS,
"AddressFamily TimeFirstSeen MsecFirstSeen");
- fakeUserData.setQuery(FlowSAUserData.QUERYTYPE, "Top");
+ fakeUserData = new FlowsaMAUserData();
+ fakeUserData.setQuery(FlowsaMAUserData.ROUTERS, "test
arthur");
+ fakeUserData.setQuery(FlowsaMAUserData.RAWAGGREGATION,
"aggregation rule");
+ fakeUserData.setQuery(FlowsaMAUserData.RAWFILTER, "filter
rule");
+ fakeUserData.setQuery(FlowsaMAUserData.RAWFIELDS,
"AddressFamily TimeFirstSeen MsecFirstSeen");
+ fakeUserData.setQuery(FlowsaMAUserData.QUERYTYPE, "Top");

Document requestDocument;
try {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
2007-10-19 01:01:16 UTC (rev 2974)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -63,6 +63,7 @@
import org.perfsonar.perfsonarui.ui.actions.SetOptionsAction;
import org.perfsonar.perfsonarui.ui.actions.SetupDataRequestAction;
import org.perfsonar.perfsonarui.ui.actions.ShowEndpointsAction;
+import org.perfsonar.perfsonarui.ui.panels.ActionPanel;
import org.perfsonar.perfsonarui.ui.panels.TimeOptionsPanel;


@@ -233,7 +234,6 @@
clearAction = createClearAction();
actions.put(clearAction.getValue(Action.NAME),clearAction);
clearAction.setActions(actions);
-

}
public IUserData createUserData() {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/EchoAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/EchoAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/EchoAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -67,7 +67,7 @@
}

@Override
- public void run(ActionEvent arg0) {
+ public Object run(ActionEvent arg0) {
if (frame != null)
frame.setCursor(hourglassCursor);
for (int i= 0; i < endpoints.size(); i++)
@@ -84,14 +84,13 @@
if (request instanceof SmartMARequest)
((SmartMARequest) request).isReady();

-
+ return null;
}

@Override
- public void done() {
+ public void done(Object result) {
if (frame != null)
frame.setCursor(normalCursor);
-
}

}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/MetadataRequestAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/MetadataRequestAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/MetadataRequestAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -77,8 +77,8 @@
putValue(SHORT_DESCRIPTION,"Retrieves metadata of all defined
interfaces for given URL.");
}
@Override
- public void run(ActionEvent arg0) {
- if (request == null) return;
+ public Object run(ActionEvent arg0) {
+ if (request == null) return null; //TODO check if this should
silently fail.
try {
enableActions(true);

@@ -152,9 +152,10 @@

JOptionPane.showMessageDialog(frame,x,"Error",JOptionPane.ERROR_MESSAGE);
logger.error(x);
}
+ return null;
}
@Override
- public void done() {
+ public void done(Object result) {
}

public MetaDataList getDataList() {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/PerfsonarRequestAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/PerfsonarRequestAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/PerfsonarRequestAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -78,8 +78,12 @@
}


- public abstract void run(ActionEvent arg0);
- public abstract void done();
+ /**
+ * @param event that triggered this task
+ * @return optionally the result of the task or null
+ */
+ public abstract Object run(ActionEvent event);
+ public abstract void done(Object result);

protected synchronized void changeName() {
setInterrupted(false);
@@ -100,7 +104,7 @@
frame.setCursor(normalCursor);
}

- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(final ActionEvent event) {
//if (!enabled) return;
if (worker != null) {
interrupt();
@@ -111,17 +115,16 @@
worker = null;
restoreName();
*/
- return;
-
- }
+ return;
+ }

-
worker = new GUIWorker(actionName.toString()) {
@Override
public Object construct() {
+ Object value = null;
try {
changeName();
- run(null);
+ value = run(event);
} catch (Throwable x) {
logger.error(x);
StringBuffer b = new StringBuffer();
@@ -136,12 +139,12 @@
worker = null;
restoreName();
}
- return request;
+ return value;
}
//Runs on the event-dispatching thread.
@Override
public void finished() {
- done();
+ done(getValue());
worker = null;
restoreName();
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SetupDataRequestAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SetupDataRequestAction.java
2007-10-19 01:01:16 UTC (rev 2974)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SetupDataRequestAction.java
2007-10-19 01:04:22 UTC (rev 2975)
@@ -82,9 +82,9 @@
putValue(SHORT_DESCRIPTION,"Retrieves measurements for the
selected interface");
}
@Override
- public void run(ActionEvent arg0) {
+ public Object run(ActionEvent arg0) {

- if (request == null) return ;
+ if (request == null) return null; //TODO check if this should
silently fail
//if (response != null)
//response.clear();

@@ -109,7 +109,7 @@
logger.error(x);
}

-
+ return null;
}
public void prepareQuery(IUserData userData) {
long timeNow = getStartTime();
@@ -117,7 +117,7 @@
userData.setResolution(Integer.toString(getResolution()));
}
@Override
- public void done() {
+ public void done(Object result) {
//((UserData)userData).next(300);
}
public ITimeValueResponse getResponse() {

Modified: branches/perfsonarui/src/plugins.flowsa.classes
===================================================================
--- branches/perfsonarui/src/plugins.flowsa.classes 2007-10-19 01:01:16
UTC (rev 2974)
+++ branches/perfsonarui/src/plugins.flowsa.classes 2007-10-19 01:04:22
UTC (rev 2975)
@@ -1,4 +1,2 @@
org/perfsonar/perfsonarui/flowsa/*.class
-org/perfsonar/perfsonarui/flowsa/actions/*.class
org/perfsonar/perfsonarui/flowsa/components/*.class
-org/perfsonar/perfsonarui/flowsa/panels/*.class
\ No newline at end of file

Modified: branches/perfsonarui/src/resources.files
===================================================================
--- branches/perfsonarui/src/resources.files 2007-10-19 01:01:16 UTC (rev
2974)
+++ branches/perfsonarui/src/resources.files 2007-10-19 01:04:22 UTC (rev
2975)
@@ -2,6 +2,9 @@
org/perfsonar/perfsonarui/ui/PerfSONAR_icon.png
org/perfsonar/perfsonarui/ui/perfSONARidle-154x32.gif
org/perfsonar/perfsonarui/ui/perfSONARbusy-154x32.gif
+org/perfsonar/perfsonarui/ui/flowsa-left.png
+org/perfsonar/perfsonarui/ui/flowsa-right.png
+org/perfsonar/perfsonarui/ui/flowsa-fetch-png
org/perfsonar/perfsonarui/ui/nav_first.gif
org/perfsonar/perfsonarui/ui/nav_last.gif
org/perfsonar/perfsonarui/ui/nav_prev.gif


  • perfsonar: r2975 - in branches/perfsonarui/src: . org/perfsonar/perfsonarui org/perfsonar/perfsonarui/flowsa org/perfsonar/perfsonarui/flowsa/components org/perfsonar/perfsonarui/ippm/ui/actions org/perfsonar/perfsonarui/links org/perfsonar/perfsonarui/linkstatus org/perfsonar/perfsonarui/lookingglass org/perfsonar/perfsonarui/ma/ui/actions org/perfsonar/perfsonarui/playground org/perfsonar/perfsonarui/test/flowsa org/perfsonar/perfsonarui/ui org/perfsonar/perfsonarui/ui/actions, svnlog, 10/18/2007

Archive powered by MHonArc 2.6.16.

Top of Page