Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3365 - in branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa: . components

Subject: perfsonar development work

List archive

perfsonar: r3365 - in branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa: . components


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3365 - in branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa: . components
  • Date: Thu, 14 Feb 2008 18:01:34 -0500
Author: michael.bischoff
Date: 2008-02-14 18:01:33 -0500 (Thu, 14 Feb 2008)
New Revision: 3365

Removed:

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/BuzyGlassPane.java
Modified:

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/components/ResultPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopParametersPanel.java
Log:
RESOLVED - bug 329: Flow S&A MA ignores Group Transport Protocols flag
https://bugzilla.perfsonar.net/show_bug.cgi?id=329
RESOLVED - bug 263: FlowSA client: number of results in TopN query is ignored
https://bugzilla.perfsonar.net/show_bug.cgi?id=263

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMARequest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMARequest.java
2008-02-14 23:00:25 UTC (rev 3364)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMARequest.java
2008-02-14 23:01:33 UTC (rev 3365)
@@ -135,7 +135,7 @@
} else if (nameAttr.equals("orderBy")) {

paraNode.getFirstChild().setTextContent(data.getQuery(FlowsaMAUserData.TOPORDERBY));
} else if (nameAttr.equals("splitProtocol")) {
-
paraNode.getFirstChild().setTextContent(data.getQuery(FlowsaMAUserData.TOPTRANSGROUP).equals("yes")
? "false" : "true");
+
paraNode.getFirstChild().setTextContent(data.getQuery(FlowsaMAUserData.TOPTRANSGROUP));
} else if (nameAttr.equals("topN")) {

paraNode.getFirstChild().setTextContent(data.getQuery(FlowsaMAUserData.TOPNUMBER));
} else if (nameAttr.equals("filterRule")) {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMAResponse.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMAResponse.java
2008-02-14 23:00:25 UTC (rev 3364)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMAResponse.java
2008-02-14 23:01:33 UTC (rev 3365)
@@ -54,8 +54,7 @@
final NodeList data =
response.getElementsByTagName("nmwg:data");

// FIXME clean up - should be handled higher up not per
plug-in.
- if(eventType.item(0) !=null
- &&
eventType.item(0).getTextContent().startsWith("error.")) {
+ if(eventType.item(0) !=null &&
eventType.item(0).getTextContent().startsWith("error.")) {
EventQueue.invokeLater(new Runnable() {
public void run() {
if(data.item(0)==null ||
data.item(0).getChildNodes().item(0) == null) {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java
2008-02-14 23:00:25 UTC (rev 3364)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java
2008-02-14 23:01:33 UTC (rev 3365)
@@ -83,8 +83,9 @@
public MAEndpointList createEndpoints() {
MAEndpointList endpoints = new MAEndpointList(new
File("MA.conf"),getSupportedRequests());
if (endpoints.size() == 0) {
- endpoints.add(new
MAEndpoint("local,http://localhost:8080/flowsa-ma-0.0.1/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
- endpoints.add(new
MAEndpoint("SURFnet,http://sonar1.amsterdam.surfnet.nl:8080/SURFnet-FLOWSA-MA/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
+ endpoints.add(new
MAEndpoint("local,http://localhost:8080/flowsa-ma-0.7.0/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
+ endpoints.add(new MAEndpoint("SURFnet
test,http://sonar1.amsterdam.surfnet.nl:8080/SURFnet-FLOWSA-MA/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
+ endpoints.add(new MAEndpoint("SURFnet
development,http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma-0.7.0/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
}
return endpoints;
}

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

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultPanel.java
2008-02-14 23:00:25 UTC (rev 3364)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultPanel.java
2008-02-14 23:01:33 UTC (rev 3365)
@@ -11,6 +11,7 @@
import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
+import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JToolBar;
@@ -34,15 +35,35 @@

public ResultPanel(Component parentFrame, FlowsaMATab tab,
FlowsaMAUserData model) {
super(parentFrame, tab, null);
- JComponent resultInformationPanel = new JPanel();
+ JComponent resultInformationPanel =
createResultInformationPanel();

resultInformationPanel.setBorder(BorderFactory.createEtchedBorder());
- JToolBar controllBar = createControllBar(model);
- ResultDisplay resultComponent = createResultComponent(model);
+ JComponent controllBar = createControllBar(model);
+ JComponent resultComponent = createResultComponent(model);

setLayout(createLayoutManager(resultInformationPanel, controllBar,
resultComponent));
}
+
+ protected JComponent createResultInformationPanel() {
+ JComponent resultInformationPanel = new JLabel();
+
+ return resultInformationPanel;
+ }

- protected LayoutManager createLayoutManager(JComponent
resultInformationPanel, JToolBar controllBar, ResultDisplay resultComponent) {
+ /**
+ * <pre>
+ * _______________________________________
+ * | resultInformationPanel | controllBar |
+ * |________________________|_____________|
+ * | resultComponent |
+ * | |
+ * |______________________________________|
+ * </pre>
+ * @param resultInformationPanel
+ * @param controllBar
+ * @param resultComponent
+ * @return
+ */
+ protected LayoutManager createLayoutManager(JComponent
resultInformationPanel, JComponent controllBar, JComponent resultComponent) {
GroupLayout layout = new GroupLayout(this);
layout.setHorizontalGroup(
layout.createParallelGroup(GroupLayout.LEADING)
@@ -70,11 +91,13 @@
return layout;
}

- protected ResultDisplay createResultComponent(FlowsaMAUserData model) {
+
+ protected JComponent createResultComponent(FlowsaMAUserData model) {
return new ResultDisplay(model);
}
+

- protected JToolBar createControllBar(FlowsaMAUserData model) {
+ protected JComponent createControllBar(FlowsaMAUserData model) {
JToolBar controllBar = new JToolBar();
controllBar.setFloatable(false);
controllBar.setRollover(true);
@@ -88,6 +111,7 @@
return controllBar;
}

+
public static class ResultDisplay extends JScrollPane implements
Observer {

private static final long serialVersionUID = 1L;
@@ -125,7 +149,8 @@
}
}

- public static class ShowPreviousResult extends AbstractAction implements
Observer {
+
+ public static class ShowPreviousResult extends AbstractAction
implements Observer {
private static final long serialVersionUID = 1L;
private FlowsaMAUserData model;

@@ -154,7 +179,8 @@
}
}

- public static class ShowNextResult extends AbstractAction implements
Observer {
+
+ public static class ShowNextResult extends AbstractAction implements
Observer {
private static final long serialVersionUID = 1L;
private FlowsaMAUserData model;


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopParametersPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopParametersPanel.java
2008-02-14 23:00:25 UTC (rev 3364)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/TopParametersPanel.java
2008-02-14 23:01:33 UTC (rev 3365)
@@ -38,19 +38,19 @@
JComponent orderByLabel = createOrderByLabel(model);
JComponent elementBox = createElementBox(model);
JComponent orderByBox = createOrderByBox(model);
- JComponent flowAmountLabel = createFlowAmountLabel(model);
- JComponent flowAmountSelector = createFlowAmountSelector(model);
+ JComponent flowAmountLabel = createResultAmountLabel(model);
+ JComponent flowAmountSelector = createResultAmountSelector(model);
JComponent groupProtocolsSelector =
createGroupProtocolsSelector(model);

setLayout(createLayout(elementLabel, orderByLabel, elementBox,
orderByBox, flowAmountLabel, flowAmountSelector,
groupProtocolsSelector));
}

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

- private JComponent createFlowAmountSelector(final FlowsaMAUserData
model) {
+ private JComponent createResultAmountSelector(final FlowsaMAUserData
model) {
final SpinnerNumberModel spinnerModel = new SpinnerNumberModel(10,
0, 1000, 5);
final JSpinner selector = new JSpinner(spinnerModel);
selector.addChangeListener(new ChangeListener() {


  • perfsonar: r3365 - in branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa: . components, svnlog, 02/14/2008

Archive powered by MHonArc 2.6.16.

Top of Page