perfsonar-dev - perfsonar: r3095 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . demo ippm ma ma/ui/panels plugins test ui
Subject: perfsonar development work
List archive
perfsonar: r3095 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . demo ippm ma ma/ui/panels plugins test ui
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3095 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . demo ippm ma ma/ui/panels plugins test ui
- Date: Wed, 5 Dec 2007 12:41:34 -0500
Author: nina
Date: 2007-12-05 12:41:33 -0500 (Wed, 05 Dec 2007)
New Revision: 3095
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/IPerfsonarSchema.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson1.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SearchByIPActionTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
Log:
IPerfsonarSchema - constructor is now deprecated and will become protected;
use PerfsonarSchema.getInstance
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/IPerfsonarSchema.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/IPerfsonarSchema.java
2007-12-05 17:02:47 UTC (rev 3094)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/IPerfsonarSchema.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -34,7 +34,7 @@
*/
public interface IPerfsonarSchema {
public String getSchema();
- public void setSchema(String schema);
+ //public void setSchema(String schema);
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
2007-12-05 17:02:47 UTC (rev 3094)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -24,6 +24,8 @@
package org.perfsonar.perfsonarui;
+import java.util.Hashtable;
+
import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
import org.perfsonar.perfsonarui.ui.PerfsonarModel;
@@ -35,7 +37,12 @@
*/
public class PerfsonarSchema implements IPerfsonarSchema {
protected String schema;
+ protected static Hashtable<String,IPerfsonarSchema> schemas = new
Hashtable<String,IPerfsonarSchema>();
+ /**
+ * @deprecated use PerfsonarSchema.getInstance("your_schema");
+ * @param schema
+ */
public PerfsonarSchema(String schema) {
setSchema(schema);
}
@@ -65,6 +72,16 @@
return hash;
}
+ public static IPerfsonarSchema getInstance(String schema) {
+
+ IPerfsonarSchema s = schemas.get(schema);
+ if (s == null) {
+ s = new PerfsonarSchema(schema);
+ schemas.put(schema,s);
+ System.out.println("adding new schema "+s + " " +
schemas.size());
+ }
+ return s;
+ }
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
2007-12-05 17:02:47 UTC (rev 3094)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -71,7 +71,7 @@
}
public List<IPerfsonarSchema> getSupportedRequests() {
ArrayList<IPerfsonarSchema> supported = new
ArrayList<IPerfsonarSchema>();
- supported.add(new
PerfsonarSchema(MARequestPerfsonar2_0.schemaID));
+
supported.add(PerfsonarSchema.getInstance(MARequestPerfsonar2_0.schemaID));
return supported;
}
@Override
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson1.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson1.java
2007-12-05 17:02:47 UTC (rev 3094)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson1.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -123,7 +123,7 @@
try {
System.out.println("\ntask3\n");
List<IPerfsonarSchema> supported = new
ArrayList<IPerfsonarSchema>();
- supported.add(new PerfsonarSchema("bwctl"));
+ supported.add(PerfsonarSchema.getInstance("bwctl"));
MAEndpointList endpoints = new MAEndpointList(new
URL("http://perfsonar.acad.bg/MA.conf";),supported);
for (int i=0; i < endpoints.size();i++)
System.out.println(endpoints.get(i));
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
2007-12-05 17:02:47 UTC (rev 3094)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -209,7 +209,7 @@
}
public List<IPerfsonarSchema> getSupportedRequests() {
ArrayList<IPerfsonarSchema> supported = new
ArrayList<IPerfsonarSchema>();
- supported.add(new PerfsonarSchema("ippm"));
+ supported.add(PerfsonarSchema.getInstance("ippm"));
return supported;
}
/*
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
2007-12-05 17:02:47 UTC (rev 3094)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -229,10 +229,10 @@
public List<IPerfsonarSchema> getSupportedRequests() {
ArrayList<IPerfsonarSchema> supported = new
ArrayList<IPerfsonarSchema>();
- supported.add(new PerfsonarSchema("perfsonar"));
- supported.add(new PerfsonarSchema("NMWG2v2"));
- supported.add(new PerfsonarSchema("NMWG2v2_netutil"));
- supported.add(new
PerfsonarSchema("http://schemas.perfsonar.net/2.0";));
+ supported.add(PerfsonarSchema.getInstance("perfsonar"));
+ supported.add(PerfsonarSchema.getInstance("NMWG2v2"));
+ supported.add(PerfsonarSchema.getInstance("NMWG2v2_netutil"));
+
supported.add(PerfsonarSchema.getInstance("http://schemas.perfsonar.net/2.0";));
return supported;
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
2007-12-05 17:02:47 UTC (rev 3094)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -44,7 +44,7 @@
public class MainPanelMA extends PluginMainPanel {
protected JSplitPane panel = null;
protected MetaDataPanel metadataPanel = null;
- protected BarChartPanel barPanel = null;
+ //protected BarChartPanel barPanel = null;
protected MAResponseChartPanel responsePanel = null;
/*
protected TimerTask requestTask;
@@ -66,7 +66,7 @@
model.getDataList().addObserver(responsePanel);
metadataPanel = new MetaDataPanel(model);
- barPanel = new BarChartPanel(model);
+ //barPanel = new BarChartPanel(model);
metadataPanel.addMouseListener(new MouseAdapter() {
@Override
@@ -121,7 +121,7 @@
newPanel.setMinimumSize(new Dimension(100,100));
//radarToolbar.add(radarPanel);
topPanel.add(radarPanel,BorderLayout.EAST);
- newPanel.add(barPanel,BorderLayout.CENTER);
+ //newPanel.add(barPanel,BorderLayout.CENTER);
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
2007-12-05 17:02:47 UTC (rev 3094)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -69,7 +69,7 @@
*/
public MAEndpoint() {
super();
- type = new PerfsonarSchema("Unknown");
+ type = PerfsonarSchema.getInstance("Unknown");
}
public void clear() {
setTitle("");
@@ -90,7 +90,7 @@
this.endpoint = result[1];
if (result.length > 2) {
result[2] = result[2].trim();
- type.setSchema(result[2]);
+ type = PerfsonarSchema.getInstance(result[2]);
/*
for (int i = 0; i < versions.length; i++)
if (result[2].equals(versions[i])) {
@@ -120,12 +120,12 @@
}
public synchronized void setSchema(IPerfsonarSchema schema) {
- this.type.setSchema(schema.getSchema());
+ this.type = PerfsonarSchema.getInstance(schema.getSchema());
setChanged();
notifyObservers(endpoint);
}
public synchronized void setSchema(String newSchema) {
- this.type.setSchema(newSchema);
+ this.type = PerfsonarSchema.getInstance(newSchema);
setChanged();
notifyObservers(endpoint);
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java
2007-12-05 17:02:47 UTC (rev 3094)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -99,10 +99,10 @@
UserData d = new UserData();
ArrayList<IPerfsonarSchema> supported = new
ArrayList<IPerfsonarSchema>();
- supported.add(new PerfsonarSchema("NMWG2v2"));
- supported.add(new PerfsonarSchema("perfsonar"));
- supported.add(new PerfsonarSchema("NMWG2v2_netutil"));
- supported.add(new
PerfsonarSchema("http://schemas.perfsonar.net/2.0";));
+ supported.add(PerfsonarSchema.getInstance("NMWG2v2"));
+ supported.add(PerfsonarSchema.getInstance("perfsonar"));
+ supported.add(PerfsonarSchema.getInstance("NMWG2v2_netutil"));
+
supported.add(PerfsonarSchema.getInstance("http://schemas.perfsonar.net/2.0";));
PerfsonarModel m = new MAPerfsonarModel(new MAEndpointList(new
File("MA.conf"),supported),response,d);
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SearchByIPActionTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SearchByIPActionTest.java
2007-12-05 17:02:47 UTC (rev 3094)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SearchByIPActionTest.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -62,9 +62,9 @@
UserData d = new UserData();
ArrayList<IPerfsonarSchema> supported = new
ArrayList<IPerfsonarSchema>();
- supported.add(new PerfsonarSchema("NMWG2v2"));
- supported.add(new PerfsonarSchema("perfsonar"));
- supported.add(new PerfsonarSchema("NMWG2v2_netutil"));
+ supported.add(PerfsonarSchema.getInstance("NMWG2v2"));
+ supported.add(PerfsonarSchema.getInstance("perfsonar"));
+ supported.add(PerfsonarSchema.getInstance("NMWG2v2_netutil"));
/*
ArrayList<String> supported = new ArrayList<String>();
supported.add("org.perfsonar.perfsonarui.ma.MARequest");
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2007-12-05 17:02:47 UTC (rev 3094)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2007-12-05 17:41:33 UTC (rev 3095)
@@ -52,11 +52,10 @@
import org.perfsonar.perfsonarui.JAXPCheck;
import org.perfsonar.perfsonarui.PSLogger;
import org.perfsonar.perfsonarui.SmartMARequest;
-//import org.perfsonar.perfsonarui.bwctl.BWCTLPerfsonarTab;
+import org.perfsonar.perfsonarui.bwctl.BWCTLPerfsonarTab;
import org.perfsonar.perfsonarui.demo.DemoPlugin;
import org.perfsonar.perfsonarui.demo.DemoPluginMainPanel;
import org.perfsonar.perfsonarui.ippm.IPPMPerfsonarModel;
-import org.perfsonar.perfsonarui.lookingglass.LookingGlassTab;
import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
import org.perfsonar.perfsonarui.playground.PerfsonarPlaygroundModel;
import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
@@ -247,28 +246,27 @@
*/
if (perfsonarTabs.size()==0) {
logger.info("Plugins not found, loading MA and IPPM tabs.");
- IPerfsonarTab tab /*= new MAPerfsonarModel()*/;/*
+ IPerfsonarTab tab = new MAPerfsonarModel();
tab.setParameters(cmdOpts);
perfsonarTabs.add(tab);
tab = new IPPMPerfsonarModel();
tab.setParameters(cmdOpts);
perfsonarTabs.add(tab);
- */
- /*
+
tab = new PerfsonarPlaygroundModel();
tab.setParameters(cmdOpts);
perfsonarTabs.add(tab);
-*/
- /*
+
tab = new BWCTLPerfsonarTab();
tab.setParameters(cmdOpts);
perfsonarTabs.add(tab);
//for testing purposes only
- */
+ /*
tab = new LookingGlassTab();
tab.setParameters(cmdOpts);
perfsonarTabs.add(tab);
+ */
- perfsonar: r3095 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . demo ippm ma ma/ui/panels plugins test ui, svnlog, 12/05/2007
Archive powered by MHonArc 2.6.16.