perfsonar-dev - perfsonar: r4648 - in branches/perfsonarui: . ant dist jars jars/axis jars/ls jars/ui jars/xml src/org/perfsonar/perfsonarui/ls src/org/perfsonar/perfsonarui/test/flowsa src/org/perfsonar/perfsonarui/test/ls src/org/perfsonar/perfsonarui/ui src/org/perfsonar/perfsonarui/ui/actions src/org/perfsonar/perfsonarui/ui/panels
Subject: perfsonar development work
List archive
perfsonar: r4648 - in branches/perfsonarui: . ant dist jars jars/axis jars/ls jars/ui jars/xml src/org/perfsonar/perfsonarui/ls src/org/perfsonar/perfsonarui/test/flowsa src/org/perfsonar/perfsonarui/test/ls src/org/perfsonar/perfsonarui/ui src/org/perfsonar/perfsonarui/ui/actions src/org/perfsonar/perfsonarui/ui/panels
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4648 - in branches/perfsonarui: . ant dist jars jars/axis jars/ls jars/ui jars/xml src/org/perfsonar/perfsonarui/ls src/org/perfsonar/perfsonarui/test/flowsa src/org/perfsonar/perfsonarui/test/ls src/org/perfsonar/perfsonarui/ui src/org/perfsonar/perfsonarui/ui/actions src/org/perfsonar/perfsonarui/ui/panels
- Date: Tue, 21 Oct 2008 09:54:03 -0400
Author: michael.bischoff
Date: 2008-10-21 09:54:02 -0400 (Tue, 21 Oct 2008)
New Revision: 4648
Added:
branches/perfsonarui/jars/ls/
branches/perfsonarui/jars/ls/LS-client-api-1.0RC1.jar
branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA.jar
branches/perfsonarui/jars/ls/activation-1.1.jar
branches/perfsonarui/jars/ui/jcommon-1.0.14.jar
branches/perfsonarui/jars/ui/jfreechart-1.0.11.jar
branches/perfsonarui/jars/xml/jaxb-api-2.1.jar
branches/perfsonarui/jars/xml/jaxb-impl-2.1.7.jar
branches/perfsonarui/jars/xml/saaj-api-1.3.jar
branches/perfsonarui/jars/xml/saaj-impl-1.3.jar
branches/perfsonarui/jars/xml/stax-api-1.0.1.jar
branches/perfsonarui/jars/xml/wstx-lgpl-3.2.7.jar
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LookupProcess.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/BusyAwareComponent.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/WaitingPane.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/WaitingPopup.java
Removed:
branches/perfsonarui/jars/axis/saaj.jar
branches/perfsonarui/jars/ui/jcommon-1.0.10.jar
branches/perfsonarui/jars/ui/jfreechart-1.0.6.jar
branches/perfsonarui/jars/xml/activation.jar
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/flowsa/MetadataTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/BusyAwareComponent.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSQuery.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSQueryTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSSupport.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/MetadataQuery.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/ResultListener.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/Service.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/ServiceQuery.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/Test.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/UnmarshalException.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/WaitingPane.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/XML.java
Modified:
branches/perfsonarui/
branches/perfsonarui/ant/build.xml
branches/perfsonarui/dist/
branches/perfsonarui/dist/PerfsonarUI-v0.13.zip
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/EndpointsAction.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
Log:
- Added LS client integration
- Added LS tab in MA/MP selection
- Bumbed JCommon + JChart to latest stable version
Property changes on: branches/perfsonarui
___________________________________________________________________
Name: svn:ignore
- build
.classpath
.project
dist
+ build
.classpath
.project
dist
.settings
Modified: branches/perfsonarui/ant/build.xml
===================================================================
--- branches/perfsonarui/ant/build.xml 2008-10-21 13:46:24 UTC (rev 4647)
+++ branches/perfsonarui/ant/build.xml 2008-10-21 13:54:02 UTC (rev 4648)
@@ -66,7 +66,10 @@
<fileset dir="./jars/dns/">
<include name="*.jar"/>
</fileset>
-
+ <fileset dir="./jars/ls/">
+ <include name="*.jar"/>
+ </fileset>
+
<!--
<fileset dir="C:\Program Files\Apache Software Foundation\Tomcat
5.5\webapps\axis\WEB-INF\lib">
<include name="*.jar"/>
Property changes on: branches/perfsonarui/dist
___________________________________________________________________
Name: svn:ignore
+ PerfsonarUI-v0.13
Modified: branches/perfsonarui/dist/PerfsonarUI-v0.13.zip
===================================================================
(Binary files differ)
Deleted: branches/perfsonarui/jars/axis/saaj.jar
Added: branches/perfsonarui/jars/ls/LS-client-api-1.0RC1.jar
Property changes on: branches/perfsonarui/jars/ls/LS-client-api-1.0RC1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA.jar
Property changes on:
branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/ls/activation-1.1.jar
Property changes on: branches/perfsonarui/jars/ls/activation-1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/perfsonarui/jars/ui/jcommon-1.0.10.jar
Added: branches/perfsonarui/jars/ui/jcommon-1.0.14.jar
Property changes on: branches/perfsonarui/jars/ui/jcommon-1.0.14.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/ui/jfreechart-1.0.11.jar
Property changes on: branches/perfsonarui/jars/ui/jfreechart-1.0.11.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/perfsonarui/jars/ui/jfreechart-1.0.6.jar
Deleted: branches/perfsonarui/jars/xml/activation.jar
Added: branches/perfsonarui/jars/xml/jaxb-api-2.1.jar
Property changes on: branches/perfsonarui/jars/xml/jaxb-api-2.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/xml/jaxb-impl-2.1.7.jar
Property changes on: branches/perfsonarui/jars/xml/jaxb-impl-2.1.7.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/xml/saaj-api-1.3.jar
Property changes on: branches/perfsonarui/jars/xml/saaj-api-1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/xml/saaj-impl-1.3.jar
Property changes on: branches/perfsonarui/jars/xml/saaj-impl-1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/xml/stax-api-1.0.1.jar
Property changes on: branches/perfsonarui/jars/xml/stax-api-1.0.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/xml/wstx-lgpl-3.2.7.jar
Property changes on: branches/perfsonarui/jars/xml/wstx-lgpl-3.2.7.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java
Property changes on:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LookupProcess.java
Property changes on:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LookupProcess.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/flowsa/MetadataTest.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/BusyAwareComponent.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSQuery.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSQueryTest.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/LSSupport.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/MetadataQuery.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/ResultListener.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/Service.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/ServiceQuery.java
Deleted: branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/Test.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/UnmarshalException.java
Deleted:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/WaitingPane.java
Deleted: branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/XML.java
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2008-10-21 13:46:24 UTC (rev 4647)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2008-10-21 13:54:02 UTC (rev 4648)
@@ -1,6 +1,6 @@
Manifest-version: 1.0
Main-Class: org.perfsonar.perfsonarui.ui.PerfSonarApp
-Class-Path: jars/ui/swing-layout-1.0.jar jars/axis/saaj.jar
jars/axis/axis.jar jars/axis/axis-ant.jar jars/axis/commons-discovery-0.2.jar
jars/axis/commons-logging-1.0.4.jar jars/axis/jaxrpc.jar
jars/axis/log4j-1.2.15.jar jars/axis/wsdl4j-1.5.1.jar jars/xml/activation.jar
jars/xml/mail.jar jars/xml/jdom.jar jars/ui/jcommon-1.0.10.jar
jars/ui/jfreechart-1.0.6.jar jars/l2fprod/l2fprod-common-all.jar
jars/xml/commons-cli-1.0.jar jars/dns/dnsjava-2.0.3.jar
jars/axis/codec-1.0.jar jars/axis/bcprov-jdk15-138.jar
jars/axis/edugain-1.0-RC2.jar jars/axis/javolution-3.7.jar
jars/axis/joda-time-1.4.jar jars/axis/opensaml-1.1.jar
jars/axis/opensaml-trunk-jdk-1.5.jar
jars/axis/perfsonar-base-1.0.20080924.jar jars/axis/sasl-ca-1.0.jar
jars/axis/wsdl4j-1.5.1.jar jars/axis/wss4j-1.5.3.jar
jars/axis/xmlsec-1.4.1.jar jars/axis/xmltooling-trunk-jdk-1.5.jar
jars/xalan/xalan-2.7.0.jar jars/xalan/xalan-serializer-2.7.0.jar
jars/xalan/xerces-2.9.1-xercesImpl.jar jars/xalan/xerces-2.9.1-xml-apis.ja
r jars/axis/slf4j-api-1.4.3.jar jars/axis/slf4j-simple-1.4.3.jar
jars/axis/velocity-1.5.jar jars/axis/commons-collections-3.1.jar
jars/axis/commons-lang-2.1.jar jars/axis/openws-trunk-jdk-1.5.jar
+Class-Path: jars/axis/axis-ant.jar jars/axis/axis.jar
jars/axis/bcprov-jdk15-138.jar jars/axis/codec-1.0.jar
jars/axis/commons-collections-3.1.jar jars/axis/commons-discovery-0.2.jar
jars/axis/commons-lang-2.1.jar jars/axis/commons-logging-1.0.4.jar
jars/axis/edugain-1.0-RC2.jar jars/axis/javolution-3.7.jar
jars/axis/jaxrpc.jar jars/axis/joda-time-1.4.jar jars/axis/log4j-1.2.15.jar
jars/axis/opensaml-1.1.jar jars/axis/opensaml-trunk-jdk-1.5.jar
jars/axis/openws-trunk-jdk-1.5.jar jars/axis/perfsonar-base-1.0.20080924.jar
jars/axis/sasl-ca-1.0.jar jars/axis/slf4j-api-1.4.3.jar
jars/axis/slf4j-simple-1.4.3.jar jars/axis/velocity-1.5.jar
jars/axis/wsdl4j-1.5.1.jar jars/axis/wss4j-1.5.3.jar
jars/axis/xmlsec-1.4.1.jar jars/axis/xmltooling-trunk-jdk-1.5.jar
jars/dns/dnsjava-2.0.3.jar jars/l2fprod/l2fprod-common-all.jar
jars/ui/jcommon-1.0.14.jar jars/ui/jfreechart-1.0.11.jar jars/ui/junit.jar
jars/ui/swing-layout-1.0.jar jars/xalan/xalan-2.7.0.jar
jars/xalan/xalan-serializer-2.7.0.
jar jars/xalan/xerces-2.9.1-xercesImpl.jar
jars/xalan/xerces-2.9.1-xml-apis.jar jars/xml/commons-cli-1.0.jar
jars/xml/jdom.jar jars/xml/mail.jar jars/xml/xercesImpl.jar
jars/xml/saaj-api-1.3.jar jars/xml/saaj-impl-1.3.jar
jars/xml/wstx-lgpl-3.2.7.jar jars/ls/activation-1.1.jar
jars/ls/LS-client-api-1.0RC1.jar jars/ls/LSclient-Implementation-1.0-BETA.jar
jars/xml/stax-api-1.0.1.jar jars/xml/jaxb-api-2.1.jar
jars/xml/jaxb-impl-2.1.7.jar
Specification-Title: perfSonar test application
Specification-Version: 0.14
Specification-Vendor: perfsonar.acad.bg
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/EndpointsAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/EndpointsAction.java
2008-10-21 13:46:24 UTC (rev 4647)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/EndpointsAction.java
2008-10-21 13:54:02 UTC (rev 4648)
@@ -33,7 +33,7 @@
* A base class for actions that need to operate on the nodes of endpoints.
* @author Nina Jeliazkova
* <b>Modified</b> 2006-1-5
- */
+ */ //
public abstract class EndpointsAction extends PSUIAction {
protected MAEndpointList endpoints;
/**
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
2008-10-21 13:46:24 UTC (rev 4647)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
2008-10-21 13:54:02 UTC (rev 4648)
@@ -21,17 +21,16 @@
package org.perfsonar.perfsonarui.ui.actions;
import javax.swing.Icon;
+import javax.swing.JComponent;
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;
/**
* Similar to
{@link
SelectAllEndpointsAction}, but allows only one
{@link
MAEndpoint} enabled at a time.
* @author Nina Jeliazkova
- *
*/
public class SelectOneEndpointAction extends ShowEndpointsAction {
@@ -80,40 +79,32 @@
}
*/
protected PSUIAction[] createActions() {
- PSUIAction[] actions = new PSUIAction[5];
+ PSUIAction[] actions = new PSUIAction[4];
- PSUIAction a ;
EchoSmartRequest echoRequest = new EchoSmartRequest();
echoRequest.setTimeout(10000);
- a = new EchoAction(echoRequest, new AbstractUserData() {
- @Override
- public void makeQueryFromResponse() {
- }
- },endpoints);
- actions[0] = a;
-
- a = new FileEndpointsAction(endpoints,true);
- actions[1] = a;
- a = new FileEndpointsAction(endpoints,false);
- actions[2] = a;
- a = new NewEndpointAction(endpoints);
- actions[3] = a;
-
- a = new LSRetrieveEndpointsAction(endpoints);
- actions[4] = a;
+ actions[0] = new EchoAction(echoRequest, new
AbstractUserData() {
+ @Override
+ public void makeQueryFromResponse() {
+ }
+ },endpoints);
+ actions[1] = new FileEndpointsAction(endpoints,true);
+ actions[2] = new FileEndpointsAction(endpoints,false);
+ actions[3] = new NewEndpointAction(endpoints);
+ //actions[4] = new LSRetrieveEndpointsAction(endpoints);
+
return actions;
}
@Override
- protected MAEndpointsPanel createEndpointsPanel(PSUIAction[] actions) {
+ protected JComponent createEndpointsPanel(PSUIAction[] actions) {
boolean selected = false;
for (int i=0; i < endpoints.size();i++)
if (endpoints.get(i).isEnabled()) {
- if (selected) endpoints.get(i).setEnabled(false);
-
+ if (selected) endpoints.get(i).setEnabled(false);
selected = true;
}
- return new MAEndpointsPanel(endpoints,actions,true);
+ return super.createEndpointsPanel(actions);
}
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
2008-10-21 13:46:24 UTC (rev 4647)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
2008-10-21 13:54:02 UTC (rev 4648)
@@ -26,12 +26,20 @@
import java.awt.Component;
import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import javax.swing.Icon;
-import javax.swing.JOptionPane;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingConstants;
+import javax.swing.WindowConstants;
import org.perfsonar.perfsonarui.AbstractUserData;
import org.perfsonar.perfsonarui.EchoSmartRequest;
+import org.perfsonar.perfsonarui.ls.LSEndpointsPanel;
import org.perfsonar.perfsonarui.plugins.MAEndpointList;
import org.perfsonar.perfsonarui.ui.panels.MAEndpointsPanel;
@@ -54,23 +62,17 @@
*/
public ShowEndpointsAction(MAEndpointList endpoints) {
this(endpoints,"Service addresses");
-
}
/**
- * @param userData
- * @param dataList
* @param endpoints
* @param arg0
*/
public ShowEndpointsAction(MAEndpointList endpoints,String arg0) {
- this(endpoints,arg0,null);
-
+ this(endpoints,arg0,null);
}
/**
- * @param userData
- * @param dataList
* @param endpoints
* @param arg0
* @param arg1
@@ -86,59 +88,61 @@
PSUIAction[] actions = createActions();
PSActionMap allActions = new PSActionMap();
+
+ JComponent endpointsPanel = createEndpointsPanel(actions);
-
- MAEndpointsPanel endpointsPanel = createEndpointsPanel(actions);
-
for (int i=0; i < actions.length;i++) {
actions[i].setActions(allActions);
actions[i].setFrame(endpointsPanel);
allActions.put(Integer.toString(i+1), actions[i]);
}
+
+ JDialog dialog = new JDialog((JFrame)frame,"Measurement archives");
+ dialog.setContentPane(endpointsPanel);
+ dialog.setModal(true);
+ dialog.pack();
+ dialog.setComponentOrientation(((frame == null) ?
dialog.getRootPane() : frame).getComponentOrientation());
+ dialog.setLocationRelativeTo(frame);
+ dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ dialog.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosed(WindowEvent e) {
+ //TODO save
+ }
+ });
+ dialog.setVisible(true);
- JOptionPane.showMessageDialog(frame,endpointsPanel,"Measurement
archives",
- JOptionPane.PLAIN_MESSAGE);
-
if ((actions.length>0) & (actions[0] instanceof EchoAction))
((EchoAction)actions[0]).setInterrupted(true);
- endpointsPanel = null;
allActions.clear();
-
- for (int i=0; i < actions.length;i++)
- actions[i] = null;
}
protected PSUIAction[] createActions() {
- PSUIAction[] actions = new PSUIAction[8];
+ PSUIAction[] actions = new PSUIAction[7];
- PSUIAction a = new SelectAllEndpointsAction(endpoints,true,"Select
all");
- actions[1] = a;
- a = new SelectAllEndpointsAction(endpoints,false,"Unselect all");
- actions[2] = a;
EchoSmartRequest echoRequest = new EchoSmartRequest();
echoRequest.setTimeout(10000);
- a = new EchoAction(echoRequest, new AbstractUserData() {
- @Override
- public void makeQueryFromResponse() {
- }
- },endpoints);
- actions[0] = a;
-
- a = new FileEndpointsAction(endpoints,true);
- actions[3] = a;
- a = new FileEndpointsAction(endpoints,false);
- actions[4] = a;
- a = new NewEndpointAction(endpoints);
- actions[5] = a;
- a = new DeleteEndpointAction(endpoints);
- actions[6] = a;
- a = new LSRetrieveEndpointsAction(endpoints);
- actions[7] = a;
+ actions[0] = new EchoAction(echoRequest, new AbstractUserData() {
+ @Override
+ public void makeQueryFromResponse() {}
+ },endpoints);
+ actions[1] = new SelectAllEndpointsAction(endpoints,true,"Select
all");
+ actions[2] = new SelectAllEndpointsAction(endpoints,false,"Unselect
all");
+ actions[3] = new FileEndpointsAction(endpoints,true);
+ actions[4] = new FileEndpointsAction(endpoints,false);
+ actions[5] = new NewEndpointAction(endpoints);
+ actions[6] = new DeleteEndpointAction(endpoints);
+// TODO remove
+// a = new LSRetrieveEndpointsAction(endpoints);
+// actions[7] = a;
return actions;
}
- protected MAEndpointsPanel createEndpointsPanel(PSUIAction[] actions) {
- return new MAEndpointsPanel(endpoints,actions);
+ protected JComponent createEndpointsPanel(PSUIAction[] availableActions)
{
+ JTabbedPane pane = new JTabbedPane(SwingConstants.BOTTOM,
JTabbedPane.SCROLL_TAB_LAYOUT);
+ pane.addTab(".conf file", new
MAEndpointsPanel(endpoints,availableActions));
+ pane.addTab("Lookup Service", new LSEndpointsPanel());
+ return pane;
}
/* (non-Javadoc)
Copied:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/BusyAwareComponent.java
(from rev 4623,
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/BusyAwareComponent.java)
Copied:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/WaitingPane.java
(from rev 4623,
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/WaitingPane.java)
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/WaitingPopup.java
Property changes on:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/WaitingPopup.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
- perfsonar: r4648 - in branches/perfsonarui: . ant dist jars jars/axis jars/ls jars/ui jars/xml src/org/perfsonar/perfsonarui/ls src/org/perfsonar/perfsonarui/test/flowsa src/org/perfsonar/perfsonarui/test/ls src/org/perfsonar/perfsonarui/ui src/org/perfsonar/perfsonarui/ui/actions src/org/perfsonar/perfsonarui/ui/panels, svnlog, 10/21/2008
Archive powered by MHonArc 2.6.16.