diff options
Diffstat (limited to 'src/main/java/com/c2kernel/gui/tabs')
4 files changed, 13 insertions, 56 deletions
diff --git a/src/main/java/com/c2kernel/gui/tabs/AgentPropertiesPane.java b/src/main/java/com/c2kernel/gui/tabs/AgentPropertiesPane.java deleted file mode 100644 index f0ae533..0000000 --- a/src/main/java/com/c2kernel/gui/tabs/AgentPropertiesPane.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.c2kernel.gui.tabs;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-
-/**************************************************************************
- *
- * $Revision: 1.2 $
- * $Date: 2005/07/05 11:34:17 $
- *
- * Copyright (C) 2003 CERN - European Organization for Nuclear Research
- * All rights reserved.
- **************************************************************************/
-
-
-public class AgentPropertiesPane extends EntityTabPane {
-
- JTable roleTable;
- JTextField newPassword;
- JTextField newPasswordConfirm;
- JButton changePassword;
-
- public AgentPropertiesPane() {
- super("Properties", "Agent Details");
- initPanel();
- getGridBagConstraints();
- c.gridy++;
- JLabel roleHeader = new JLabel("Roles held");
- roleHeader.setFont(titleFont);
- roleHeader.setForeground(headingColor);
- gridbag.setConstraints(roleHeader, c);
- add(roleHeader);
- roleTable = new JTable(1,1);
- JScrollPane roleScroll = new JScrollPane(roleTable);
- c.gridy++;
- gridbag.setConstraints(roleScroll, c);
- add(roleScroll);
-
- //JLabel passHeader = new JLabel("Change password");
- //TODO: Finish agent admin page
- }
-
- @Override
- public void run() {
-
- }
-
-}
diff --git a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java b/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java index 5d01933..fe5c1a4 100644 --- a/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/HistoryPane.java @@ -25,6 +25,7 @@ import com.c2kernel.entity.proxy.EntityProxyObserver; import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.events.Event;
import com.c2kernel.events.History;
+import com.c2kernel.gui.MainFrame;
import com.c2kernel.lifecycle.instance.stateMachine.Transitions;
import com.c2kernel.persistency.ClusterStorage;
import com.c2kernel.utils.Language;
@@ -96,6 +97,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity @Override
public void run() {
Thread.currentThread().setName("History Pane Builder");
+ MainFrame.progress.startBouncing("Loading history");
try {
history = (History)sourceEntity.getEntity().getObject(ClusterStorage.HISTORY);
sourceEntity.getEntity().subscribe(new MemberSubscription<Event>(this, ClusterStorage.HISTORY, true));
@@ -265,8 +267,10 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity @Override
public void control(String control, String msg) {
- // TODO Auto-generated method stub
-
+ if (control.equals(MemberSubscription.END))
+ MainFrame.progress.stopBouncing("History loading complete.");
+ else
+ MainFrame.progress.stopBouncing("History: "+msg);
}
}
diff --git a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java index 9e5a9b2..528b18b 100644 --- a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java @@ -43,6 +43,7 @@ import com.c2kernel.utils.Language; public class PropertiesPane extends EntityTabPane implements EntityProxyObserver<Property>, ActionListener {
Box propertyBox;
+ JButton eraseButton;
boolean subbed = false;
HashMap<String, JLabel> loadedProps = new HashMap<String, JLabel>();
JLabel domTitle;
@@ -82,7 +83,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver if ("true".equals(Gateway.getProperty("EnableItemErase"))) {
c.gridy++;
c.fill = GridBagConstraints.NONE;
- JButton eraseButton = new JButton(Language.translate("Erase!"));
+ eraseButton = new JButton(Language.translate("Erase!"));
eraseButton.addActionListener(this);
eraseButton.setActionCommand("Erase Item");
gridbag.setConstraints(eraseButton, c);
@@ -104,6 +105,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver if (sourceEntity instanceof NodeAgent) {
remove(domAdmin);
remove(domTitle);
+ eraseButton.setEnabled(false);
}
else if (domAdmin != null)
domAdmin.setEntity((ItemProxy)sourceEntity.getEntity());
diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/DefaultExecutor.java b/src/main/java/com/c2kernel/gui/tabs/execution/DefaultExecutor.java index 378cc2e..848d1d3 100644 --- a/src/main/java/com/c2kernel/gui/tabs/execution/DefaultExecutor.java +++ b/src/main/java/com/c2kernel/gui/tabs/execution/DefaultExecutor.java @@ -23,9 +23,11 @@ public class DefaultExecutor implements Executor { @Override
public void execute(Job job, JLabel status) throws Exception {
- status.setText(Language.translate("Requesting, please wait."));
+ status.setText(Language.translate("Submitting..."));
+ MainFrame.progress.startBouncing("Requesting, please wait.");
MainFrame.userAgent.execute(job);
- status.setText(Language.translate("Execution complete. Waiting for joblist update."));
+ MainFrame.progress.stopBouncing("Execution complete.");
+ status.setText("Waiting for joblist update.");
}
@Override
|