Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2486 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ma ma/ui/panels test test/misc ui ui/actions ui/panels

Subject: perfsonar development work

List archive

perfsonar: r2486 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ma ma/ui/panels test test/misc ui ui/actions ui/panels


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2486 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ma ma/ui/panels test test/misc ui ui/actions ui/panels
  • Date: Sun, 1 Jul 2007 15:58:37 -0400
Author: nina
Date: 2007-07-01 15:58:37 -0400 (Sun, 01 Jul 2007)
New Revision: 2486

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataTableModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/test/misc/MySpiderWebPlotTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java

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

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

branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataTable.java
Log:
code cleanup

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
2007-07-01 19:54:58 UTC (rev 2485)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -25,7 +25,6 @@
package org.perfsonar.perfsonarui;

import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
-import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.ui.PerfsonarModel;

/**

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2007-07-01 19:54:58 UTC (rev 2485)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -410,12 +410,17 @@
}
public void setMaxRequests(int maxRequests) {
MaxRequests = maxRequests;
+ System.out.println("Max " + maxRequests + " interfaces in one query
");
}
public boolean isParallel() {
return parallel;
}
public void setParallel(boolean parallel) {
this.parallel = parallel;
+ if (parallel)
+ System.out.println("Requests will be sent in parallel");
+ else
+ System.out.println("Requests will be sent sequentially");

}
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
2007-07-01 19:54:58 UTC (rev 2485)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -21,11 +21,9 @@
package org.perfsonar.perfsonarui.ma;

import org.jdom.Namespace;
-import org.perfsonar.perfsonarui.AbstractMARequest;
import org.perfsonar.perfsonarui.AbstractUserData;
import org.perfsonar.perfsonarui.PSLogger;
import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
-import org.perfsonar.perfsonarui.plugins.IUserData;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
2007-07-01 19:54:58 UTC (rev 2485)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -181,7 +181,7 @@
Element MetElem = createMetadataSection(userData,metadataID1);
MesgElem.addContent(MetElem);

- String metadataID2 = "meta2_"+id
;//+Long.toString(System.currentTimeMillis());
+ String metadataID2 = "m_param_"+id
;//+Long.toString(System.currentTimeMillis());
Element MetElem2 =
createMetadataSection2(userData,metadataID2,MetElem.getAttributeValue(E_ID));
MesgElem.addContent(MetElem2);


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataTableModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataTableModel.java
2007-07-01 19:54:58 UTC (rev 2485)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataTableModel.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -24,7 +24,6 @@

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;

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java
2007-07-01 19:54:58 UTC (rev 2485)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -39,8 +39,6 @@
import org.perfsonar.perfsonarui.ui.PerfsonarModel;
import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;

-import sun.misc.PerformanceLogger;
-
/**
* TODO add description
* @author Nina Jeliazkova


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/misc/MySpiderWebPlotTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/misc/MySpiderWebPlotTest.java
2007-07-01 19:54:58 UTC (rev 2485)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/misc/MySpiderWebPlotTest.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -105,8 +105,8 @@
dataset.addValue(Math.random(), seriesNames[1], new
Integer(i));
}
SpiderWebPlot plot = new SpiderWebPlot(dataset);
+ plot.setAxisLinePaint(new Color(200,200,0));

-
plot.setToolTipGenerator(new
StandardCategoryToolTipGenerator());
plot.setURLGenerator(new StandardCategoryURLGenerator(){
/* (non-Javadoc)

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
2007-07-01 19:54:58 UTC (rev 2485)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -22,7 +22,6 @@
import java.awt.Component;
import java.io.File;
import java.net.URL;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Observable;
@@ -383,7 +382,7 @@
Option aggregate = OptionBuilder.withLongOpt("aggregate")
.hasArg()
.withArgName("number_of_requests")
- .withDescription("max requests in an aggregated request, default 32")
+ .withDescription("max requests in an aggregated request, default 8")
.create( "a" );

Option parallel = OptionBuilder
@@ -424,7 +423,7 @@
}
/**
* -ehttp://http://perfsonar.acad.bg/MA.conf ( URL for MA.conf )
- * -a32 (max requests in an aggregated
request)
+ * -a8 (max requests in an aggregated
request)
* -t300000 (timeout for axis conection = default 300000ms = 5min)
*/
public void setParameters(String[] args) {
@@ -464,12 +463,12 @@
}
}

- int maxRequests = 32;
+ int maxRequests = 8;
if( line.hasOption( "a" ) ) {
try {
maxRequests = Integer.parseInt(line.getOptionValue(
'a' ));
} catch (Exception x) {
- maxRequests = 32;
+ maxRequests = 8;
}
}
request.setMaxRequests(maxRequests);

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/NewEndpointAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/NewEndpointAction.java
2007-07-01 19:54:58 UTC (rev 2485)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/NewEndpointAction.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -28,7 +28,6 @@

import javax.swing.Icon;

-import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.plugins.MAEndpointList;

public class NewEndpointAction extends EndpointsAction {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
2007-07-01 19:54:58 UTC (rev 2485)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -22,8 +22,6 @@

import javax.swing.Icon;

-import org.perfsonar.perfsonarui.AbstractUserData;
-import org.perfsonar.perfsonarui.EchoSmartRequest;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.plugins.MAEndpointList;
import org.perfsonar.perfsonarui.ui.panels.MAEndpointsPanel;

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataTable.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataTable.java
2007-07-01 19:54:58 UTC (rev 2485)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataTable.java
2007-07-01 19:58:37 UTC (rev 2486)
@@ -39,8 +39,6 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;

-
-import org.perfsonar.perfsonarui.AbstractUserData;
import org.perfsonar.perfsonarui.plugins.IUserData;
import org.perfsonar.perfsonarui.plugins.MetaDataList;



  • perfsonar: r2486 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ma ma/ui/panels test test/misc ui ui/actions ui/panels, svnlog, 07/01/2007

Archive powered by MHonArc 2.6.16.

Top of Page