perfsonar-dev - perfsonar: r3096 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ippm/ui/actions ma/ui/actions ma/ui/panels plugins ui ui/panels
Subject: perfsonar development work
List archive
perfsonar: r3096 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ippm/ui/actions ma/ui/actions ma/ui/panels plugins ui ui/panels
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3096 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ippm/ui/actions ma/ui/actions ma/ui/panels plugins ui ui/panels
- Date: Thu, 6 Dec 2007 03:34:14 -0500
Author: nina
Date: 2007-12-06 03:34:13 -0500 (Thu, 06 Dec 2007)
New Revision: 3096
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/MetadataListResponseListener.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/actions/IPPMMetadataKeyRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRefreshActionAll.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MetaDataList.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
Log:
MetaDataList optimizations
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
2007-12-05 17:41:33 UTC (rev 3095)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
2007-12-06 08:34:13 UTC (rev 3096)
@@ -66,7 +66,7 @@
*/
public AbstractUserData() {
super();
- maData = new MAEndpoint("Service address not
assigned,,,,,");
+ maData = new MAEndpoint("Service address not
assigned,,,,,");
qr = new QueryResponse();
}
/**
@@ -98,12 +98,14 @@
public void setEndpoint(MAEndpoint endpoint) {
if (endpoint==null) maData =null;
else {
+
maData.setTitle(endpoint.getTitle());
maData.setEndpoint(endpoint.getEndpoint());
maData.setSchema(endpoint.getSchema());
maData.setAuthRealm(endpoint.getAuthRealm());
maData.setEvent(endpoint.getEvent(0),0);
maData.setEvent(endpoint.getEvent(1),1);
+
}
setChanged();
notifyObservers(maData);
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/MetadataListResponseListener.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/MetadataListResponseListener.java
2007-12-05 17:41:33 UTC (rev 3095)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/MetadataListResponseListener.java
2007-12-06 08:34:13 UTC (rev 3096)
@@ -55,6 +55,9 @@
dataList.setNotificationEnabled(false);
try {
request.process(uData, response, this);
+ dataList.setNotificationEnabled(true);
+ dataList.setChanged();
+ dataList.notifyObservers("STRUCTURE");
} catch (Exception x) {
logger.error(x);
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
2007-12-05 17:41:33 UTC (rev 3095)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
2007-12-06 08:34:13 UTC (rev 3096)
@@ -36,24 +36,20 @@
*
*/
public class PerfsonarSchema implements IPerfsonarSchema {
- protected String schema;
+ protected final String schema;
protected static Hashtable<String,IPerfsonarSchema> schemas = new
Hashtable<String,IPerfsonarSchema>();
/**
- * @deprecated use PerfsonarSchema.getInstance("your_schema");
+ * @deprecated , will become protected. Use
{@link
#getInstance("your_schema")};
* @param schema
*/
public PerfsonarSchema(String schema) {
- setSchema(schema);
+ this.schema = schema.trim();
}
public String getSchema() {
return schema;
}
- public void setSchema(String schema) {
- this.schema = schema.trim();
-
- }
@Override
public String toString() {
return schema;
@@ -78,7 +74,6 @@
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/ippm/ui/actions/IPPMMetadataKeyRequest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/actions/IPPMMetadataKeyRequest.java
2007-12-05 17:41:33 UTC (rev 3095)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/actions/IPPMMetadataKeyRequest.java
2007-12-06 08:34:13 UTC (rev 3096)
@@ -154,6 +154,8 @@
((SmartMARequest) request).isReady();
dataList.setNotificationEnabled(true);
+ dataList.setChanged();
+ dataList.notifyObservers("STRUCTURE");
if (!ok) JOptionPane.showMessageDialog(frame,"No IPPM
service selected!","Error",JOptionPane.ERROR_MESSAGE);
} catch (Exception x) {
JOptionPane.showMessageDialog(frame,x,"Error",JOptionPane.ERROR_MESSAGE);
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRefreshActionAll.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRefreshActionAll.java
2007-12-05 17:41:33 UTC (rev 3095)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRefreshActionAll.java
2007-12-06 08:34:13 UTC (rev 3096)
@@ -111,8 +111,11 @@
if (request instanceof SmartMARequest)
((SmartMARequest) request).isReady();
- /*
+
dataList.setNotificationEnabled(true);
+ dataList.setChanged();
+ dataList.notifyObservers("STRUCTURE");
+ /*
dataList.setSelectedItemIndex(0);
IUserData d = dataList.get(0);
if (d != null) {
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:41:33 UTC (rev 3095)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
2007-12-06 08:34:13 UTC (rev 3096)
@@ -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/MetaDataList.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MetaDataList.java
2007-12-05 17:41:33 UTC (rev 3095)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MetaDataList.java
2007-12-06 08:34:13 UTC (rev 3096)
@@ -73,23 +73,30 @@
notifyObservers("STRUCTURE");
}
+
public void set(int index, IUserData userData) {
if (get(index) instanceof Observable) ((Observable)
get(index)).deleteObserver(this);
list.set(index,userData);
+ /*
if (userData instanceof Observable)
((Observable) userData).addObserver(this);
setChanged();
- notifyObservers(userData);
+ notifyObservers(userData);
+ */
}
public void add(IUserData userData) {
if (list.indexOf(userData) == -1) {
list.add(userData);
+
if (userData.getNum()<0)
userData.setNum(list.size());
+ /*
if (userData instanceof Observable)
((Observable) userData).addObserver(this);
+
setChanged();
notifyObservers(userData);
+ */
}
}
public IUserData get(int index) {
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2007-12-05 17:41:33 UTC (rev 3095)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2007-12-06 08:34:13 UTC (rev 3096)
@@ -8,5 +8,5 @@
Package-Version: 0.11
Package-Vendor: acad.bg
Implementation-Title: Perfsonar UI
-Implementation-Version: 0.11
+Implementation-Version: 0.11a
Implementation-Vendor:
\ No newline at end of file
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
2007-12-05 17:41:33 UTC (rev 3095)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
2007-12-06 08:34:13 UTC (rev 3096)
@@ -205,7 +205,6 @@
return m;
}
-
}
class ColorTableCellRenderer extends DefaultTableCellRenderer {
- perfsonar: r3096 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . ippm/ui/actions ma/ui/actions ma/ui/panels plugins ui ui/panels, svnlog, 12/06/2007
Archive powered by MHonArc 2.6.16.