diff options
Diffstat (limited to 'source/com/c2kernel/gui')
63 files changed, 1418 insertions, 1072 deletions
diff --git a/source/com/c2kernel/gui/Console.java b/source/com/c2kernel/gui/Console.java index 370413a..a16e6f6 100755..100644 --- a/source/com/c2kernel/gui/Console.java +++ b/source/com/c2kernel/gui/Console.java @@ -6,12 +6,22 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
+import java.io.PrintWriter;
import java.net.Socket;
-import java.util.Iterator;
import java.util.Properties;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
import com.c2kernel.process.Gateway;
import com.c2kernel.utils.FileStringUtility;
@@ -32,12 +42,12 @@ public class Console extends JFrame { JScrollPane scroll;
JTextField input;
JButton sendButton;
- JButton toFileButton;
+ JButton toFileButton;
FileWriter logFile;
ConsoleConnection connection;
JFileChooser scriptLoader = new JFileChooser();
static int bufferSize = Integer.parseInt(Gateway.getProperty("Console.bufferSize", "200"));
-
+
public Console(String host, int port) {
super("Cristal Console - "+host);
GridBagLayout gridbag = new GridBagLayout();
@@ -48,13 +58,15 @@ public class Console extends JFrame { setSize(400, 600);
sendButton = new JButton("Send");
sendButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
submit();
}
});
JButton clearButton = new JButton("Clear");
clearButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
synchronized (output) {
output.setText("");
}
@@ -62,7 +74,8 @@ public class Console extends JFrame { });
toFileButton = new JButton("Save");
toFileButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
if (logFile == null) {
int returnValue = scriptLoader.showSaveDialog(null);
switch (returnValue)
@@ -93,8 +106,8 @@ public class Console extends JFrame { }
}
});
-
-
+
+
input.addKeyListener(new EnterListener(this));
scroll = new JScrollPane(output);
@@ -104,7 +117,7 @@ public class Console extends JFrame { c.weightx=1.0;c.weighty=1.0;
gridbag.setConstraints(scroll, c);
getContentPane().add(scroll);
-
+
Box inputBox = Box.createHorizontalBox();
inputBox.add(input);
inputBox.add(Box.createHorizontalStrut(5));
@@ -115,47 +128,50 @@ public class Console extends JFrame { c.weighty=0;
gridbag.setConstraints(inputBox, c);
getContentPane().add(inputBox);
-
+
try {
Properties utilProps = FileStringUtility.loadConfigFile( Resource.getDomainResourceURL("ScriptUtils.conf").toString());
Box utilBox = Box.createHorizontalBox();
- for (Iterator utilIter = utilProps.keySet().iterator(); utilIter.hasNext();) {
- String name = (String) utilIter.next();
+ for (Object name2 : utilProps.keySet()) {
+ String name = (String) name2;
String value = utilProps.getProperty(name);
JButton newUtil = new JButton(name);
newUtil.setActionCommand(value);
newUtil.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
processUtil(e.getActionCommand());
}
});
utilBox.add(newUtil);
utilBox.add(Box.createHorizontalStrut(5));
}
-
+
c.gridy++;
gridbag.setConstraints(utilBox, c);
getContentPane().add(utilBox);
} catch (Exception ex) { // no domain utils
}
-
-
+
+
validate();
connection = new ConsoleConnection(host, port, this);
new Thread(connection).start();
addWindowListener(new java.awt.event.WindowAdapter() {
- public void windowClosing(java.awt.event.WindowEvent evt) {
+ @Override
+ public void windowClosing(java.awt.event.WindowEvent evt) {
if (connection!=null) connection.shutdown();
dispose();
}
});
}
-
- public void setVisible(boolean visible) {
+
+ @Override
+ public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) input.requestFocus();
}
-
+
public void processUtil(String command) {
int replace;
String text = input.getText();
@@ -164,12 +180,12 @@ public class Console extends JFrame { }
connection.sendCommand(command);
}
-
+
public void submit() {
connection.sendCommand(input.getText());
input.setText("");
}
-
+
public void print(String line) {
synchronized (output) {
String currentText = output.getText()+line+"\n";
@@ -187,8 +203,9 @@ public class Console extends JFrame { }
}
}
-
- public void disable() {
+
+ @Override
+ public void disable() {
synchronized (output) {
output.append("Lost connection");
}
@@ -196,14 +213,15 @@ public class Console extends JFrame { input.setEnabled(false);
sendButton.setEnabled(false);
}
-
+
private class EnterListener extends KeyAdapter
{
Console parent;
public EnterListener(Console parent) {
this.parent = parent;
}
- public void keyPressed(KeyEvent e) {
+ @Override
+ public void keyPressed(KeyEvent e) {
if (e.getKeyCode()==10) {
parent.submit();
}
@@ -213,16 +231,17 @@ public class Console extends JFrame { private class ConsoleConnection implements Runnable {
String host; int port; Console parent; boolean keepConnected = true;
Socket conn; PrintWriter consoleOutput; BufferedReader consoleInput;
-
-
+
+
public ConsoleConnection(String host, int port, Console parent) {
Thread.currentThread().setName("Console Client to "+host+":"+port);
this.host = host;
this.port = port;
this.parent = parent;
}
-
- public void run() {
+
+ @Override
+ public void run() {
connect();
while (keepConnected) {
try {
@@ -239,20 +258,20 @@ public class Console extends JFrame { keepConnected = false;
}
}
-
+
try {
conn.close();
} catch (IOException ex) { }
}
-
+
public void sendCommand(String command) {
consoleOutput.println(command);
}
-
+
public void shutdown() {
keepConnected = false;
}
-
+
public void connect() {
parent.print("Connecting to "+host+":"+port);
try {
@@ -262,7 +281,7 @@ public class Console extends JFrame { consoleOutput = new PrintWriter(conn.getOutputStream(), true);
consoleInput = new BufferedReader(new InputStreamReader(conn.getInputStream()));
} catch (Exception ex) {
-
+
}
}
}
diff --git a/source/com/c2kernel/gui/DomainKeyConsumer.java b/source/com/c2kernel/gui/DomainKeyConsumer.java index 9eb878c..18847cc 100755..100644 --- a/source/com/c2kernel/gui/DomainKeyConsumer.java +++ b/source/com/c2kernel/gui/DomainKeyConsumer.java @@ -10,7 +10,7 @@ import com.c2kernel.lookup.DomainPath; public interface DomainKeyConsumer {
public void push(DomainPath key);
-
+
public void push(String name);
}
diff --git a/source/com/c2kernel/gui/DomainKeyListener.java b/source/com/c2kernel/gui/DomainKeyListener.java index 5c1575b..df18e72 100755..100644 --- a/source/com/c2kernel/gui/DomainKeyListener.java +++ b/source/com/c2kernel/gui/DomainKeyListener.java @@ -21,7 +21,7 @@ public interface DomainKeyListener { // return 25x25 icon for enable/disable button
public ImageIcon getIcon();
-
+
// tooltip for the button
public String getDescription();
}
diff --git a/source/com/c2kernel/gui/DynamicTreeBuilder.java b/source/com/c2kernel/gui/DynamicTreeBuilder.java index 29a62dc..a72c156 100755..100644 --- a/source/com/c2kernel/gui/DynamicTreeBuilder.java +++ b/source/com/c2kernel/gui/DynamicTreeBuilder.java @@ -7,6 +7,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel;
import com.c2kernel.gui.data.Node;
+import com.c2kernel.gui.data.NodeItem;
import com.c2kernel.gui.data.NodeSubscriber;
import com.c2kernel.lookup.Path;
import com.c2kernel.utils.Language;
@@ -33,7 +34,7 @@ public class DynamicTreeBuilder implements NodeSubscriber { private DefaultMutableTreeNode loading;
private static ImageIcon loadIcon = Resource.getImageResource("loading.gif");
private static ImageIcon pauseIcon = Resource.getImageResource("reload.gif");
-
+
/**
* The newly created DynamicTreeBuilder records its parent node - the one for which it will build child nodes for.
* @param nodeClicked The Parent Tree Node that will be populated.
@@ -67,7 +68,8 @@ public class DynamicTreeBuilder implements NodeSubscriber { /**
* Used by the JTree to find the text representation of the node.
*/
- public String toString() {
+ @Override
+ public String toString() {
switch (state) {
case IDLE:
return Language.translate("Initializing Tree Node Loader");
@@ -80,9 +82,9 @@ public class DynamicTreeBuilder implements NodeSubscriber { default:
return "";
}
-
+
}
-
+
public ImageIcon getIcon() {
if (state == LOADING)
return loadIcon;
@@ -94,19 +96,21 @@ public class DynamicTreeBuilder implements NodeSubscriber { return loading;
}
- public void add(Node newNode) {
+ @Override
+ public void add(Node newNode) {
Logger.msg(2, "DynamicTreeBuilder.add() - Received item for tree. Name: "+newNode);
-
+
// have we inserted the node yet?
SwingUtilities.invokeLater(new TreeAddThread(newNode));
}
-
+
class TreeAddThread implements Runnable {
Node newNode;
TreeAddThread(Node newNode) {
this.newNode = newNode;
}
- public void run() {
+ @Override
+ public void run() {
boolean inserted = false;
DefaultMutableTreeNode newTreeNode = newNode.getTreeNode();
// loop though all children unless we have done the insertion
@@ -133,21 +137,23 @@ public class DynamicTreeBuilder implements NodeSubscriber { if (!inserted)
treeModel.insertNodeInto(newTreeNode, parent, parent.getChildCount());
}
-
+
}
-
+
class TreeRemoveThread implements Runnable {
DefaultMutableTreeNode oldNode;
TreeRemoveThread(DefaultMutableTreeNode oldNode) {
this.oldNode = oldNode;
}
-
- public void run() {
+
+ @Override
+ public void run() {
treeModel.removeNodeFromParent(oldNode);
}
}
-
- public void end(boolean more) {
+
+ @Override
+ public void end(boolean more) {
if (more) {
state = PARTIAL;
}
@@ -158,9 +164,10 @@ public class DynamicTreeBuilder implements NodeSubscriber { SwingUtilities.invokeLater(new TreeRemoveThread(loading));
}
}
- }
-
- public void remove(Path path) {
+ }
+
+ @Override
+ public void remove(Path path) {
synchronized (treeModel) {
for (int i=0; i<parent.getChildCount(); i++) {
DefaultMutableTreeNode child = (DefaultMutableTreeNode)treeModel.getChild(parent, i);
diff --git a/source/com/c2kernel/gui/EntityDetails.java b/source/com/c2kernel/gui/EntityDetails.java index 5eb812f..7cb4f66 100644 --- a/source/com/c2kernel/gui/EntityDetails.java +++ b/source/com/c2kernel/gui/EntityDetails.java @@ -8,12 +8,14 @@ import java.awt.event.ActionEvent; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.SwingConstants;
import javax.swing.event.ChangeListener;
+
import com.c2kernel.gui.data.NodeEntity;
import com.c2kernel.gui.tabs.EntityTabPane;
import com.c2kernel.utils.Language;
@@ -41,7 +43,8 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { myEntity = thisItem;
}
- public void run() {
+ @Override
+ public void run() {
Thread.currentThread().setName("Entity Pane Builder");
EntityTabPane componentToAdd = null;
setLayout(new BorderLayout());
@@ -50,13 +53,13 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { add(myTabbedPane);
// decide which tabs to create
- ArrayList requiredTabs = myEntity.getTabs();
-
- for (Iterator en = requiredTabs.iterator(); en.hasNext();) {
- String tabName = (String)en.next();
+ ArrayList<?> requiredTabs = myEntity.getTabs();
+
+ for (Object name2 : requiredTabs) {
+ String tabName = (String)name2;
if (tabName != null) {
//create class instances and initialise
- Class myClass = null;
+ Class<?> myClass = null;
//look up the required TabbedPane
try {
myClass = Class.forName(this.getClass().getPackage().getName() + ".tabs." + tabName + "Pane");
@@ -69,7 +72,7 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { Logger.msg(0, "ItemDetails.<init> - Instantiation Error! " + e);
} catch (IllegalAccessException e) {
Logger.msg(0, "ItemDetails.<init> - Illegal Method Access Error! Class was probably not a ItemTabPane: " + e);
- }
+ }
if (componentToAdd == null) componentToAdd = new EntityTabPane(tabName, null);
componentToAdd.setParent(this);
@@ -94,12 +97,13 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { }
- public void stateChanged(javax.swing.event.ChangeEvent p1) {
+ @Override
+ public void stateChanged(javax.swing.event.ChangeEvent p1) {
initialisePane((EntityTabPane)myTabbedPane.getSelectedComponent());
}
public void initialisePane(EntityTabPane pane) {
- Boolean isInit = (Boolean)childPanes.get(pane);
+ Boolean isInit = childPanes.get(pane);
if (isInit.booleanValue() == false) {
Logger.msg(4,"Initialising "+pane.getTabName());
pane.initForEntity(myEntity);
@@ -155,18 +159,18 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { public void discardTabs() {
myTabbedPane.removeChangeListener(this);
myTabbedPane.removeAll();
- for (Iterator iter = childPanes.keySet().iterator(); iter.hasNext();) {
- EntityTabPane element = (EntityTabPane)iter.next();
+ for (Iterator<EntityTabPane> iter = childPanes.keySet().iterator(); iter.hasNext();) {
+ EntityTabPane element = iter.next();
element.destroy();
iter.remove();
}
}
-
+
public int getSysKey()
{
return myEntity.getSysKey();
}
-
+
public void closeTab() {
desktopManager.remove(myEntity.getSysKey());
Logger.msg(5,"Remove master Tab :"+myEntity.getType()+ " SysKey "+myEntity.getSysKey());
@@ -177,7 +181,7 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { if (e.getActionCommand().equals("close"))
closeTab();
}
-
+
public void runCommand(String tab, String command) {
if (initialized) {
int tabIndex = findTab(tab);
@@ -185,7 +189,7 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { if (tabIndex == -1) {
Logger.error("Tab "+tab+" not found for command "+command);
return;
- }
+ }
EntityTabPane startPane = (EntityTabPane)myTabbedPane.getComponentAt(tabIndex);
myTabbedPane.setSelectedIndex(tabIndex);
initialisePane(startPane);
@@ -198,7 +202,7 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { startCommand = command;
}
}
-
+
protected int findTab(String tabName) {
for (int i=0; i< myTabbedPane.getTabCount(); i++) {
EntityTabPane thisPane = (EntityTabPane)myTabbedPane.getComponentAt(i);
@@ -207,7 +211,7 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { }
return -1;
}
-
+
public void refresh()
{
@@ -215,7 +219,8 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable { /**
*
*/
- protected void finalize() throws Throwable {
+ @Override
+ protected void finalize() throws Throwable {
Logger.msg(7, "EntityDetails "+myEntity.getSysKey()+" reaped");
super.finalize();
}
diff --git a/source/com/c2kernel/gui/EntityFinder.java b/source/com/c2kernel/gui/EntityFinder.java index 6f23a5d..18038c9 100755..100644 --- a/source/com/c2kernel/gui/EntityFinder.java +++ b/source/com/c2kernel/gui/EntityFinder.java @@ -10,7 +10,14 @@ import java.io.IOException; import java.util.Enumeration;
import java.util.StringTokenizer;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+import javax.swing.JToggleButton;
import com.c2kernel.lookup.DomainPath;
import com.c2kernel.lookup.LDAPLookup;
@@ -28,7 +35,7 @@ public class EntityFinder extends Box implements Runnable { LDAPLookup lookup = Gateway.getLDAPLookup();
DomainKeyConsumer defaultConsumer = null;
DomainKeyConsumer currentConsumer = null;
- Enumeration matches;
+ Enumeration<?> matches;
Path rootNode = MainFrame.userNode.getPath();
static protected ImageIcon mFindIcon = null;
@@ -54,7 +61,7 @@ public class EntityFinder extends Box implements Runnable { inputField.setText(key);
runSearch();
}
-
+
public void setDefaultConsumer(DomainKeyConsumer newConsumer) {
defaultConsumer = newConsumer;
currentConsumer = newConsumer;
@@ -64,43 +71,46 @@ public class EntityFinder extends Box implements Runnable { currentConsumer = newConsumer;
findButton.setText(label);
}
-
+
public void clearConsumer(DomainKeyConsumer oldConsumer) {
if (currentConsumer == oldConsumer) {
currentConsumer = defaultConsumer;
findButton.setText("");
}
}
-
+
private void initPanel() {
JLabel search = new JLabel(" "+Language.translate("Search")+":");
add(search);
add(Box.createHorizontalStrut(7));
-
+
inputField = new JTextField(20);
add(inputField);
add(Box.createHorizontalStrut(5));
inputField.addActionListener( new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
pushNewKey(inputField.getText());
}
});
-
+
findButton = new JButton(mFindIcon);//(Language.translate("Find"));
findButton.setMargin(new Insets(2, 5, 2, 5));
findButton.addActionListener( new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
pushNewKey(inputField.getText());
}
});
add(findButton);
add(Box.createHorizontalStrut(5));
- findNextButton = new JButton(mNextIcon);//(Language.translate("Next"));
+ findNextButton = new JButton(mNextIcon);//(Language.translate("Next"));
findNextButton.setMargin(new Insets(2, 5, 2, 5));
findNextButton.addActionListener( new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
MainFrame.status.setText("Navigating to next match");
nextMatch();
}
@@ -118,7 +128,7 @@ public class EntityFinder extends Box implements Runnable { String listenerName = tok.nextToken();
Logger.msg(6, "ItemFinder() - creating a " + listenerName);
try {
- Class listenerClass = Class.forName(listenerName);
+ Class<?> listenerClass = Class.forName(listenerName);
DomainKeyListener newListener = (DomainKeyListener)listenerClass.newInstance();
newListener.init(); newListener.setConsumer(this);
JToggleButton listenerButton = new JToggleButton(newListener.getIcon(), false);
@@ -139,19 +149,20 @@ public class EntityFinder extends Box implements Runnable { Thread searcher = new Thread(this);
searcher.start();
}
-
- public void run() {
+
+ @Override
+ public void run() {
Thread.currentThread().setName("Entity Search");
MainFrame.status.setText("Searching. Please Wait");
findButton.setEnabled(false); findNextButton.setEnabled(false);
String searchTerm = inputField.getText();
if (searchTerm.length() == 0) return; // don't allow null searches
- findNextButton.setEnabled(false);
+ findNextButton.setEnabled(false);
matches = lookup.search(rootNode,inputField.getText());
if (!matches.hasMoreElements()) {
MainFrame.status.setText("No results");
currentConsumer.push(searchTerm); // for subscribers who don't care if it exists
- findButton.setEnabled(true);
+ findButton.setEnabled(true);
return;
}
MainFrame.status.setText("Selecting first match.");
@@ -161,7 +172,7 @@ public class EntityFinder extends Box implements Runnable { void nextMatch() {
findButton.setEnabled(false); findNextButton.setEnabled(false);
- DomainPath nextMatch = (DomainPath)matches.nextElement();
+ DomainPath nextMatch = (DomainPath)matches.nextElement();
try
{
currentConsumer.push(nextMatch);
@@ -171,8 +182,8 @@ public class EntityFinder extends Box implements Runnable { //case the item searched is not found !
}
findButton.setEnabled(true);
- findNextButton.setToolTipText("Click to show next match");
- if (matches.hasMoreElements()) findNextButton.setEnabled(true);
+ findNextButton.setToolTipText("Click to show next match");
+ if (matches.hasMoreElements()) findNextButton.setEnabled(true);
}
private class ListenerButtonListener implements ItemListener {
@@ -184,7 +195,8 @@ public class EntityFinder extends Box implements Runnable { this.listenerButton = listenerButton;
}
- public void itemStateChanged(ItemEvent e) {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
// Switch on
try {
diff --git a/source/com/c2kernel/gui/EntityTabManager.java b/source/com/c2kernel/gui/EntityTabManager.java index 1e01ad0..b465570 100644 --- a/source/com/c2kernel/gui/EntityTabManager.java +++ b/source/com/c2kernel/gui/EntityTabManager.java @@ -2,7 +2,6 @@ package com.c2kernel.gui; import java.awt.GridLayout;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
@@ -21,7 +20,7 @@ import com.c2kernel.utils.Logger; public class EntityTabManager extends JPanel
{
private MainFrame mMainframe;
-
+
protected HashMap<Integer, EntityDetails> openItems = new HashMap<Integer, EntityDetails>();
protected JTabbedPaneWithCloseIcons tabbedPane = new JTabbedPaneWithCloseIcons();
//JTabbedPane tabbedPane = new JTabbedPane();
@@ -50,11 +49,11 @@ public class EntityTabManager extends JPanel // get currently selected item to set location
tabbedPane.addTab(thisEntity.getName(), thisEntity.getIcon(), requestedDetails, Integer.toString(thisEntity.getSysKey()));
-
-
+
+
}
else { //opened window but different nodeitem
- requestedDetails = (EntityDetails)openItems.get(new Integer(thisEntity.getSysKey()));
+ requestedDetails = openItems.get(new Integer(thisEntity.getSysKey()));
}
tabbedPane.setSelectedComponent(requestedDetails);
return requestedDetails;
@@ -64,24 +63,23 @@ public class EntityTabManager extends JPanel this.myMenuBuilder = myMenuBuilder;
}
- public void remove(int sysKey) {
+ @Override
+ public void remove(int sysKey) {
Integer sysKeyObj = new Integer(sysKey);
if (!openItems.containsKey(sysKeyObj)) return;
- EntityDetails tabToClose = (EntityDetails)openItems.get(sysKeyObj);
+ EntityDetails tabToClose = openItems.get(sysKeyObj);
tabbedPane.remove(tabToClose);
tabToClose.discardTabs();
openItems.remove(sysKeyObj);
}
-
+
public void closeAll(boolean keepOpen) {
ArrayList<Integer> toRemove = new ArrayList<Integer>();
- for (Iterator iter = openItems.keySet().iterator(); iter.hasNext();) {
- Integer element = (Integer) iter.next();
+ for (Integer element : openItems.keySet()) {
if (keepOpen && openItems.get(element).equals(tabbedPane.getSelectedComponent())) continue;
toRemove.add(element);
}
- for (Iterator iter = toRemove.iterator(); iter.hasNext();) {
- Integer element = (Integer) iter.next();
+ for (Integer element : toRemove) {
remove(element.intValue());
}
}
diff --git a/source/com/c2kernel/gui/LoginBox.java b/source/com/c2kernel/gui/LoginBox.java index f813cef..415469b 100755..100644 --- a/source/com/c2kernel/gui/LoginBox.java +++ b/source/com/c2kernel/gui/LoginBox.java @@ -8,11 +8,23 @@ package com.c2kernel.gui; * @author not attributable
* @version 1.0
*/
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
import javax.swing.border.EmptyBorder;
import com.c2kernel.common.InvalidDataException;
@@ -150,7 +162,7 @@ public class LoginBox extends JFrame { OK.setText(Language.translate("OK"));
OK.addActionListener(new Frame2_OK_actionAdapter(this));
OK.setPreferredSize(new Dimension(80,30));
-
+
Cancel.setActionCommand("Cancel");
Cancel.setText(Language.translate("Cancel"));
Cancel.addActionListener(new Frame2_Cancel_actionAdapter(this));
@@ -183,7 +195,7 @@ public class LoginBox extends JFrame { c.weightx=0;
c.weighty=1;
getContentPane().add(passwordLabel,c);
-
+
initBasicConstraints(c,3,1,1,1);
c.anchor=GridBagConstraints.SOUTH;
c.fill = GridBagConstraints.HORIZONTAL;
@@ -225,7 +237,7 @@ public class LoginBox extends JFrame { msgPane.add(errorLabel);
msgPane.add(Box.createGlue());
getContentPane().add(msgPane,c);
-
+
((JPanel)getContentPane()).setBorder(new EmptyBorder(0,0,0,5));
pack();
Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
@@ -284,7 +296,8 @@ class Frame2_Cancel_actionAdapter implements java.awt.event.ActionListener { Frame2_Cancel_actionAdapter(LoginBox adaptee) {
this.adaptee = adaptee;
}
- public void actionPerformed(ActionEvent e) {
+ @Override
+public void actionPerformed(ActionEvent e) {
adaptee.Cancel_actionPerformed(e);
}
}
@@ -295,7 +308,8 @@ class Frame2_OK_actionAdapter implements java.awt.event.ActionListener { Frame2_OK_actionAdapter(LoginBox adaptee) {
this.adaptee = adaptee;
}
- public void actionPerformed(ActionEvent e) {
+ @Override
+public void actionPerformed(ActionEvent e) {
adaptee.OK_actionPerformed(e);
}
}
@@ -306,7 +320,8 @@ class LoginBox_this_keyAdapter extends java.awt.event.KeyAdapter { LoginBox_this_keyAdapter(LoginBox adaptee) {
this.adaptee = adaptee;
}
- public void keyPressed(KeyEvent e) {
+ @Override
+public void keyPressed(KeyEvent e) {
adaptee.this_keyPressed(e);
}
}
\ No newline at end of file diff --git a/source/com/c2kernel/gui/Main.java b/source/com/c2kernel/gui/Main.java index 4c77d63..5a9209e 100755..100644 --- a/source/com/c2kernel/gui/Main.java +++ b/source/com/c2kernel/gui/Main.java @@ -20,7 +20,7 @@ public class Main extends StandardClient Logger.initConsole("GUI");
MainFrame client = new MainFrame();
client.showLogin();
-
+
}
catch( Exception ex )
{
diff --git a/source/com/c2kernel/gui/MainFrame.java b/source/com/c2kernel/gui/MainFrame.java index e561f1f..589e0b4 100644 --- a/source/com/c2kernel/gui/MainFrame.java +++ b/source/com/c2kernel/gui/MainFrame.java @@ -14,10 +14,10 @@ import java.net.URL; import java.util.Properties;
import java.util.StringTokenizer;
-import javax.swing.*;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSplitPane;
@@ -53,15 +53,17 @@ public class MainFrame extends javax.swing.JFrame { public static boolean isAdmin;
int splitPanePos;
public static final JFileChooser xmlChooser;
-
+
static {
xmlChooser = new JFileChooser();
xmlChooser.addChoosableFileFilter(
new javax.swing.filechooser.FileFilter() {
- public String getDescription() {
+ @Override
+ public String getDescription() {
return "XML Files";
}
- public boolean accept(File f) {
+ @Override
+ public boolean accept(File f) {
if (f.isDirectory() || (f.isFile() && f.getName().endsWith(".xml"))) {
return true;
}
@@ -72,7 +74,7 @@ public class MainFrame extends javax.swing.JFrame { /** Creates new gui client for Cristal2 */
public MainFrame() {
-
+
// Load gui preferences
try {
FileInputStream prefsfile =
@@ -82,7 +84,7 @@ public class MainFrame extends javax.swing.JFrame { } catch (IOException e) {
Logger.msg(2, "Creating new preference file");
}
-
+
// set look & feel from pref
try {
String lf = getPref("Style", null);
@@ -92,9 +94,9 @@ public class MainFrame extends javax.swing.JFrame { SwingUtilities.updateComponentTreeUI(this);
} catch (Exception e) {
e.printStackTrace();
- }
+ }
}
-
+
public void showLogin() {
// Log in
logoURL = Gateway.getProperty("Logo");
@@ -108,7 +110,7 @@ public class MainFrame extends javax.swing.JFrame { } catch (java.net.MalformedURLException m) {
imageHolder = Resource.getImageResource(logoURL);
}
-
+
LoginBox login =
new LoginBox(
5,
@@ -116,19 +118,19 @@ public class MainFrame extends javax.swing.JFrame { getPref("lastUser."+Gateway.getCentreId(), null),
bottomMessage,
imageHolder, this);
-
+
login.setVisible(true);
}
-
+
public void mainFrameShow() {
prefs.setProperty("lastUser."+Gateway.getCentreId(), userAgent.getName());
isAdmin = userAgent.getPath().hasRole("Admin");
GridBagLayout gridbag = new GridBagLayout();
getContentPane().setLayout(gridbag);
-
+
this.setTitle(
userAgent.getName()+"@"+Gateway.getProperty("Name") + " - " + Language.translate("Cristal 2"));
-
+
String iconFile = Gateway.getProperty("AppIcon");
if (iconFile != null)
this.setIconImage(Resource.getImageResource(iconFile).getImage());
@@ -137,7 +139,8 @@ public class MainFrame extends javax.swing.JFrame { Resource.getImageResource("loading.gif");
// close listener
addWindowListener(new java.awt.event.WindowAdapter() {
- public void windowClosing(java.awt.event.WindowEvent evt) {
+ @Override
+ public void windowClosing(java.awt.event.WindowEvent evt) {
exitForm();
}
});
@@ -167,7 +170,7 @@ public class MainFrame extends javax.swing.JFrame { getContentPane().add(itemFinder);
// register the browser as the key consumer
itemFinder.setDefaultConsumer(treeBrowser);
-
+
c.gridy++;
c.weightx = 1.0;
c.weighty = 1.0;
@@ -266,13 +269,13 @@ public class MainFrame extends javax.swing.JFrame { getSplitPanel().validate();
}
- public static JComboBox getExecutionPlugins() {
+ public static JComboBox<Executor> getExecutionPlugins() {
JComboBox<Executor> plugins = new JComboBox<Executor>();
// create execution selector
Executor defaultExecutor = new DefaultExecutor();
plugins.addItem(defaultExecutor);
plugins.setSelectedIndex(0);
-
+
// load execution plugins
String pluginList = Gateway.getProperty("Executors");
if (pluginList != null) {
@@ -280,9 +283,9 @@ public class MainFrame extends javax.swing.JFrame { while (tok.hasMoreTokens()) {
String pluginName = tok.nextToken();
try {
- Class pluginClass = Class.forName(pluginName);
- Executor domainExecutor = (Executor)pluginClass.newInstance();
- plugins.addItem(domainExecutor);
+ Class<?> pluginClass = Class.forName(pluginName);
+ Executor domainExecutor = (Executor)pluginClass.newInstance();
+ plugins.addItem(domainExecutor);
} catch (Exception ex) {
Logger.error("Could not load the executor plugin "+pluginName);
}
diff --git a/source/com/c2kernel/gui/MenuBuilder.java b/source/com/c2kernel/gui/MenuBuilder.java index bf27287..6d1bfbc 100644 --- a/source/com/c2kernel/gui/MenuBuilder.java +++ b/source/com/c2kernel/gui/MenuBuilder.java @@ -5,7 +5,22 @@ import java.awt.event.ItemListener; import java.util.Enumeration;
import java.util.HashMap;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.Icon;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import javax.swing.text.html.HTMLEditorKit;
@@ -34,11 +49,11 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene protected JMenu prefMenu;
protected JMenu helpMenu;
protected HashMap<String, JMenu> availableMenus = new HashMap<String, JMenu>();
-
+
public MenuBuilder()
{}
-
- /** Creates new DynamicMenuBuilder */
+
+ /** Creates new DynamicMenuBuilder */
public MenuBuilder(MainFrame parentFrame)
{
myParentFrame = parentFrame;
@@ -63,14 +78,14 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene addServerConsoles();
ButtonGroup styleButtonGroup = new ButtonGroup();
- for (int i = 0; i < availableViews.length; i++)
- addMenuItem(availableViews[i].getName(), "style", styleButtonGroup, 0);
-
+ for (LookAndFeelInfo availableView : availableViews)
+ addMenuItem(availableView.getName(), "style", styleButtonGroup, 0);
+
addMenuItem(Language.translate("Tree Browser"), "preferences", null, MainFrame.getPref("ShowTree", "true").equals("true")?2:1);
addMenuItem(Language.translate("Outcome Field Help"), "preferences", null, MainFrame.getPref("ShowHelp", "true").equals("true")?2:1);
addMenuItem(Language.translate("Graph Properties"), "preferences", null, MainFrame.getPref("ShowProps", "true").equals("true")?2:1);
addMenuItem(Language.translate("About"), "help", null, 0);
-
+
add(fileMenu);
add(consoleMenu);
add(styleMenu);
@@ -78,10 +93,10 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene add(helpMenu);
}
/**
- *
+ *
*/
private void addServerConsoles() {
- Enumeration servers = Gateway.getLDAPLookup().searchEntities(new DomainPath("/servers"));
+ Enumeration<?> servers = Gateway.getLDAPLookup().searchEntities(new DomainPath("/servers"));
while(servers.hasMoreElements()) {
Path thisServerPath = (Path)servers.nextElement();
try {
@@ -117,7 +132,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene myItem = new JCheckBoxMenuItem(itemName, checkBox == 2);
}
myItem.addActionListener(this);
- JMenu myMenu = (JMenu) availableMenus.get(menuName);
+ JMenu myMenu = availableMenus.get(menuName);
myMenu.add(myItem);
}
}
@@ -133,6 +148,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene return -1;
}
//listens for events performed on the menu items
+ @Override
public void actionPerformed(java.awt.event.ActionEvent e)
{
String s = e.getActionCommand();
@@ -180,7 +196,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene {
Logger.error(ex);
}
- }
+ }
else
Logger.msg(1, "MenuBuilder.actionPerformed() - No action associated with the event received");
}
@@ -189,7 +205,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene {
JOptionPane myPane = new JOptionPane();
Box about = Box.createVerticalBox();
-
+
String aboutInfo;
try
{
@@ -201,7 +217,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene }
JLabel title = new JLabel(aboutInfo);
about.add(title);
-
+
about.add(new JLabel("Domain version: "+Resource.getDomainVersion()));
about.add(new JLabel("Kernel version: "+Resource.getKernelVersion()));
// get license info
@@ -210,7 +226,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene if (domlictxt != null)
lictxt.append(domlictxt);
lictxt.append(Resource.getTextResource("textFiles/license.html"));
-
+
JEditorPane license = new JEditorPane();
license.setEditable(false);
license.setEditorKit(new HTMLEditorKit());
@@ -220,7 +236,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene JScrollPane scroll = new JScrollPane(license);
scroll.setPreferredSize(new Dimension(300,200));
license.setCaretPosition(0);
-
+
about.add(scroll);
myPane.setMessage(about);
myPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
@@ -232,7 +248,8 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene dialog.setVisible(true);
}
- public void hyperlinkUpdate(HyperlinkEvent e) {
+ @Override
+public void hyperlinkUpdate(HyperlinkEvent e) {
try {
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler "+e.getURL().toString());
@@ -240,7 +257,8 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene Logger.exceptionDialog(ex);
}
}
-
+
+ @Override
public void itemStateChanged(java.awt.event.ItemEvent e)
{
}
diff --git a/source/com/c2kernel/gui/TreeBrowser.java b/source/com/c2kernel/gui/TreeBrowser.java index ccee681..72cf738 100755..100644 --- a/source/com/c2kernel/gui/TreeBrowser.java +++ b/source/com/c2kernel/gui/TreeBrowser.java @@ -5,10 +5,19 @@ import java.awt.Dimension; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.ToolTipManager;
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeExpansionListener;
-import javax.swing.tree.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
import com.c2kernel.gui.data.Node;
import com.c2kernel.gui.data.NodeEntity;
@@ -20,7 +29,7 @@ import com.c2kernel.utils.Logger; * @version $Revision: 1.31 $ $Date: 2006/01/17 07:49:44 $
* @author $Author: abranson $
*/
-
+
// must put in top level list of loaded items, so we don't have duplicates
public class TreeBrowser extends JPanel implements DomainKeyConsumer
{
@@ -39,10 +48,12 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer tree.setToggleClickCount(3); // need three clicks to expand a branch
tree.addTreeExpansionListener(
new TreeExpansionListener() {
- public void treeCollapsed(TreeExpansionEvent e) {
+ @Override
+ public void treeCollapsed(TreeExpansionEvent e) {
//REVISIT: possible reaping here if things are getting heavy
}
- public void treeExpanded(TreeExpansionEvent e) {
+ @Override
+ public void treeExpanded(TreeExpansionEvent e) {
TreePath p = e.getPath();
// find the clicked tree node
DefaultMutableTreeNode nodeClicked = (DefaultMutableTreeNode)p.getLastPathComponent();
@@ -71,7 +82,8 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer loading.start();
}
- public void push(DomainPath target) {
+ @Override
+ public void push(DomainPath target) {
Logger.debug("Opening tree node "+target);
String[] components = target.getPath();
Node currentNode = userRoot;
@@ -109,15 +121,16 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer MainFrame.status.setText("Done");
}
}
-
- public void push(String name) {
+
+ @Override
+ public void push(String name) {
// only interested in real paths
- JOptionPane.showMessageDialog(null, "'"+name+"' was not found.",
+ JOptionPane.showMessageDialog(null, "'"+name+"' was not found.",
"No results", JOptionPane.INFORMATION_MESSAGE);
}
-
- private void dumpPath(TreePath selPath, int logLevel) {
+
+ private static void dumpPath(TreePath selPath, int logLevel) {
if (selPath == null) { Logger.msg(logLevel, "TreeBrowser.dumpPath() - selPath null"); return; }
for (int i =0; i<selPath.getPath().length; i++)
Logger.msg(logLevel, "TreeBrowser.dumpPath() - selPath "+i+" = "+selPath.getPath()[i]);
@@ -127,7 +140,8 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer public ItemRenderer() {
}
- public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf,
+ @Override
+ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf,
int row, boolean hasFocus) {
super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
Object thisLeaf = ((DefaultMutableTreeNode)value).getUserObject();
@@ -146,9 +160,10 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer return this;
}
}
-
+
private class TreeMouseListener extends MouseAdapter {
- public void mousePressed(MouseEvent e) {
+ @Override
+ public void mousePressed(MouseEvent e) {
if (e.isPopupTrigger())
showPopup(e);
else {
@@ -168,7 +183,8 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer }
}
}
- public void mouseReleased(MouseEvent e) {
+ @Override
+ public void mouseReleased(MouseEvent e) {
if (e.isPopupTrigger()) {
showPopup(e);
}
@@ -190,7 +206,7 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer source = nodeClicked.getUserObject(); // fetch its nodeItem
}
catch (Exception ex) { } // Not a node that was clicked on
-
+
return source;
}
}
diff --git a/source/com/c2kernel/gui/data/Node.java b/source/com/c2kernel/gui/data/Node.java index 79eb3ad..6556b3a 100644 --- a/source/com/c2kernel/gui/data/Node.java +++ b/source/com/c2kernel/gui/data/Node.java @@ -42,11 +42,11 @@ public abstract class Node implements Runnable { public Node() {
}
-
+
protected void createTreeNode() {
this.treeNode = new DefaultMutableTreeNode(this);
}
-
+
public Node(Path path, EntityTabManager desktop) {
this.binding = path;
this.desktop = desktop;
@@ -58,7 +58,7 @@ public abstract class Node implements Runnable { else
this.name = Gateway.getProperty("Name");
}
-
+
public EntityTabManager getDesktop() {
return desktop;
}
@@ -72,7 +72,7 @@ public abstract class Node implements Runnable { return new NodeItem(path, desktop);
} catch (ObjectNotFoundException ex) {
return new NodeContext(path, desktop);
- }
+ }
}
@@ -107,15 +107,15 @@ public abstract class Node implements Runnable { else {
synchronized (childNodes) {
Node newNode;
- for (Iterator nodes = childNodes.values().iterator(); nodes.hasNext();) {
- newNode = (Node)nodes.next();
+ for (Iterator<Node> nodes = childNodes.values().iterator(); nodes.hasNext();) {
+ newNode = nodes.next();
Logger.msg("subscribeNode target.add("+newNode.name+")");
target.add(newNode);
}
}
}
}
-
+
public void loadMore() {
Thread loading = new Thread(this);
loading.start();
@@ -128,62 +128,58 @@ public abstract class Node implements Runnable { public void add(Node newNode) {
synchronized(childNodes) {
childNodes.put(newNode.getPath(), newNode);
- for (Iterator e = subscribers.iterator(); e.hasNext();) {
- NodeSubscriber thisSub = (NodeSubscriber)e.next();
-
+ for (NodeSubscriber thisSub : subscribers) {
thisSub.add(newNode);
}
}
}
-
+
public void remove(Path oldPath) {
synchronized(childNodes) {
childNodes.remove(oldPath);
- for (Iterator e = subscribers.iterator(); e.hasNext();) {
- NodeSubscriber thisSub = (NodeSubscriber)e.next();
+ for (NodeSubscriber thisSub : subscribers) {
thisSub.remove(oldPath);
}
}
}
-
+
public void removeAllChildren() {
synchronized(childNodes) {
- Path thisPath;
while (childNodes.keySet().iterator().hasNext()) {
- remove((Path)childNodes.keySet().iterator().next());
+ remove(childNodes.keySet().iterator().next());
}
}
}
public Node getChildNode(Path itsPath) {
- for (Iterator i = childNodes.keySet().iterator(); i.hasNext();) {
- Object next = i.next();
- if ( next.equals(itsPath) ) return (Node)childNodes.get(next);
+ for (Iterator<Path> i = childNodes.keySet().iterator(); i.hasNext();) {
+ Object next = i.next();
+ if ( next.equals(itsPath) ) return childNodes.get(next);
}
return null;
}
// end of current batch
public void end(boolean more) {
- for (Iterator e = subscribers.iterator(); e.hasNext();) {
- NodeSubscriber thisSub = (NodeSubscriber)e.next();
+ for (NodeSubscriber thisSub : subscribers) {
thisSub.end(more);
}
}
- public void run() {
+ @Override
+ public void run() {
Thread.currentThread().setName("Node Loader: "+name);
loadChildren();
}
public abstract void loadChildren();
-
+
public void refresh() {
removeAllChildren();
loadChildren();
}
-
+
// Getters and Setters
public int getSysKey() { return sysKey; }
@@ -198,8 +194,9 @@ public abstract class Node implements Runnable { public Path getPath() { return binding; }
public DynamicTreeBuilder getTreeBuilder() { return loader; }
-
- public String toString() {
+
+ @Override
+ public String toString() {
if (this.name.length() > 0) {
return this.name;
}
@@ -214,7 +211,7 @@ public abstract class Node implements Runnable { public String getIconName() {
return iconName;
}
-
+
public void setIcon(String icon) {
iconName = icon;
this.icon = Resource.getImageResource("typeicons/"+icon+"_16.png");
@@ -224,6 +221,7 @@ public abstract class Node implements Runnable { JPopupMenu popup = new JPopupMenu();
JMenuItem menuItem = new JMenuItem(Language.translate("Refresh"));
menuItem.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
if (isExpandable) refresh();
}
diff --git a/source/com/c2kernel/gui/data/NodeAgent.java b/source/com/c2kernel/gui/data/NodeAgent.java index 138b576..9f6cdad 100644 --- a/source/com/c2kernel/gui/data/NodeAgent.java +++ b/source/com/c2kernel/gui/data/NodeAgent.java @@ -18,14 +18,16 @@ public class NodeAgent extends NodeEntity { super(path, desktop);
}
- public void loadChildren() {
+ @Override
+ public void loadChildren() {
}
-
- public ArrayList<String> getTabs() {
+
+ @Override
+ public ArrayList<String> getTabs() {
ArrayList<String> requiredTabs = super.getTabs();
requiredTabs.add("AgentProperties");
requiredTabs.add("JobList");
- return requiredTabs;
- }
+ return requiredTabs;
+ }
}
diff --git a/source/com/c2kernel/gui/data/NodeCollection.java b/source/com/c2kernel/gui/data/NodeCollection.java index 3b02098..f55f8cd 100755..100644 --- a/source/com/c2kernel/gui/data/NodeCollection.java +++ b/source/com/c2kernel/gui/data/NodeCollection.java @@ -16,7 +16,7 @@ import com.c2kernel.utils.Logger; public class NodeCollection extends Node {
ItemProxy parent;
- Parent2ChildCollection thisCollection;
+ Parent2ChildCollection<?> thisCollection;
String path;
public NodeCollection(ItemProxy parent, String name, EntityTabManager desktop) {
@@ -28,19 +28,20 @@ public class NodeCollection extends Node { this.makeExpandable();
}
- public void loadChildren() {
+ @Override
+ public void loadChildren() {
Logger.msg(8, "NodeCollection::loadChildren()");
try {
- thisCollection = (Parent2ChildCollection)parent.getObject("Collection/"+name);
+ thisCollection = (Parent2ChildCollection<?>)parent.getObject("Collection/"+name);
} catch (ObjectNotFoundException ex) {
end(false);
- return;
+ return;
}
-
+
this.type = thisCollection.getClass().getName();
int lastDot = this.type.lastIndexOf('.');
if (lastDot > -1) this.type = this.type.substring(lastDot+1);
- ArrayList collectionMembers = thisCollection.getMembers().list;
+ ArrayList<?> collectionMembers = thisCollection.getMembers().list;
for (int i=0; i<collectionMembers.size(); i++)
{
CollectionMember aMember = (CollectionMember)collectionMembers.get(i);
@@ -59,8 +60,9 @@ public class NodeCollection extends Node { end(false);
}
-
- public DefaultMutableTreeNode getTreeNode() {
+
+ @Override
+ public DefaultMutableTreeNode getTreeNode() {
return treeNode;
}
}
diff --git a/source/com/c2kernel/gui/data/NodeContext.java b/source/com/c2kernel/gui/data/NodeContext.java index 6e2bc75..9240af4 100755..100644 --- a/source/com/c2kernel/gui/data/NodeContext.java +++ b/source/com/c2kernel/gui/data/NodeContext.java @@ -11,7 +11,7 @@ import com.c2kernel.utils.Logger; public class NodeContext extends Node implements DomainPathSubscriber {
- Enumeration children;
+ Enumeration<?> children;
public NodeContext(Path path, EntityTabManager desktop) {
super(path, desktop);
@@ -22,7 +22,8 @@ public class NodeContext extends Node implements DomainPathSubscriber { }
- public void loadChildren() {
+ @Override
+ public void loadChildren() {
if (children == null) {
Gateway.getProxyManager().subscribeTree(this, (DomainPath)binding);
children = binding.getChildren();
@@ -38,16 +39,19 @@ public class NodeContext extends Node implements DomainPathSubscriber { }
end(children.hasMoreElements());
}
-
- public void pathAdded(DomainPath path) {
+
+ @Override
+ public void pathAdded(DomainPath path) {
add(newNode(path));
}
- public void refresh() {
+ @Override
+ public void refresh() {
children = null;
super.refresh();
}
- public void pathRemoved(DomainPath path) {
+ @Override
+ public void pathRemoved(DomainPath path) {
remove(path);
}
diff --git a/source/com/c2kernel/gui/data/NodeEntity.java b/source/com/c2kernel/gui/data/NodeEntity.java index 8c05afd..cce4f68 100644 --- a/source/com/c2kernel/gui/data/NodeEntity.java +++ b/source/com/c2kernel/gui/data/NodeEntity.java @@ -56,11 +56,13 @@ public abstract class NodeEntity extends Node { /**
*
*/
- public JPopupMenu getPopupMenu() {
+ @Override
+ public JPopupMenu getPopupMenu() {
JPopupMenu popup = super.getPopupMenu();
JMenuItem openItem = new JMenuItem(Language.translate("Open"));
openItem.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
openItem();
}
});
@@ -68,11 +70,11 @@ public abstract class NodeEntity extends Node { popup.add(openItem);
return popup;
}
-
+
public void openItem() {
desktop.add(this);
}
-
+
public ArrayList<String> getTabs() {
ArrayList<String> requiredTabs = new ArrayList<String>();
return requiredTabs;
diff --git a/source/com/c2kernel/gui/data/NodeItem.java b/source/com/c2kernel/gui/data/NodeItem.java index 84cba97..30f7ce3 100644 --- a/source/com/c2kernel/gui/data/NodeItem.java +++ b/source/com/c2kernel/gui/data/NodeItem.java @@ -3,7 +3,6 @@ package com.c2kernel.gui.data; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.StringTokenizer;
import javax.swing.JMenuItem;
@@ -31,10 +30,11 @@ public class NodeItem extends NodeEntity { makeExpandable();
} catch (Exception e) {
Logger.error(e);
- }
+ }
}
- public void loadChildren() {
+ @Override
+ public void loadChildren() {
try {
String collections = myEntity.queryData("Collection/all");
StringTokenizer tok = new StringTokenizer(collections, ",");
@@ -47,16 +47,16 @@ public class NodeItem extends NodeEntity { Logger.error(e);
}
}
-
+
+ @Override
public JPopupMenu getPopupMenu() {
JPopupMenu popup = super.getPopupMenu();
popup.addSeparator();
try {
- ArrayList jobList = ((ItemProxy)myEntity).getJobList(MainFrame.userAgent);
+ ArrayList<Job> jobList = ((ItemProxy)myEntity).getJobList(MainFrame.userAgent);
ArrayList<String> already = new ArrayList<String>();
if (jobList.size() > 0) {
- for (Iterator e = jobList.iterator(); e.hasNext();) {
- Job thisJob = (Job)e.next();
+ for (Job thisJob : jobList) {
String stepName = thisJob.getStepName();
if (already.contains(stepName))
continue;
@@ -64,12 +64,13 @@ public class NodeItem extends NodeEntity { JMenuItem menuItem = new JMenuItem(stepName);
menuItem.setActionCommand(stepName);
menuItem.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
execute(e.getActionCommand());
}
});
popup.add(menuItem);
-
+
}
}
else {
@@ -85,13 +86,14 @@ public class NodeItem extends NodeEntity { return popup;
}
-
+
public void execute(String stepName) {
EntityDetails thisDetail = desktop.add(this);
thisDetail.runCommand("Execution", stepName);
}
- public ArrayList<String> getTabs() {
+ @Override
+ public ArrayList<String> getTabs() {
ArrayList<String> requiredTabs = super.getTabs();
requiredTabs.add("Properties");
@@ -99,12 +101,12 @@ public class NodeItem extends NodeEntity { String collNames = myEntity.queryData(ClusterStorage.COLLECTION+"/all");
if (collNames.length() > 0)
requiredTabs.add("Collection");
- } catch (Exception e) { }
+ } catch (Exception e) { }
requiredTabs.add("Execution");
requiredTabs.add("History");
requiredTabs.add("Viewpoint");
requiredTabs.add("Workflow");
return requiredTabs;
-
+
}
}
diff --git a/source/com/c2kernel/gui/data/NodeSubscriber.java b/source/com/c2kernel/gui/data/NodeSubscriber.java index ae2ab44..70af660 100755..100644 --- a/source/com/c2kernel/gui/data/NodeSubscriber.java +++ b/source/com/c2kernel/gui/data/NodeSubscriber.java @@ -8,6 +8,6 @@ public interface NodeSubscriber { public void add(Node newNode);
public void remove(Path path);
-
+
public void end(boolean more);
}
diff --git a/source/com/c2kernel/gui/tabs/AgentPropertiesPane.java b/source/com/c2kernel/gui/tabs/AgentPropertiesPane.java index b859c44..f0ae533 100755..100644 --- a/source/com/c2kernel/gui/tabs/AgentPropertiesPane.java +++ b/source/com/c2kernel/gui/tabs/AgentPropertiesPane.java @@ -22,7 +22,7 @@ public class AgentPropertiesPane extends EntityTabPane { JTextField newPassword;
JTextField newPasswordConfirm;
JButton changePassword;
-
+
public AgentPropertiesPane() {
super("Properties", "Agent Details");
initPanel();
@@ -38,13 +38,14 @@ public class AgentPropertiesPane extends EntityTabPane { c.gridy++;
gridbag.setConstraints(roleScroll, c);
add(roleScroll);
-
- JLabel passHeader = new JLabel("Change password");
-
+
+ //JLabel passHeader = new JLabel("Change password");
+ //TODO: Finish agent admin page
}
-
- public void run() {
-
+
+ @Override
+ public void run() {
+
}
}
diff --git a/source/com/c2kernel/gui/tabs/CloseTabIcon.java b/source/com/c2kernel/gui/tabs/CloseTabIcon.java index ca2bf0b..a117df4 100755..100644 --- a/source/com/c2kernel/gui/tabs/CloseTabIcon.java +++ b/source/com/c2kernel/gui/tabs/CloseTabIcon.java @@ -29,6 +29,7 @@ class CloseTabIcon implements Icon width = 16;
height = 16;
}
+ @Override
public void paintIcon(Component c, Graphics g, int x, int y)
{
this.x_pos = x;
@@ -52,10 +53,12 @@ class CloseTabIcon implements Icon fileIcon.paintIcon(c, g, x + width, y_p);
}
}
+ @Override
public int getIconWidth()
{
return width + (fileIcon != null ? fileIcon.getIconWidth() : 0);
}
+ @Override
public int getIconHeight()
{
return height;
diff --git a/source/com/c2kernel/gui/tabs/CollectionPane.java b/source/com/c2kernel/gui/tabs/CollectionPane.java index 92492fc..7511a97 100755..100644 --- a/source/com/c2kernel/gui/tabs/CollectionPane.java +++ b/source/com/c2kernel/gui/tabs/CollectionPane.java @@ -6,9 +6,9 @@ import javax.swing.JTabbedPane; import com.c2kernel.collection.Aggregation;
import com.c2kernel.collection.Collection;
import com.c2kernel.collection.Dependency;
-import com.c2kernel.entity.C2KLocalObject;
import com.c2kernel.entity.proxy.EntityProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
+import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.gui.tabs.collection.AggregationView;
import com.c2kernel.gui.tabs.collection.CollectionView;
import com.c2kernel.gui.tabs.collection.DependencyView;
@@ -19,24 +19,20 @@ import com.c2kernel.utils.Logger; * @version $Revision: 1.36 $ $Date: 2005/10/06 06:51:15 $
* @author $Author: abranson $
*/
-public class CollectionPane extends EntityTabPane implements EntityProxyObserver
+public class CollectionPane extends EntityTabPane implements EntityProxyObserver<Collection<?>>
{
- JTabbedPane collTabs;
-
+ JTabbedPane collTabs;
+
public CollectionPane()
{
super("Collection", "Item Collection");
createLayout();
}
- public void add(C2KLocalObject contents)
+ @Override
+ public void add(Collection<?> contents)
{
Logger.msg(5, "Got "+contents.getName()+": "+contents.getClass().getName());
- if (!(contents instanceof Collection))
- {
- // ignore member control objects
- return;
- }
Logger.msg(7, "Looking for existing "+contents.getName());
CollectionView thisCollView = findTabForCollName(contents.getName());
if (thisCollView == null){
@@ -52,14 +48,15 @@ public class CollectionPane extends EntityTabPane implements EntityProxyObserver thisCollView.setItem((ItemProxy)sourceEntity.getEntity());
collTabs.add(contents.getName(), thisCollView);
}
- thisCollView.setCollection((Collection)contents);
+ thisCollView.setCollection(contents);
}
- public void remove(String id)
+ @Override
+ public void remove(String id)
{
-
+
}
-
+
private CollectionView findTabForCollName(String collName) {
CollectionView thisCollView = null;
for (int i = 0; i < collTabs.getTabCount(); i++) {
@@ -85,16 +82,24 @@ public class CollectionPane extends EntityTabPane implements EntityProxyObserver add(collTabs);
}
+ @Override
public void run()
{
Thread.currentThread().setName("Collection Loader");
- sourceEntity.getEntity().subscribe(this, ClusterStorage.COLLECTION, true);
+ sourceEntity.getEntity().subscribe(new MemberSubscription<Collection<?>>(this, ClusterStorage.COLLECTION, true));
}
-
+
+ @Override
public void reload()
{
Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.COLLECTION);
collTabs.removeAll();
initForEntity(sourceEntity);
}
+
+ @Override
+ public void control(String control, String msg) {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/source/com/c2kernel/gui/tabs/DomainPathAdmin.java b/source/com/c2kernel/gui/tabs/DomainPathAdmin.java index 2e81121..408a32c 100644 --- a/source/com/c2kernel/gui/tabs/DomainPathAdmin.java +++ b/source/com/c2kernel/gui/tabs/DomainPathAdmin.java @@ -5,7 +5,12 @@ import java.awt.event.ActionListener; import java.util.ArrayList;
import java.util.Enumeration;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
import javax.swing.table.AbstractTableModel;
import com.c2kernel.entity.proxy.ItemProxy;
@@ -30,10 +35,10 @@ public class DomainPathAdmin extends Box implements ActionListener { DomainPathTableModel model;
JButton addButton;
JButton removeButton;
-
+
public DomainPathAdmin() {
super(BoxLayout.Y_AXIS);
-
+
model = new DomainPathTableModel(this);
table = new JTable(model);
add(new JScrollPane(table));
@@ -47,19 +52,20 @@ public class DomainPathAdmin extends Box implements ActionListener { buttonBox.add(removeButton);
buttonBox.add(Box.createHorizontalGlue());
add(buttonBox);
-
+
addButton.setActionCommand("add");
addButton.addActionListener(this);
removeButton.setActionCommand("remove");
- removeButton.addActionListener(this);
+ removeButton.addActionListener(this);
}
-
+
public void setEntity(ItemProxy entity) {
this.entity = entity;
model.loadPaths();
}
- public void actionPerformed(ActionEvent e) {
+ @Override
+public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals("add")) {
String newPath = JOptionPane.showInputDialog(this, "Enter new path,", "Add Domain Path", JOptionPane.PLAIN_MESSAGE);
addDomainPath(new DomainPath(newPath));
@@ -73,23 +79,23 @@ public class DomainPathAdmin extends Box implements ActionListener { }
}
}
-
+
public boolean removeDomainPath(DomainPath oldPath) {
return alterDomainPath(oldPath, "Remove");
}
-
+
public boolean addDomainPath(DomainPath newPath) {
return alterDomainPath(newPath, "Add");
- }
-
+ }
+
public boolean alterDomainPath(DomainPath path, String action) {
- if (JOptionPane.showConfirmDialog(this,
- action+" "+path+"?",
- action+" Domain Path",
+ if (JOptionPane.showConfirmDialog(this,
+ action+" "+path+"?",
+ action+" Domain Path",
JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION)
return false;
-
+
String[] params = new String[1];
params[0] = path.toString();
try {
@@ -100,7 +106,7 @@ public class DomainPathAdmin extends Box implements ActionListener { }
return true;
}
-
+
private class DomainPathTableModel extends AbstractTableModel {
ArrayList<DomainPath> domPaths;
DomainPathAdmin parent;
@@ -108,10 +114,10 @@ public class DomainPathAdmin extends Box implements ActionListener { this.parent = parent;
domPaths = new ArrayList<DomainPath>();
}
-
+
public void loadPaths() {
domPaths.clear();
- for (Enumeration currentPaths = Gateway.getLDAPLookup().search(new DomainPath(), entity.getName()); currentPaths.hasMoreElements();) {
+ for (Enumeration<?> currentPaths = Gateway.getLDAPLookup().search(new DomainPath(), entity.getName()); currentPaths.hasMoreElements();) {
DomainPath thisPath = (DomainPath)currentPaths.nextElement();
if (thisPath.getSysKey() == entity.getSystemKey())
domPaths.add(thisPath);
@@ -120,10 +126,11 @@ public class DomainPathAdmin extends Box implements ActionListener { }
public DomainPath getPath(int rowIndex) {
- return (DomainPath)domPaths.get(rowIndex);
+ return domPaths.get(rowIndex);
}
- public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
- DomainPath oldPath = (DomainPath)domPaths.get(rowIndex);
+ @Override
+ public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+ DomainPath oldPath = domPaths.get(rowIndex);
DomainPath newPath = new DomainPath((String)aValue);
boolean success = parent.addDomainPath(newPath);
if (success)
@@ -133,28 +140,34 @@ public class DomainPathAdmin extends Box implements ActionListener { fireTableDataChanged();
}
}
-
- public Class<?> getColumnClass(int columnIndex) {
+
+ @Override
+ public Class<?> getColumnClass(int columnIndex) {
return String.class;
}
- public int getColumnCount() {
+ @Override
+ public int getColumnCount() {
return 1;
}
- public String getColumnName(int column) {
+ @Override
+ public String getColumnName(int column) {
return "Path";
}
- public int getRowCount() {
+ @Override
+ public int getRowCount() {
return domPaths.size();
}
- public Object getValueAt(int rowIndex, int columnIndex) {
+ @Override
+ public Object getValueAt(int rowIndex, int columnIndex) {
return domPaths.get(rowIndex).toString();
}
- public boolean isCellEditable(int rowIndex, int columnIndex) {
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
return true;
}
}
diff --git a/source/com/c2kernel/gui/tabs/EntityTabPane.java b/source/com/c2kernel/gui/tabs/EntityTabPane.java index f6fae14..5a374dd 100755..100644 --- a/source/com/c2kernel/gui/tabs/EntityTabPane.java +++ b/source/com/c2kernel/gui/tabs/EntityTabPane.java @@ -4,12 +4,23 @@ * Created on March 22, 2001, 11:39 AM
*/
package com.c2kernel.gui.tabs;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
+import javax.swing.SwingConstants;
import com.c2kernel.entity.proxy.EntityProxyObserver;
import com.c2kernel.gui.EntityDetails;
@@ -93,10 +104,11 @@ public class EntityTabPane extends JPanel implements Runnable { refreshButton.setToolTipText(Language.translate("Refresh"));
refreshButton.setMargin(new Insets(0, 0, 0, 0));
refreshButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- setCursor(new Cursor(Cursor.WAIT_CURSOR));
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ setCursor(new Cursor(Cursor.WAIT_CURSOR));
reload();
- setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+ setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
}
});
String defaultStartTab = MainFrame.getPref("DefaultStartTab", "Properties");
@@ -108,7 +120,8 @@ public class EntityTabPane extends JPanel implements Runnable { defaultStart.setSelected(tabName.equals(defaultStartTab));
defaultStart.setActionCommand(tabName);
defaultStart.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
if (((JToggleButton)e.getSource()).isSelected())
MainFrame.setPref("DefaultStartTab", e.getActionCommand());
}
@@ -122,11 +135,12 @@ public class EntityTabPane extends JPanel implements Runnable { this.add(titleBox);
}
public void initForEntity(NodeEntity sourceEntity) {
- this.sourceEntity = sourceEntity;
+ this.sourceEntity = sourceEntity;
Thread loader = new Thread(this);
loader.start();
}
- public void run() {
+ @Override
+ public void run() {
Thread.currentThread().setName("Default Entity Pane Builder");
getGridBagConstraints();
c.gridx = 0;
@@ -145,23 +159,24 @@ public class EntityTabPane extends JPanel implements Runnable { }
public void runCommand(String command) {
}
-
+
public void destroy() {
- if (sourceEntity != null && this instanceof EntityProxyObserver) {
- sourceEntity.getEntity().unsubscribe((EntityProxyObserver)this);
+ if (sourceEntity != null && this instanceof EntityProxyObserver<?>) {
+ sourceEntity.getEntity().unsubscribe((EntityProxyObserver<?>)this);
}
parent = null;
}
-
- protected void finalize() throws Throwable {
+
+ @Override
+ protected void finalize() throws Throwable {
Logger.msg(7, "Reaping "+getClass().getName());
}
-
+
static public OutcomeHandler getOutcomeHandler(String schema, int version) {
String ohClassName = Gateway.getProperty("OutcomeHandler."+schema+"."+version);
try {
if (ohClassName != null && ohClassName.length() > 0) {
- Class ohClass = Class.forName(ohClassName);
+ Class<?> ohClass = Class.forName(ohClassName);
return (OutcomeHandler) ohClass.newInstance();
}
} catch (Exception ex) {
@@ -170,7 +185,7 @@ public class EntityTabPane extends JPanel implements Runnable { ohClassName = Gateway.getProperty("OutcomeHandler.*");
try {
if (ohClassName != null && ohClassName.length() > 0) {
- Class ohClass = Class.forName(ohClassName);
+ Class<?> ohClass = Class.forName(ohClassName);
return (OutcomeHandler) ohClass.newInstance();
}
} catch (Exception ex) {
@@ -178,5 +193,5 @@ public class EntityTabPane extends JPanel implements Runnable { Logger.error(ex);
}
return new OutcomePanel();
- }
+ }
}
diff --git a/source/com/c2kernel/gui/tabs/ExecutionPane.java b/source/com/c2kernel/gui/tabs/ExecutionPane.java index 0685fa9..96b1129 100644 --- a/source/com/c2kernel/gui/tabs/ExecutionPane.java +++ b/source/com/c2kernel/gui/tabs/ExecutionPane.java @@ -7,22 +7,25 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.Iterator;
+
import javax.swing.Box;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import com.c2kernel.entity.C2KLocalObject;
+
import com.c2kernel.entity.agent.Job;
import com.c2kernel.entity.proxy.EntityProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
+import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.gui.tabs.execution.ActivityItem;
import com.c2kernel.gui.tabs.execution.ActivityViewer;
+import com.c2kernel.lifecycle.instance.Workflow;
import com.c2kernel.persistency.ClusterStorage;
import com.c2kernel.utils.Language;
import com.c2kernel.utils.Logger;
-public class ExecutionPane extends EntityTabPane implements EntityProxyObserver {
+public class ExecutionPane extends EntityTabPane implements EntityProxyObserver<Workflow> {
ArrayList<Job> jobList = null;
Object jobLock = new Object();
@@ -47,7 +50,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver c.anchor = GridBagConstraints.CENTER;
c.fill = GridBagConstraints.BOTH;
gridbag.setConstraints(view, c);
-
+
add(view);
// create activity selection box
activityBox.add(new JLabel(Language.translate("Select Activity") + ": "));
@@ -55,16 +58,18 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver activitySelector.setEditable(false);
activityBox.add(activitySelector);
activitySelector.addItemListener(new ItemListener() {
- public void itemStateChanged(ItemEvent selection) {
+ @Override
+ public void itemStateChanged(ItemEvent selection) {
if (selection.getStateChange() == ItemEvent.SELECTED) {
selectActivity(selection.getItem());
}
}
});
}
- public void run() {
+ @Override
+ public void run() {
Thread.currentThread().setName("Execution Pane Builder");
- sourceEntity.getEntity().subscribe(this, ClusterStorage.LIFECYCLE, false);
+ sourceEntity.getEntity().subscribe(new MemberSubscription<Workflow>(this, ClusterStorage.LIFECYCLE, false));
loadJobList();
init = true;
if (autoRun != null) {
@@ -80,8 +85,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver try {
jobList = ((ItemProxy)sourceEntity.getEntity()).getJobList(MainFrame.userAgent);
activitySelector.addItem(emptyAct);
- for (Iterator e = jobList.iterator(); e.hasNext();) {
- Job thisJob = (Job)e.next();
+ for (Job thisJob : jobList) {
Logger.msg(7, "ExecutionPane - loadJobList " + thisJob.isOutcomeUsed() + "|" + thisJob.getSchemaType() + "|" + thisJob.getSchemaVersion() + "|");
ActivityItem newAct = new ActivityItem(thisJob);
if (activities.contains(newAct)) {
@@ -117,7 +121,8 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver revalidate();
updateUI();
}
- public void reload() {
+ @Override
+ public void reload() {
loadJobList();
}
private void addActivity(ActivityItem newAct) {
@@ -145,10 +150,10 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver updateUI();
currentActView.init();
}
- public void runCommand(String command) {
+ @Override
+ public void runCommand(String command) {
if (init) {
- for (Iterator iter = activities.iterator(); iter.hasNext();) {
- ActivityItem act = (ActivityItem)iter.next();
+ for (ActivityItem act : activities) {
if (act.name.equals(command)) {
selectActivity(act);
}
@@ -159,7 +164,8 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver /**
* when the workflow changes, reload this pane.
*/
- public void add(C2KLocalObject contents) {
+ @Override
+ public void add(Workflow contents) {
if (!formIsActive)
reload();
else { // look to see if this form is now invalid
@@ -170,13 +176,12 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver return;
}
// compare to currently editing jobs
- ArrayList currentActJobs = currentActView.getActivity().getJobs();
+ ArrayList<?> currentActJobs = currentActView.getActivity().getJobs();
boolean allValid = true;
- for (Iterator iter = currentActJobs.iterator(); iter.hasNext() && allValid;) {
+ for (Iterator<?> iter = currentActJobs.iterator(); iter.hasNext() && allValid;) {
Job thisJob = (Job)iter.next();
boolean stillValid = false;
- for (Iterator iter2 = jobList.iterator(); iter2.hasNext();) {
- Job newJob = (Job)iter2.next();
+ for (Job newJob : jobList) {
if (thisJob.equals(newJob)) {
stillValid = true;
break;
@@ -192,6 +197,12 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver /**
* Not pertinent for this one
*/
- public void remove(String id) {
+ @Override
+ public void remove(String id) {
}
+ @Override
+ public void control(String control, String msg) {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/source/com/c2kernel/gui/tabs/HistoryPane.java b/source/com/c2kernel/gui/tabs/HistoryPane.java index be7f8b2..5b3d536 100644 --- a/source/com/c2kernel/gui/tabs/HistoryPane.java +++ b/source/com/c2kernel/gui/tabs/HistoryPane.java @@ -21,8 +21,8 @@ import javax.swing.JTable; import javax.swing.table.AbstractTableModel;
import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.C2KLocalObject;
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.lifecycle.instance.stateMachine.Transitions;
@@ -36,7 +36,7 @@ import com.c2kernel.utils.Logger; * @version $Revision: 1.22 $ $Date: 2005/04/26 06:48:13 $
* @author $Author: abranson $
*/
-public class HistoryPane extends EntityTabPane implements ActionListener, EntityProxyObserver {
+public class HistoryPane extends EntityTabPane implements ActionListener, EntityProxyObserver<Event> {
History history;
HistoryTableModel model;
@@ -47,7 +47,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity JButton endButton = new JButton(">>");
public static final int SIZE = 30;
int currentSize = SIZE;
-
+
public HistoryPane() {
super("History", "Event History");
initPanel();
@@ -56,18 +56,18 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity Box navBox = Box.createHorizontalBox();
navBox.add(startButton); navBox.add(prevButton);
navBox.add(nextButton); navBox.add(endButton);
-
+
// setup buttons
//startButton.setEnabled(false); nextButton.setEnabled(false);
//prevButton.setEnabled(false); endButton.setEnabled(false);
startButton.setActionCommand("start");
startButton.addActionListener(this);
prevButton.setActionCommand("prev");
- prevButton.addActionListener(this);
+ prevButton.addActionListener(this);
nextButton.setActionCommand("next");
- nextButton.addActionListener(this);
+ nextButton.addActionListener(this);
endButton.setActionCommand("end");
- endButton.addActionListener(this);
+ endButton.addActionListener(this);
getGridBagConstraints();
c.gridx = 0; c.gridy = 1;
c.anchor = GridBagConstraints.NORTHWEST;
@@ -76,27 +76,29 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity gridbag.setConstraints(navBox, c);
add(navBox);
-
+
// Create table
eventTable = new JTable();
JScrollPane eventScroll= new JScrollPane(eventTable);
c.weightx = 1.0; c.weighty = 1.0;
- c.fill = GridBagConstraints.BOTH; c.gridy++;
+ c.fill = GridBagConstraints.BOTH; c.gridy++;
gridbag.setConstraints(eventScroll, c);
add(eventScroll);
-
+
}
- public void reload() {
+ @Override
+ public void reload() {
history.clear();
jumpToEnd();
}
- public void run() {
+ @Override
+ public void run() {
Thread.currentThread().setName("History Pane Builder");
try {
history = (History)sourceEntity.getEntity().getObject(ClusterStorage.HISTORY);
- sourceEntity.getEntity().subscribe(this, ClusterStorage.HISTORY, false);
+ sourceEntity.getEntity().subscribe(new MemberSubscription<Event>(this, ClusterStorage.HISTORY, false));
} catch (ObjectNotFoundException e) {
Logger.error(e);
}
@@ -104,7 +106,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity eventTable.setModel(model);
jumpToEnd();
}
-
+
public void jumpToEnd() {
int lastEvent = history.getLastId();
int firstEvent = 0; currentSize = SIZE;
@@ -113,28 +115,31 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity Logger.msg(5, "HistoryPane.run() - init table start "+firstEvent+" for "+currentSize);
model.setView(firstEvent, currentSize);
}
-
- public void add(C2KLocalObject contents) {
+
+ @Override
+ public void add(Event contents) {
jumpToEnd();
}
- public void remove(String id) {
+ @Override
+ public void remove(String id) {
// don't have to deal with this normally
- }
-
+ }
+
+ @Override
public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals("end")) {
jumpToEnd();
return;
}
-
+
int lastEvent = history.getLastId();
int startEvent = model.getStartId();
if (e.getActionCommand().equals("start")) {
currentSize = SIZE;
startEvent = 0;
}
-
+
else if (e.getActionCommand().equals("prev")) {
currentSize = SIZE;
startEvent-=currentSize;
@@ -151,19 +156,19 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity }
model.setView(startEvent, currentSize);
- }
-
+ }
+
private class HistoryTableModel extends AbstractTableModel {
Event[] event;
Integer[] ids;
int loaded = 0;
int startId = 0;
-
+
public HistoryTableModel() {
event = new Event[0];
ids = new Integer[0];
- }
-
+ }
+
public int getStartId() {
return startId;
}
@@ -182,6 +187,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getColumnClass(int)
*/
+ @Override
public Class<?> getColumnClass(int columnIndex) {
switch(columnIndex) {
case 0:
@@ -194,6 +200,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getColumnCount()
*/
+ @Override
public int getColumnCount() {
return 6;
}
@@ -201,6 +208,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getColumnName(int)
*/
+ @Override
public String getColumnName(int columnIndex) {
switch(columnIndex) {
case 0: return Language.translate("ID");
@@ -216,6 +224,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getRowCount()
*/
+ @Override
public int getRowCount() {
return loaded;
}
@@ -223,6 +232,7 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getValueAt(int, int)
*/
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
if (event.length <= rowIndex || event[rowIndex] == null)
return "";
@@ -234,8 +244,8 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity case 3: return event[rowIndex].getTimeString();
case 4: return event[rowIndex].getAgentName();
case 5: return event[rowIndex].getAgentRole();
- default: return "";
- }
+ default: return "";
+ }
} catch (Exception e) {
return null;
}
@@ -244,10 +254,17 @@ public class HistoryPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#isCellEditable(int, int)
*/
+ @Override
public boolean isCellEditable(int rowIndex, int columnIndex) {
return false;
}
}
+ @Override
+ public void control(String control, String msg) {
+ // TODO Auto-generated method stub
+
+ }
+
}
diff --git a/source/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java b/source/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java index 1629672..8f047ca 100644 --- a/source/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java +++ b/source/com/c2kernel/gui/tabs/JTabbedPaneWithCloseIcons.java @@ -14,13 +14,13 @@ import com.c2kernel.gui.EntityDetails; /**
* @author Developpement
- *
+ *
* Allows a close icone in JTabbePane
*/
public class JTabbedPaneWithCloseIcons extends JTabbedPane implements MouseListener, ChangeListener
{
/**
- *
+ *
*/
public JTabbedPaneWithCloseIcons()
{
@@ -31,6 +31,7 @@ public class JTabbedPaneWithCloseIcons extends JTabbedPane implements MouseListe /**
* @see javax.swing.JTabbedPane#addTab(String, Icon, Component, String)
*/
+ @Override
public void addTab(String title, Icon arg2, Component component, String arg3)
{
super.addTab(title, new CloseTabIcon(arg2), component, arg3);
@@ -38,6 +39,7 @@ public class JTabbedPaneWithCloseIcons extends JTabbedPane implements MouseListe /**
* @see java.awt.event.MouseListener#mouseClicked(MouseEvent)
*/
+ @Override
public void mouseClicked(MouseEvent e)
{
int tabNumber = getUI().tabForCoordinate(this, e.getX(), e.getY());
@@ -60,27 +62,32 @@ public class JTabbedPaneWithCloseIcons extends JTabbedPane implements MouseListe /**
* @see java.awt.event.MouseListener#mouseEntered(MouseEvent)
*/
+ @Override
public void mouseEntered(MouseEvent e)
{
}
/**
* @see java.awt.event.MouseListener#mouseExited(MouseEvent)
*/
+ @Override
public void mouseExited(MouseEvent e)
{
}
/**
* @see java.awt.event.MouseListener#mousePressed(MouseEvent)
*/
+ @Override
public void mousePressed(MouseEvent e)
{
}
/**
* @see java.awt.event.MouseListener#mouseReleased(MouseEvent)
*/
+ @Override
public void mouseReleased(MouseEvent e)
{
}
+ @Override
public void stateChanged(ChangeEvent e)
{
if (getSelectedComponent()!= null)
diff --git a/source/com/c2kernel/gui/tabs/JobListPane.java b/source/com/c2kernel/gui/tabs/JobListPane.java index b9ff0e5..619a589 100644 --- a/source/com/c2kernel/gui/tabs/JobListPane.java +++ b/source/com/c2kernel/gui/tabs/JobListPane.java @@ -25,10 +25,10 @@ import javax.swing.JTable; import javax.swing.table.AbstractTableModel;
import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.C2KLocalObject;
import com.c2kernel.entity.agent.Job;
import com.c2kernel.entity.agent.JobList;
import com.c2kernel.entity.proxy.EntityProxyObserver;
+import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.lifecycle.instance.stateMachine.Transitions;
import com.c2kernel.persistency.ClusterStorage;
@@ -43,7 +43,7 @@ import com.c2kernel.utils.Logger; * @version $Revision: 1.4 $ $Date: 2004/10/21 08:02:21 $
* @author $Author: abranson $
*/
-public class JobListPane extends EntityTabPane implements ActionListener, EntityProxyObserver {
+public class JobListPane extends EntityTabPane implements ActionListener, EntityProxyObserver<Job> {
JobList joblist;
JoblistTableModel model;
@@ -54,7 +54,7 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity JButton endButton = new JButton(">>");
public static final int SIZE = 30;
int currentSize = SIZE;
-
+
public JobListPane() {
super("Job List", "Agent Job List");
initPanel();
@@ -63,18 +63,18 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity Box navBox = Box.createHorizontalBox();
navBox.add(startButton); navBox.add(prevButton);
navBox.add(nextButton); navBox.add(endButton);
-
+
// setup buttons
//startButton.setEnabled(false); nextButton.setEnabled(false);
//prevButton.setEnabled(false); endButton.setEnabled(false);
startButton.setActionCommand("start");
startButton.addActionListener(this);
prevButton.setActionCommand("prev");
- prevButton.addActionListener(this);
+ prevButton.addActionListener(this);
nextButton.setActionCommand("next");
- nextButton.addActionListener(this);
+ nextButton.addActionListener(this);
endButton.setActionCommand("end");
- endButton.addActionListener(this);
+ endButton.addActionListener(this);
getGridBagConstraints();
c.gridx = 0; c.gridy = 1;
c.anchor = GridBagConstraints.NORTHWEST;
@@ -83,29 +83,31 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity gridbag.setConstraints(navBox, c);
add(navBox);
-
+
// Create table
eventTable = new JTable();
JScrollPane eventScroll= new JScrollPane(eventTable);
c.weightx = 1.0; c.weighty = 1.0;
- c.fill = GridBagConstraints.BOTH; c.gridy++;
+ c.fill = GridBagConstraints.BOTH; c.gridy++;
gridbag.setConstraints(eventScroll, c);
add(eventScroll);
-
+
// detect double clicked jobs
eventTable.addMouseListener(new JobListMouseListener());
}
- public void reload() {
+ @Override
+ public void reload() {
joblist.clear();
jumpToEnd();
}
- public void run() {
+ @Override
+ public void run() {
Thread.currentThread().setName("Joblist Pane Builder");
try {
joblist = (JobList)sourceEntity.getEntity().getObject(ClusterStorage.JOB);
- sourceEntity.getEntity().subscribe(this, ClusterStorage.JOB, false);
+ sourceEntity.getEntity().subscribe(new MemberSubscription<Job>(this, ClusterStorage.JOB, false));
} catch (ObjectNotFoundException e) {
Logger.error(e);
}
@@ -113,8 +115,8 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity eventTable.setModel(model);
jumpToEnd();
}
-
-
+
+
public void jumpToEnd() {
int lastEvent = joblist.getLastId();
int firstEvent = 0; currentSize = SIZE;
@@ -124,27 +126,30 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity model.setView(firstEvent, currentSize);
}
- public void add(C2KLocalObject contents) {
+ @Override
+ public void add(Job contents) {
reload();
}
- public void remove(String id) {
+ @Override
+ public void remove(String id) {
reload();
- }
-
+ }
+
+ @Override
public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals("end")) {
jumpToEnd();
return;
}
-
+
int lastEvent = joblist.getLastId();
int startEvent = model.getStartId();
if (e.getActionCommand().equals("start")) {
currentSize = SIZE;
startEvent = 0;
}
-
+
else if (e.getActionCommand().equals("prev")) {
currentSize = SIZE;
startEvent-=currentSize;
@@ -161,20 +166,20 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity }
model.setView(startEvent, currentSize);
- }
-
+ }
+
private class JoblistTableModel extends AbstractTableModel {
Job[] job;
Integer[] ids;
String[] itemNames;
int loaded = 0;
int startId = 0;
-
+
public JoblistTableModel(JobList joblist) {
job = new Job[0];
ids = new Integer[0];
- }
-
+ }
+
public int getStartId() {
return startId;
}
@@ -185,12 +190,11 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity itemNames = new String[size];
this.startId = startId;
int count = 0;
- for (Iterator i = joblist.keySet().iterator(); i.hasNext();) {
+ for (Iterator<?> i = joblist.keySet().iterator(); i.hasNext();) {
Integer thisJobId = new Integer((String)i.next());
if (count >= startId) {
int idx = count-startId;
ids[idx] = thisJobId;
- Job thisJob = joblist.getJob(thisJobId.intValue());
job[idx] = joblist.getJob(thisJobId.intValue());
itemNames[idx] = "Item Not Found";
try {
@@ -198,7 +202,7 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity } catch (Exception ex) {
Logger.error(ex);
}
-
+
}
count++;
loaded = count-startId;
@@ -209,6 +213,7 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getColumnClass(int)
*/
+ @Override
public Class<?> getColumnClass(int columnIndex) {
switch(columnIndex) {
case 0:
@@ -221,6 +226,7 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getColumnCount()
*/
+ @Override
public int getColumnCount() {
return 4;
}
@@ -228,6 +234,7 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getColumnName(int)
*/
+ @Override
public String getColumnName(int columnIndex) {
switch(columnIndex) {
case 0: return Language.translate("ID");
@@ -241,6 +248,7 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getRowCount()
*/
+ @Override
public int getRowCount() {
return loaded;
}
@@ -248,6 +256,7 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#getValueAt(int, int)
*/
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
if (job.length <= rowIndex || job[rowIndex] == null)
return "";
@@ -257,8 +266,8 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity case 1: return itemNames[rowIndex];
case 2: return job[rowIndex].getStepName();
case 3: return Transitions.getTransitionName(job[rowIndex].getPossibleTransition());
- default: return "";
- }
+ default: return "";
+ }
} catch (Exception e) {
return null;
}
@@ -267,10 +276,11 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity /**
* @see javax.swing.table.TableModel#isCellEditable(int, int)
*/
+ @Override
public boolean isCellEditable(int rowIndex, int columnIndex) {
return false;
}
-
+
public Job getJobAtRow(int rowIndex) {
return job[rowIndex];
}
@@ -279,7 +289,8 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity private class JobListMouseListener extends MouseAdapter {
- public void mouseClicked(MouseEvent e) {
+ @Override
+ public void mouseClicked(MouseEvent e) {
super.mouseClicked(e);
if (e.getClickCount() == 2) {
Job selectedJob = model.getJobAtRow(eventTable.getSelectedRow());
@@ -289,7 +300,13 @@ public class JobListPane extends EntityTabPane implements ActionListener, Entity Logger.error(ex);
JOptionPane.showMessageDialog(null, "No Item Found", "Job references an unknown item", JOptionPane.ERROR_MESSAGE);
}
- }
+ }
}
}
+
+ @Override
+ public void control(String control, String msg) {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/source/com/c2kernel/gui/tabs/PropertiesPane.java b/source/com/c2kernel/gui/tabs/PropertiesPane.java index 6b21804..2411296 100644 --- a/source/com/c2kernel/gui/tabs/PropertiesPane.java +++ b/source/com/c2kernel/gui/tabs/PropertiesPane.java @@ -17,11 +17,16 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener;
import java.util.HashMap;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
-import com.c2kernel.entity.C2KLocalObject;
import com.c2kernel.entity.proxy.EntityProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
+import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.gui.data.NodeAgent;
import com.c2kernel.persistency.ClusterStorage;
@@ -36,7 +41,7 @@ import com.c2kernel.utils.Logger; * @version $Revision: 1.44 $ $Date: 2005/08/31 07:21:20 $
* @author $Author: abranson $
*/
-public class PropertiesPane extends EntityTabPane implements EntityProxyObserver, ActionListener {
+public class PropertiesPane extends EntityTabPane implements EntityProxyObserver<Property>, ActionListener {
Box propertyBox;
boolean subbed = false;
@@ -66,15 +71,15 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver domTitle.setForeground(headingColor);
gridbag.setConstraints(domTitle, c);
add(domTitle);
-
+
c.gridy++;
c.fill = GridBagConstraints.BOTH;
c.weighty=1.0;
domAdmin = new DomainPathAdmin();
gridbag.setConstraints(domAdmin, c);
- add(domAdmin);
-
-
+ add(domAdmin);
+
+
if ("true".equals(Gateway.getProperty("EnableItemErase"))) {
c.gridy++;
c.fill = GridBagConstraints.NONE;
@@ -87,13 +92,15 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver }
}
- public void reload() {
+ @Override
+ public void reload() {
Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.PROPERTY);
loadedProps = new HashMap<String, JLabel>();
initForEntity(sourceEntity);
}
- public void run() {
+ @Override
+ public void run() {
Thread.currentThread().setName("Property Pane Builder");
if (sourceEntity instanceof NodeAgent) {
remove(domAdmin);
@@ -104,16 +111,15 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver propertyBox.removeAll();
propertyBox.add(Box.createGlue());
revalidate();
- sourceEntity.getEntity().subscribe(this, ClusterStorage.PROPERTY, true);
-
+ sourceEntity.getEntity().subscribe(new MemberSubscription<Property>(this, ClusterStorage.PROPERTY, true));
+
}
/**
*
*/
- public void add(C2KLocalObject contents) {
- if (!(contents instanceof Property)) return;
- Property newProp = (Property) contents;
- JLabel propLabel = (JLabel)loadedProps.get(newProp.getName());
+ @Override
+ public void add(Property newProp) {
+ JLabel propLabel = loadedProps.get(newProp.getName());
if (propLabel == null) { // new prop
JPanel summaryPanel = new JPanel(new GridLayout(0,2));
summaryPanel.add(new JLabel(Language.translate(newProp.getName()) + ":"));
@@ -126,9 +132,10 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver editButton.setMargin(new Insets(0,0,0,0));
editButton.setActionCommand(newProp.getName());
editButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e){
- String oldVal = ((JLabel)loadedProps.get(e.getActionCommand())).getText();
- String newVal = (String)JOptionPane.showInputDialog(null, "Enter new value for "+e.getActionCommand(), "Edit Property",
+ @Override
+ public void actionPerformed(ActionEvent e){
+ String oldVal = loadedProps.get(e.getActionCommand()).getText();
+ String newVal = (String)JOptionPane.showInputDialog(null, "Enter new value for "+e.getActionCommand(), "Edit Property",
JOptionPane.QUESTION_MESSAGE, null, null, oldVal);
if (newVal!=null && !(newVal.equals(oldVal))) {
try {
@@ -151,23 +158,25 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver revalidate();
}
- public void remove(String id) {
+ @Override
+ public void remove(String id) {
String propName = id.substring(id.lastIndexOf("/")+1);
- JLabel propbox = (JLabel)loadedProps.get(propName);
- if (propbox!= null) propbox.setText("DELETED");
- revalidate();
+ JLabel propbox = loadedProps.get(propName);
+ if (propbox!= null) propbox.setText("DELETED");
+ revalidate();
}
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
String[] params;
String predefStep;
-
- if (JOptionPane.showConfirmDialog(this,
- "Are you sure?",
- e.getActionCommand(),
+
+ if (JOptionPane.showConfirmDialog(this,
+ "Are you sure?",
+ e.getActionCommand(),
JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION)
return;
-
+
if (e.getActionCommand().equals("Erase Item")) {
params = new String[0];
predefStep = "Erase";
@@ -176,10 +185,16 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver return;
try {
- MainFrame.userAgent.execute((ItemProxy)sourceEntity.getEntity(), predefStep, params);
+ MainFrame.userAgent.execute((ItemProxy)sourceEntity.getEntity(), predefStep, params);
} catch (Exception ex) {
Logger.exceptionDialog(ex);
}
}
+ @Override
+ public void control(String control, String msg) {
+ // TODO Auto-generated method stub
+
+ }
+
}
diff --git a/source/com/c2kernel/gui/tabs/ViewpointPane.java b/source/com/c2kernel/gui/tabs/ViewpointPane.java index 31e18c3..a0f63ab 100644 --- a/source/com/c2kernel/gui/tabs/ViewpointPane.java +++ b/source/com/c2kernel/gui/tabs/ViewpointPane.java @@ -27,6 +27,7 @@ import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.C2KLocalObject;
import com.c2kernel.entity.proxy.EntityProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
+import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.events.Event;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.gui.tabs.outcome.OutcomeException;
@@ -39,15 +40,15 @@ import com.c2kernel.utils.Language; import com.c2kernel.utils.LocalObjectLoader;
import com.c2kernel.utils.Logger;
-public class ViewpointPane extends EntityTabPane implements ItemListener, ActionListener, EntityProxyObserver {
-
+public class ViewpointPane extends EntityTabPane implements ItemListener, ActionListener, EntityProxyObserver<C2KLocalObject> {
+
JComboBox<String> schemas;
JComboBox<Viewpoint> views;
JComboBox<EventItem> events;
JLabel eventDetails;
JButton exportButton;
JButton viewButton;
-
+
ArrayList<String> schemaList;
ArrayList<Viewpoint> viewpointList;
ArrayList<EventItem> eventList;
@@ -55,11 +56,11 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action Outcome currentOutcome = null;
OutcomeHandler thisOutcome;
boolean suspendSelection = false;
-
+
JPanel dataView = new JPanel(new GridLayout(1,1));
-
+
public ViewpointPane() {
-
+
super("Data Viewer", "Outcome Browser");
initialize();
}
@@ -96,14 +97,14 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action viewBox.add(views);
viewBox.add(Box.createHorizontalGlue());
views.addItemListener(this);
-
+
gridbag.setConstraints(viewBox, c);
this.add(viewBox);
-
- // Set up event details box
+
+ // Set up event details box
c.gridy++;
- Box eventBox = Box.createHorizontalBox();
-
+ Box eventBox = Box.createHorizontalBox();
+
label = new JLabel(Language.translate("Event")+":", SwingConstants.LEFT);
eventBox.add(label);
eventBox.add(Box.createHorizontalStrut(7));
@@ -112,29 +113,29 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action eventBox.add(events);
eventBox.add(Box.createHorizontalStrut(7));
events.addItemListener(this);
-
+
eventDetails = new JLabel();
eventBox.add(eventDetails);
eventBox.add(Box.createHorizontalGlue());
-
+
if (MainFrame.isAdmin) {
viewButton = new JButton(Language.translate("Write View"));
viewButton.setMargin(new Insets(0, 0, 0, 0));
viewButton.setActionCommand("setview");
- eventBox.add(viewButton);
+ eventBox.add(viewButton);
eventBox.add(Box.createHorizontalStrut(14));
viewButton.addActionListener(this);
}
-
+
exportButton = new JButton(Language.translate("Export"));
exportButton.setMargin(new Insets(0, 0, 0, 0));
exportButton.setActionCommand("export");
exportButton.addActionListener(this);
eventBox.add(exportButton);
-
+
gridbag.setConstraints(eventBox, c);
this.add(eventBox);
-
+
// data pane
c.gridx = 0; c.gridy = 3;
c.anchor = GridBagConstraints.NORTHWEST; c.fill = GridBagConstraints.BOTH;
@@ -143,24 +144,26 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action this.add(dataView);
}
- public void reload() {
+ @Override
+ public void reload() {
// reset boxes
schemas.removeAllItems();
- views.removeAllItems();
- events.removeAllItems();
+ views.removeAllItems();
+ events.removeAllItems();
eventDetails.setText("");
-
+
clearView();
-
+
// reload
initForEntity(sourceEntity);
}
- public void run() {
+ @Override
+ public void run() {
Thread.currentThread().setName("Viewpoint Pane Builder");
//Local object subscriptions
- sourceEntity.getEntity().subscribe(this, ClusterStorage.VIEWPOINT, false);
- sourceEntity.getEntity().subscribe(this, ClusterStorage.OUTCOME, false);
+ sourceEntity.getEntity().subscribe(new MemberSubscription<C2KLocalObject>(this, ClusterStorage.VIEWPOINT, false));
+ sourceEntity.getEntity().subscribe(new MemberSubscription<C2KLocalObject>(this, ClusterStorage.OUTCOME, false));
clearView();
schemas.addItem("--");
currentSchema = null;
@@ -168,7 +171,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action try {
String outcomeTypes = sourceEntity.getEntity().queryData(ClusterStorage.VIEWPOINT+"/all");
StringTokenizer tok = new StringTokenizer(outcomeTypes, ",");
- for (int i = 0; tok.countTokens() > 0; i++) {
+ while (tok.hasMoreTokens()) {
String thisType = tok.nextToken();
schemas.addItem(thisType);
schemaList.add(thisType);
@@ -178,13 +181,14 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action }
}
- public void itemStateChanged(ItemEvent e) {
-
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+
Object selectedItem = e.getItem();
- if (e.getStateChange() == ItemEvent.DESELECTED) return;
+ if (e.getStateChange() == ItemEvent.DESELECTED) return;
if (suspendSelection) return;
if (e.getItem().equals("--")) return;
-
+
if (e.getItemSelectable() == schemas)
switchSchema((String)selectedItem);
else if (e.getItemSelectable() == views)
@@ -196,13 +200,13 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action public void switchSchema(String schemaName) {
clearView();
suspendSelection = true;
- views.removeAllItems();
+ views.removeAllItems();
events.removeAllItems();
viewpointList = new ArrayList<Viewpoint>();
eventList = new ArrayList<EventItem>();
currentSchema = schemaName;
-
+
try {
// populate views
String viewNames = sourceEntity.getEntity().queryData(ClusterStorage.VIEWPOINT+"/"+schemaName+"/all");
@@ -217,7 +221,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action lastView = thisView;
viewpointList.add(thisView);
}
-
+
String ocVersions = sourceEntity.getEntity().queryData(ClusterStorage.OUTCOME+"/"+schemaName+"/all");
tok = new StringTokenizer(ocVersions, ",");
while(tok.hasMoreTokens()) {
@@ -227,40 +231,39 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action while(tok2.hasMoreTokens()) {
int eventId = Integer.parseInt(tok2.nextToken());
EventItem newEvent = new EventItem(eventId, schemaVersion);
- for (Iterator iter = viewpointList.iterator(); iter.hasNext();) {
- Viewpoint thisView = (Viewpoint)iter.next();
+ for (Viewpoint thisView : viewpointList) {
if (thisView.getEventId() == eventId)
newEvent.addView(thisView.getName());
}
eventList.add(newEvent);
}
Collections.sort(eventList, new Comparator<EventItem>() {
- public int compare(EventItem o1, EventItem o2) {
+ @Override
+ public int compare(EventItem o1, EventItem o2) {
return o1.compareTo(o2);
}
});
- for (Iterator<EventItem> iter = eventList.iterator(); iter.hasNext();)
- events.addItem(iter.next());
+ for (EventItem eventItem : eventList)
+ events.addItem(eventItem);
}
-
+
if (lastView != null) {
suspendSelection = false;
views.setSelectedItem(lastView);
switchView(lastView);
}
-
+
} catch (Exception e) {
Logger.error(e);
- JOptionPane.showMessageDialog(this,
- "The data structures of this item are incorrect.\nPlease contact your administrator.",
+ JOptionPane.showMessageDialog(this,
+ "The data structures of this item are incorrect.\nPlease contact your administrator.",
"Viewpoint Error" , JOptionPane.ERROR_MESSAGE);
}
suspendSelection = false;
}
-
+
public void switchView(Viewpoint newView) {
- for (Iterator iter = eventList.iterator(); iter.hasNext();) {
- EventItem thisEvent = (EventItem)iter.next();
+ for (EventItem thisEvent : eventList) {
if (thisEvent.eventId == newView.getEventId()) {
suspendSelection = true;
events.setSelectedItem(thisEvent);
@@ -270,7 +273,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action }
}
}
-
+
public void showEvent(EventItem thisEvent) {
eventDetails.setText(thisEvent.getEventDesc());
try {
@@ -278,13 +281,13 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action ClusterStorage.OUTCOME+"/"+currentSchema+"/"+thisEvent.schemaVersion+"/"+thisEvent.eventId));
} catch (Exception ex) {
Logger.error(ex);
- JOptionPane.showMessageDialog(this,
- "Could not retrieve requested outcome.\nPlease contact your administrator.",
+ JOptionPane.showMessageDialog(this,
+ "Could not retrieve requested outcome.\nPlease contact your administrator.",
"Viewpoint Error" , JOptionPane.ERROR_MESSAGE);
}
}
-
- public void setView(Outcome data) throws OutcomeException {
+
+ public void setView(Outcome data) {
Logger.msg(6, "ViewpointPane: got outcome type: "+data.getSchemaType()+" version: "+data.getSchemaVersion());
String schema;
currentOutcome = data;
@@ -295,7 +298,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action thisOutcome = EntityTabPane.getOutcomeHandler(data.getSchemaType(), data.getSchemaVersion());
thisOutcome.setDescription(schema);
thisOutcome.setOutcome(data.getData());
- thisOutcome.setReadOnly(true);
+ thisOutcome.setReadOnly(true);
Thread builder = new Thread(thisOutcome);
builder.start();
dataView.add(thisOutcome.getPanel());
@@ -308,21 +311,22 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action error = "Outcome was not valid. See log for details: "+ex.getMessage();
Logger.error(ex);
}
-
+
dataView.add(new JLabel(error));
}
-
+
public void clearView() {
dataView.removeAll();
exportButton.setEnabled(false);
if (viewButton!=null) viewButton.setEnabled(false);
}
-
- public void actionPerformed(ActionEvent e) {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals("export") && currentOutcome != null)
saveOutcomeToFile();
if (e.getActionCommand().equals("setview") && currentOutcome != null)
- overrideView();
+ overrideView();
}
private void saveOutcomeToFile() {
@@ -333,7 +337,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action File targetFile = MainFrame.xmlChooser.getSelectedFile();
if (!(targetFile.getAbsolutePath().endsWith(".xml")))
targetFile = new File(targetFile.getAbsolutePath()+".xml");
-
+
Logger.msg(2, "ViewpointPane.actionPerformed() - Exporting outcome to file " + targetFile.getName());
try {
thisOutcome.export(targetFile);
@@ -343,28 +347,28 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action Logger.exceptionDialog(ex);
}
}
-
+
}
-
+
private void overrideView() {
Viewpoint oldView = (Viewpoint)views.getSelectedItem();
EventItem newEvent = (EventItem)events.getSelectedItem();
-
+
if (oldView.getEventId() == newEvent.eventId) {
- JOptionPane.showMessageDialog(this,
- "View '"+oldView.getName()+"' is already set to event "+newEvent.eventId,
+ JOptionPane.showMessageDialog(this,
+ "View '"+oldView.getName()+"' is already set to event "+newEvent.eventId,
"Viewpoint Already Set" , JOptionPane.ERROR_MESSAGE);
return;
}
-
- if (JOptionPane.showConfirmDialog(this,
+
+ if (JOptionPane.showConfirmDialog(this,
"Are you sure you want to set the '"+oldView.getName()+
- "' view to event " + newEvent.eventId+ "?",
- "Overwrite view",
+ "' view to event " + newEvent.eventId+ "?",
+ "Overwrite view",
JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION)
return;
-
+
oldView.setEventId(newEvent.eventId);
try {
String[] predefParams = new String[1];
@@ -373,17 +377,18 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action } catch (Exception e) {
Logger.error(e);
Logger.exceptionDialog(e);
- }
+ }
}
- public void add(C2KLocalObject contents) {
+ @Override
+ public void add(C2KLocalObject contents) {
if (contents instanceof Viewpoint)
addViewpoint((Viewpoint)contents);
else if (contents instanceof Outcome)
addOutcome((Outcome)contents);
}
-
+
public void addViewpoint(Viewpoint newView) {
String schemaName = newView.getSchemaName();
Logger.msg(3, "Viewpoint "+newView.getName()+" now points to "+newView.getEventId());
@@ -393,21 +398,19 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action return;
}
-
+
if (!(schemaName.equals(schemas.getSelectedItem())))
return;
-
- for (Iterator iter = eventList.iterator(); iter.hasNext();) {
- EventItem thisEvent = (EventItem)iter.next();
+
+ for (EventItem thisEvent : eventList) {
if (thisEvent.eventId == newView.getEventId())
thisEvent.addView(newView.getName());
else
thisEvent.removeView(newView.getName());
}
-
+
boolean isSelected = false;
- for (Iterator iter = viewpointList.iterator(); iter.hasNext();) {
- Viewpoint thisView = (Viewpoint)iter.next();
+ for (Viewpoint thisView : viewpointList) {
if (thisView.getName().equals(newView.getName())) {
isSelected = thisView.equals(views.getSelectedItem());
views.removeItem(thisView);
@@ -415,15 +418,15 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action break;
}
}
-
+
views.addItem(newView);
viewpointList.add(newView);
if (isSelected) {
views.setSelectedItem(newView);
}
-
+
}
-
+
public void addOutcome(Outcome contents) {
if (!(contents.getSchemaType().equals(currentSchema))) // not interested
return;
@@ -433,21 +436,22 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action events.addItem(newEvent);
}
- public void remove(String id) {
+ @Override
+ public void remove(String id) {
// we don't really remove viewpoints
}
-
- class EventItem implements Comparable {
+
+ class EventItem implements Comparable<Object> {
public int eventId;
public int schemaVersion;
public ArrayList<String> viewNames = new ArrayList<String>();
public String viewList = "";
-
+
public EventItem(int eventId, int schemaVersion) {
this.eventId = eventId;
this.schemaVersion = schemaVersion;
}
-
+
public void addView(String viewName) {
if (!(viewNames.contains(viewName))) {
viewNames.add(viewName);
@@ -459,29 +463,30 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action viewNames.remove(viewName);
buildViewLabel();
}
-
+
private void buildViewLabel() {
if (viewNames.size() == 0) {
viewList = "";
return;
}
-
+
StringBuffer newLabel = new StringBuffer(" (");
- for (Iterator iter = viewNames.iterator(); iter.hasNext();) {
- String viewName = (String)iter.next();
+ for (Iterator<String> iter = viewNames.iterator(); iter.hasNext();) {
+ String viewName = iter.next();
newLabel.append(viewName);
if (iter.hasNext())
newLabel.append(", ");
}
-
+
viewList = newLabel.append(")").toString();
}
-
- public String toString() {
+
+ @Override
+ public String toString() {
return eventId+viewList;
-
+
}
-
+
public String getEventDesc() {
try {
Event myEvent = (Event)sourceEntity.getEntity().getObject(ClusterStorage.HISTORY+"/"+eventId);
@@ -494,7 +499,8 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action }
}
- public int compareTo(Object o) {
+ @Override
+ public int compareTo(Object o) {
if (o instanceof EventItem) {
EventItem other = (EventItem)o;
if (other.eventId < eventId) return 1;
@@ -503,4 +509,10 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action return 0;
}
}
+
+ @Override
+ public void control(String control, String msg) {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/source/com/c2kernel/gui/tabs/WorkflowPane.java b/source/com/c2kernel/gui/tabs/WorkflowPane.java index 7b664ba..6bccd08 100755..100644 --- a/source/com/c2kernel/gui/tabs/WorkflowPane.java +++ b/source/com/c2kernel/gui/tabs/WorkflowPane.java @@ -9,9 +9,9 @@ import javax.swing.JButton; import javax.swing.JFileChooser;
import javax.swing.JSplitPane;
-import com.c2kernel.entity.C2KLocalObject;
import com.c2kernel.entity.proxy.EntityProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
+import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.graph.layout.DefaultGraphLayoutGenerator;
import com.c2kernel.graph.model.EdgeFactory;
import com.c2kernel.graph.model.Selection;
@@ -30,8 +30,12 @@ import com.c2kernel.lifecycle.instance.gui.view.WfDirectedEdgeRenderer; import com.c2kernel.lifecycle.instance.gui.view.WfVertexRenderer;
import com.c2kernel.persistency.ClusterStorage;
import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.*;
-public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
+import com.c2kernel.utils.CastorXMLUtility;
+import com.c2kernel.utils.FileStringUtility;
+import com.c2kernel.utils.Language;
+import com.c2kernel.utils.Logger;
+import com.c2kernel.utils.Resource;
+public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<Workflow>
{
// Only for the purpose of loading and saving
protected Workflow mWorkflow = null;
@@ -49,7 +53,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver protected EditorPanel mEditorPanel;
// Objects to view/modify the properties of the selected activity
protected VertexPropertyPanel mPropertyPanel;
- protected JSplitPane mSplitPane;
+ protected JSplitPane mSplitPane;
// Graph editor panel
// Objects to view/modify the properties of the selected activity
@@ -64,26 +68,28 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver mLoadButton.setToolTipText(Language.translate("Load"));
mSaveButton.setToolTipText(Language.translate("Save"));
mOtherToolBarButtons = new JButton[] { mZoomOutButton, mLayoutButton, mLoadButton, mSaveButton };
-
+
}
-
+
protected void createListeners()
{
/**
- *
+ *
*/
mLoadButton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ae)
{
loadWorkflow();
}
});
/**
- *
+ *
*/
mSaveButton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ae)
{
setCursor(new Cursor(Cursor.WAIT_CURSOR));
@@ -92,20 +98,22 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver }
});
/**
- *
+ *
*/
mLayoutButton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ae)
{
DefaultGraphLayoutGenerator.layoutGraph(mEditorPanel.mGraphModelManager.getModel());
}
});
/**
- *
+ *
*/
mZoomOutButton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ae)
{
mEditorPanel.mGraphModelManager.zoomOut();
@@ -114,7 +122,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver }
/**
* Return a single ref on mEditorPanel
- *
+ *
* @return EditorPanel
*/
public EditorPanel getEditorPanel()
@@ -140,16 +148,13 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver }
return mSplitPane;
}
- public void add(C2KLocalObject contents)
+ @Override
+ public void add(Workflow contents)
{
- if (contents instanceof Workflow)
- {
- mWorkflow = (Workflow) contents;
- addActivity((CompositeActivity) mWorkflow.search("workflow/domain"));
- }
- else if (contents instanceof CompositeActivity)
- addActivity((CompositeActivity) contents);
+ mWorkflow = contents;
+ addActivity((CompositeActivity) mWorkflow.search("workflow/domain"));
}
+ @Override
public void remove(String id)
{
}
@@ -163,6 +168,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver mEditorPanel.enterSelectMode();
mWfVertexFactory.setCreationContext(cAct);
}
+ @Override
public void run()
{
Thread.currentThread().setName("Workflow Pane Builder");
@@ -175,9 +181,10 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver mEditorPanel.setEditable(MainFrame.isAdmin);
init = true;
}
- sourceEntity.getEntity().subscribe(this, ClusterStorage.LIFECYCLE, true);
+ sourceEntity.getEntity().subscribe(new MemberSubscription<Workflow>(this, ClusterStorage.LIFECYCLE, true));
transPanel.setItem((ItemProxy) sourceEntity.getEntity());
}
+ @Override
public void reload()
{
Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.LIFECYCLE);
@@ -235,9 +242,9 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver catch (Exception e)
{
Logger.error(e);
- }
+ }
}
-
+
public VertexPropertyPanel getPropertyPanel()
{
if (mPropertyPanel == null) {
@@ -249,7 +256,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver }
return mPropertyPanel;
}
-
+
public void setNewPropertyPanel()
{
String wfPanelClass = Gateway.getProperty("WfPropertyPanel");
@@ -257,7 +264,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver {
try
{
- Class panelClass = Class.forName(wfPanelClass);
+ Class<?> panelClass = Class.forName(wfPanelClass);
mPropertyPanel = (VertexPropertyPanel) panelClass.newInstance();
return;
}
@@ -269,5 +276,11 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver }
mPropertyPanel = new VertexPropertyPanel();
}
-
+
+ @Override
+ public void control(String control, String msg) {
+ // TODO Auto-generated method stub
+
+ }
+
}
diff --git a/source/com/c2kernel/gui/tabs/collection/AggregationView.java b/source/com/c2kernel/gui/tabs/collection/AggregationView.java index 8a97c6c..3291906 100755..100644 --- a/source/com/c2kernel/gui/tabs/collection/AggregationView.java +++ b/source/com/c2kernel/gui/tabs/collection/AggregationView.java @@ -47,7 +47,8 @@ public class AggregationView extends CollectionView mEditorPanel.setEditable(MainFrame.isAdmin);
}
- public void setCollection(Collection contents)
+ @Override
+ public void setCollection(Collection<?> contents)
{
thisColl = contents;
Aggregation agg = (Aggregation)thisColl;
@@ -70,6 +71,7 @@ public class AggregationView extends CollectionView {
mSaveButton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ae)
{
saveCollection();
@@ -77,10 +79,11 @@ public class AggregationView extends CollectionView });
mHistoryButton.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ae)
{
new CollectionHistoryWindow(item, thisColl);
}
- });
+ });
}
}
diff --git a/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java b/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java index bb71cd8..7cb2753 100644 --- a/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java +++ b/source/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java @@ -12,10 +12,10 @@ import javax.swing.table.AbstractTableModel; import com.c2kernel.collection.Collection;
import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.C2KLocalObject;
import com.c2kernel.entity.proxy.EntityProxy;
import com.c2kernel.entity.proxy.EntityProxyObserver;
import com.c2kernel.entity.proxy.ItemProxy;
+import com.c2kernel.entity.proxy.MemberSubscription;
import com.c2kernel.events.Event;
import com.c2kernel.gui.MainFrame;
import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
@@ -32,8 +32,8 @@ public class CollectionHistoryWindow extends JFrame { JTable historyTable;
HistoryTableModel historyModel;
-
- public CollectionHistoryWindow(ItemProxy item, Collection coll) throws HeadlessException {
+
+ public CollectionHistoryWindow(ItemProxy item, Collection<?> coll) throws HeadlessException {
super("Collection History");
historyModel = new HistoryTableModel(item, coll);
historyTable = new JTable(historyModel);
@@ -44,23 +44,25 @@ public class CollectionHistoryWindow extends JFrame { this.validate();
this.show();
}
-
- private class HistoryTableModel extends AbstractTableModel implements EntityProxyObserver {
+
+ private class HistoryTableModel extends AbstractTableModel implements EntityProxyObserver<Event> {
ItemProxy item;
ArrayList<Object> collEvents, collEventData;
- Collection coll;
- public HistoryTableModel(ItemProxy item, Collection coll) {
+ Collection<?> coll;
+ public HistoryTableModel(ItemProxy item, Collection<?> coll) {
this.item = item;
this.coll = coll;
collEvents = new ArrayList<Object>();
collEventData = new ArrayList<Object>();
- item.subscribe(this, ClusterStorage.HISTORY, true);
+ item.subscribe(new MemberSubscription<Event>(this, ClusterStorage.HISTORY, true));
}
+ @Override
public int getColumnCount() {
return 4;
}
-
+
+ @Override
public String getColumnName(int columnIndex) {
switch(columnIndex) {
case 0: return Language.translate("Date");
@@ -69,10 +71,12 @@ public class CollectionHistoryWindow extends JFrame { case 3: return Language.translate("Child");
default: return "";
}
- }
+ }
+ @Override
public int getRowCount() {
return collEvents.size();
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
Event ev = (Event)collEvents.get(rowIndex);
switch (columnIndex) {
@@ -109,9 +113,8 @@ public class CollectionHistoryWindow extends JFrame { public Object getEventData(int row) {
return collEventData.get(row);
}
- public void add(C2KLocalObject contents) {
- if (!(contents instanceof Event)) return;
- Event thisEv = (Event)contents;
+ @Override
+ public void add(Event thisEv) {
if (thisEv.getStepName().equals("AssignItemToSlot") || thisEv.getStepName().equals("AddC2KObject")) {
String[] params;
try {
@@ -134,16 +137,22 @@ public class CollectionHistoryWindow extends JFrame { if (obj instanceof Collection)
collEventData.add(obj);
else return;
-
+
}
}
else return;
collEvents.add(thisEv);
fireTableRowsInserted(collEvents.size()-1, collEvents.size()-1);
}
+ @Override
public void remove(String id) { }
+ @Override
+ public void control(String control, String msg) {
+ // TODO Auto-generated method stub
+
+ }
}
-
+
private class HistoryTableListener extends MouseAdapter {
ItemProxy item;
@@ -151,12 +160,13 @@ public class CollectionHistoryWindow extends JFrame { this.item = item;
}
+ @Override
public void mouseClicked(MouseEvent e) {
if (e.getClickCount()==2) {
int row = historyTable.getSelectedRow();
Object data = historyModel.getEventData(row);
if (data instanceof Collection) {
- showColl((Collection)data);
+ showColl((Collection<?>)data);
}
else {
String[] params = (String[])data;
@@ -167,7 +177,7 @@ public class CollectionHistoryWindow extends JFrame { }
}
}
- public void showColl(Collection coll) {
+ public void showColl(Collection<?> coll) {
JFrame newFrame = new JFrame();
AggregationView newView = new AggregationView();
newView.setCollection(coll);
diff --git a/source/com/c2kernel/gui/tabs/collection/CollectionView.java b/source/com/c2kernel/gui/tabs/collection/CollectionView.java index 62a598c..8a97af5 100755..100644 --- a/source/com/c2kernel/gui/tabs/collection/CollectionView.java +++ b/source/com/c2kernel/gui/tabs/collection/CollectionView.java @@ -19,19 +19,19 @@ import com.c2kernel.utils.Logger; public abstract class CollectionView extends JPanel {
- protected Collection thisColl;
+ protected Collection<?> thisColl;
protected ItemProxy item;
public CollectionView() {
super();
}
-
+
public void setItem(ItemProxy entity) {
this.item = entity;
}
-
- public abstract void setCollection(Collection coll);
-
+
+ public abstract void setCollection(Collection<?> coll);
+
protected void saveCollection()
{
try
diff --git a/source/com/c2kernel/gui/tabs/collection/DependencyView.java b/source/com/c2kernel/gui/tabs/collection/DependencyView.java index 4465d6a..14e2af0 100755..100644 --- a/source/com/c2kernel/gui/tabs/collection/DependencyView.java +++ b/source/com/c2kernel/gui/tabs/collection/DependencyView.java @@ -19,7 +19,8 @@ public class DependencyView extends CollectionView createLayout();
}
- public void setCollection(Collection contents)
+ @Override
+ public void setCollection(Collection<?> contents)
{
thisColl = contents;
}
diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java index ba5e76b..6a8f2f7 100644 --- a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java +++ b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java @@ -9,7 +9,7 @@ public class ActivityItem { public int state;
public String name;
ArrayList<Job> jobs = new ArrayList<Job>();
-
+
public ActivityItem() {
stepPath = "";
state = -1;
@@ -27,7 +27,7 @@ public class ActivityItem { jobs.add(newJob);
}
- public ArrayList getJobs() {
+ public ArrayList<Job> getJobs() {
return jobs;
}
@@ -35,16 +35,19 @@ public class ActivityItem { return stepPath;
}
- public String toString() {
+ @Override
+ public String toString() {
return name+(state>-1?" ("+States.getStateName(state)+")":"");
}
- public boolean equals(Object other) {
+ @Override
+ public boolean equals(Object other) {
if (other instanceof ActivityItem)
return hashCode() == ((ActivityItem)other).hashCode();
return false;
}
-
+
+ @Override
public int hashCode() {
return stepPath.hashCode();
}
diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java index b0417f4..b6ef7f8 100644 --- a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java +++ b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java @@ -8,7 +8,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener;
import java.io.File;
import java.util.ArrayList;
-import java.util.Iterator;
import javax.swing.Box;
import javax.swing.JButton;
@@ -34,7 +33,7 @@ import com.c2kernel.utils.LocalObjectLoader; import com.c2kernel.utils.Logger;
public class ActivityViewer extends JPanel implements Runnable {
-
+
ItemProxy item;
Box outcomeButtons = Box.createHorizontalBox();
OutcomeHandler outcomePanel;
@@ -43,8 +42,8 @@ public class ActivityViewer extends JPanel implements Runnable { ArrayList<RequestButton> requestButtons = new ArrayList<RequestButton>();
JLabel noOutcome = new JLabel(Language.translate("No outcome data is required for this activity"));
ExecutionPane parent;
- JLabel status;
- JComboBox executors;
+ JLabel status;
+ JComboBox<?> executors;
JButton saveButton = new JButton("Save");
JButton loadButton = new JButton("Load");
GridBagLayout gridbag = new GridBagLayout();
@@ -53,10 +52,12 @@ public class ActivityViewer extends JPanel implements Runnable { static {
chooser.addChoosableFileFilter(
new javax.swing.filechooser.FileFilter() {
- public String getDescription() {
+ @Override
+ public String getDescription() {
return "XML Files";
}
- public boolean accept(File f) {
+ @Override
+ public boolean accept(File f) {
if (f.isDirectory() || (f.isFile() && f.getName().endsWith(".xml"))) {
return true;
}
@@ -64,13 +65,13 @@ public class ActivityViewer extends JPanel implements Runnable { }
});
}
-
+
public ActivityViewer (ActivityItem newAct, ItemProxy item, ExecutionPane parent){
thisAct = newAct;
this.item = item;
this.parent = parent;
setLayout(gridbag);
-
+
GridBagConstraints c = new GridBagConstraints();
c.gridx=0; c.gridy=1; c.weightx=1.0; c.weighty=0.0;
c.insets = new Insets(5,5,5,5);
@@ -82,17 +83,17 @@ public class ActivityViewer extends JPanel implements Runnable { actTitle.setFont(EntityTabPane.titleFont);
gridbag.setConstraints(actTitle, c);
add(actTitle);
-
- Job firstJob = (Job)(thisAct.getJobs().get(0));
+
+ Job firstJob = (thisAct.getJobs().get(0));
// desc
String desc = firstJob.getDescription();
if (desc != null && desc.length() > 0) {
Box descBox = Box.createHorizontalBox();
-
+
String chopDesc = null;
if(desc.length() >= 40) chopDesc = desc.substring(0,40);
else chopDesc = desc;
-
+
descBox.add(new JLabel("Description: "+chopDesc));
if (desc.length()>chopDesc.length()) {
descBox.add(new JLabel(" ..."));
@@ -101,7 +102,8 @@ public class ActivityViewer extends JPanel implements Runnable { descButton.setMargin(new Insets(0,0,0,0));
descButton.setActionCommand(desc);
descButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
JTextArea descArea = new JTextArea(e.getActionCommand());
descArea.setLineWrap(true);
descArea.setWrapStyleWord(true);
@@ -118,8 +120,8 @@ public class ActivityViewer extends JPanel implements Runnable { add(descBox);
}
-
-// agentid
+
+// agentid
String roleName = firstJob.getAgentRole();
if (roleName!= null && roleName.length()>0) {
c.gridy++;
@@ -127,12 +129,12 @@ public class ActivityViewer extends JPanel implements Runnable { gridbag.setConstraints(role, c);
add(role);
}
-
+
c.gridy++;
c.anchor = GridBagConstraints.EAST;
gridbag.setConstraints(outcomeButtons, c);
add(outcomeButtons);
-
+
executors = MainFrame.getExecutionPlugins();
if (executors.getItemCount() > 1) {
c.gridx++;
@@ -142,12 +144,12 @@ public class ActivityViewer extends JPanel implements Runnable { }
c.gridy++;
-
+
status = new JLabel(Language.translate("Waiting for request"));
status.setFont(EntityTabPane.titleFont);
gridbag.setConstraints(status, c);
add(status);
-
+
c.gridx++;
Box fileBox = Box.createHorizontalBox();
fileBox.add(saveButton); fileBox.add(Box.createHorizontalGlue()); fileBox.add(loadButton);
@@ -158,8 +160,8 @@ public class ActivityViewer extends JPanel implements Runnable { c.gridx--;
c.gridwidth = 2;
boolean outcomeEmpty = true;
- for (Iterator e = thisAct.getJobs().iterator(); e.hasNext();) {
- Job thisJob = (Job)e.next();
+ for (Object name2 : thisAct.getJobs()) {
+ Job thisJob = (Job)name2;
RequestButton newButton = new RequestButton(thisJob, this);
requestButtons.add(newButton);
outcomeButtons.add(newButton);
@@ -191,7 +193,8 @@ public class ActivityViewer extends JPanel implements Runnable { if (outcomePanel == null) newButton.setEnabled(false);
else {
saveButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
String output;
try {
output = outcomePanel.getOutcome();
@@ -200,7 +203,7 @@ public class ActivityViewer extends JPanel implements Runnable { File targetFile = chooser.getSelectedFile();
if (!(targetFile.getAbsolutePath().endsWith(".xml")))
targetFile = new File(targetFile.getAbsolutePath()+".xml");
-
+
Logger.msg(2, "ExecutionPane - Exporting outcome to file " + targetFile.getName());
FileStringUtility.string2File(targetFile, output);
}
@@ -211,14 +214,15 @@ public class ActivityViewer extends JPanel implements Runnable { }
});
saveButton.setEnabled(true);
-
+
loadButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
try {
int returnVal = chooser.showOpenDialog(null);
if (returnVal == JFileChooser.APPROVE_OPTION) {
File targetFile = chooser.getSelectedFile();
-
+
Logger.msg(2, "ViewpointPane.actionPerformed() - Reading outcome from file " + targetFile.getName());
String outcome = FileStringUtility.file2String(targetFile);
outcomePanel.setOutcome(outcome);
@@ -230,7 +234,7 @@ public class ActivityViewer extends JPanel implements Runnable { }
}
});
- loadButton.setEnabled(true);
+ loadButton.setEnabled(true);
}
}
}
@@ -243,15 +247,15 @@ public class ActivityViewer extends JPanel implements Runnable { add(outcomeView);
}
-
+
public void init() {
if (outcomePanel != null)
new Thread(outcomePanel).start();
}
-
+
public void execute(Job thisJob) {
try{
- if (thisJob.isOutcomeUsed() && thisJob.getSchemaType().length() > 0)
+ if (thisJob.isOutcomeUsed() && thisJob.getSchemaType().length() > 0)
thisJob.setOutcome(outcomePanel.getOutcome());
executingJob = thisJob;
new Thread(this).start();
@@ -260,11 +264,12 @@ public class ActivityViewer extends JPanel implements Runnable { }
}
-
+
/**
* Submits the job to the database
*/
- public void run() {
+ @Override
+ public void run() {
Thread.currentThread().setName("Activity Execution");
enableAllButtons(false);
try {
@@ -277,15 +282,14 @@ public class ActivityViewer extends JPanel implements Runnable { }
enableAllButtons(true);
}
-
+
private void enableAllButtons(boolean enabled) {
- for (Iterator iter = requestButtons.iterator(); iter.hasNext();) {
- RequestButton thisButton = (RequestButton)iter.next();
+ for (RequestButton thisButton : requestButtons) {
thisButton.setEnabled(enabled);
}
}
-
+
public ActivityItem getActivity() {
return thisAct;
}
diff --git a/source/com/c2kernel/gui/tabs/execution/DefaultExecutor.java b/source/com/c2kernel/gui/tabs/execution/DefaultExecutor.java index ea05568..378cc2e 100755..100644 --- a/source/com/c2kernel/gui/tabs/execution/DefaultExecutor.java +++ b/source/com/c2kernel/gui/tabs/execution/DefaultExecutor.java @@ -16,18 +16,20 @@ import com.c2kernel.utils.Language; **************************************************************************/
public class DefaultExecutor implements Executor {
-
+
public DefaultExecutor() {
super();
}
- public void execute(Job job, JLabel status) throws Exception {
+ @Override
+ public void execute(Job job, JLabel status) throws Exception {
status.setText(Language.translate("Requesting, please wait."));
MainFrame.userAgent.execute(job);
status.setText(Language.translate("Execution complete. Waiting for joblist update."));
}
- public String toString() {
+ @Override
+ public String toString() {
return "Normal";
}
}
diff --git a/source/com/c2kernel/gui/tabs/execution/Executor.java b/source/com/c2kernel/gui/tabs/execution/Executor.java index dd185b4..6fbde17 100755..100644 --- a/source/com/c2kernel/gui/tabs/execution/Executor.java +++ b/source/com/c2kernel/gui/tabs/execution/Executor.java @@ -14,8 +14,9 @@ import com.c2kernel.entity.agent.Job; **************************************************************************/
public interface Executor {
-
- public String toString();
-
- public void execute(Job job, JLabel status) throws Exception;
+
+ @Override
+ public String toString();
+
+ public void execute(Job job, JLabel status) throws Exception;
}
diff --git a/source/com/c2kernel/gui/tabs/execution/RequestButton.java b/source/com/c2kernel/gui/tabs/execution/RequestButton.java index 0e11a7f..e1372a2 100755..100644 --- a/source/com/c2kernel/gui/tabs/execution/RequestButton.java +++ b/source/com/c2kernel/gui/tabs/execution/RequestButton.java @@ -27,7 +27,8 @@ import com.c2kernel.lifecycle.instance.stateMachine.Transitions; addActionListener(this);
}
- public void actionPerformed(ActionEvent event) {
+ @Override
+ public void actionPerformed(ActionEvent event) {
parent.execute(myJob);
}
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java b/source/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java index 451b393..5ab5245 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java +++ b/source/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java @@ -29,7 +29,7 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler { PlainDocument doc;
JTextArea textarea;
boolean unsaved;
-
+
public BasicOutcomeEditor() {
super();
this.setLayout(new GridLayout(1,1));
@@ -39,14 +39,18 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler { textarea.setFont(Font.decode("monospaced"));
add(new JScrollPane(textarea));
doc.addDocumentListener(new DocumentListener() {
- public void changedUpdate(DocumentEvent e) { unsaved = true; }
- public void insertUpdate(DocumentEvent e) { unsaved = true; }
- public void removeUpdate(DocumentEvent e) { unsaved = true; }
-
+ @Override
+ public void changedUpdate(DocumentEvent e) { unsaved = true; }
+ @Override
+ public void insertUpdate(DocumentEvent e) { unsaved = true; }
+ @Override
+ public void removeUpdate(DocumentEvent e) { unsaved = true; }
+
});
}
- public void setOutcome(String outcome) throws InvalidOutcomeException {
+ @Override
+ public void setOutcome(String outcome) throws InvalidOutcomeException {
try {
doc.insertString(0, outcome, null);
unsaved = false;
@@ -55,14 +59,17 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler { }
}
- public void setDescription(String description) throws InvalidSchemaException { }
+ @Override
+ public void setDescription(String description) throws InvalidSchemaException { }
- public void setReadOnly(boolean readOnly) {
+ @Override
+ public void setReadOnly(boolean readOnly) {
textarea.setEditable(!readOnly);
}
- public JPanel getPanel() throws OutcomeNotInitialisedException {
+ @Override
+ public JPanel getPanel() throws OutcomeNotInitialisedException {
return this;
}
@@ -70,7 +77,8 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler { *
*/
- public String getOutcome() throws OutcomeException {
+ @Override
+ public String getOutcome() throws OutcomeException {
try {
return doc.getText(0, doc.getLength());
} catch (Exception ex) {
@@ -82,18 +90,22 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler { *
*/
- public void run() {
+ @Override
+ public void run() {
}
- public boolean isUnsaved() {
+ @Override
+ public boolean isUnsaved() {
return unsaved;
}
-
- public void saved() {
+
+ @Override
+ public void saved() {
unsaved = false;
}
+ @Override
public void export(File targetFile) throws Exception {
FileStringUtility.string2File(targetFile, getOutcome());
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java b/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java index 015bd9a..3d6cc6e 100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/AttributeList.java @@ -26,7 +26,7 @@ public class AttributeList extends JPanel { ElementDecl model;
Element myElement;
boolean readOnly;
- static Font labelFont;
+ static Font labelFont;
public AttributeList(ElementDecl model, boolean readOnly, HelpPane helpPane) {
super();
@@ -44,7 +44,7 @@ public class AttributeList extends JPanel { // simple types have no attributes
return;
}
-
+
ComplexType content = (ComplexType)model.getType();
// place on panel
@@ -53,9 +53,9 @@ public class AttributeList extends JPanel { c.anchor = GridBagConstraints.NORTHWEST;
c.fill = GridBagConstraints.HORIZONTAL;
c.weightx = 1.0; c.weighty = 1.0; c.gridx = 0;
- c.ipadx = 5; c.ipady = 0;
+ c.ipadx = 5; c.ipady = 0;
- for (Enumeration fields = content.getAttributeDecls(); fields.hasMoreElements();) {
+ for (Enumeration<?> fields = content.getAttributeDecls(); fields.hasMoreElements();) {
c.gridy = 0;
thisDecl = (AttributeDecl)fields.nextElement();
Logger.msg(8, "Includes Attribute "+thisDecl.getName());
@@ -70,11 +70,11 @@ public class AttributeList extends JPanel { // read help
String helpText;
String doc = OutcomeStructure.extractHelp(thisDecl);
- if (doc.length() > 0)
+ if (doc.length() > 0)
helpText = doc.toString();
else
helpText = "<i>No help is available for this attribute</i>";
-
+
c.gridy++;
@@ -91,7 +91,7 @@ public class AttributeList extends JPanel { entry.setToolTipText(e.getMessage());
gridbag.setConstraints(entry, c);
this.add(entry);
- }
+ }
c.gridx++;
@@ -100,26 +100,25 @@ public class AttributeList extends JPanel { public void setInstance(Element data) throws StructuralException {
this.myElement = data;
- for (Iterator e = attrSet.iterator(); e.hasNext();) {
- StringEditField thisField = (StringEditField)e.next();
+ for (StringEditField thisField : attrSet) {
Logger.msg(8, "Populating Attribute "+thisField.getName());
Attr thisAttr = myElement.getAttributeNode(thisField.getName());
- if (thisAttr == null)
+ if (thisAttr == null)
thisAttr = newAttribute(myElement, (AttributeDecl)thisField.getModel());
thisField.setData(thisAttr);
}
}
-
+
public Attr newAttribute(Element parent, AttributeDecl attr) {
-
+
parent.setAttribute(attr.getName(), attr.getFixedValue()!=null?attr.getFixedValue():attr.getDefaultValue());
return parent.getAttributeNode(attr.getName());
}
-
+
public String validateAttributes() {
if (model.getType().isComplexType()) {
ComplexType content = (ComplexType)model.getType();
- for (Enumeration fields = content.getAttributeDecls(); fields.hasMoreElements();) {
+ for (Enumeration<?> fields = content.getAttributeDecls(); fields.hasMoreElements();) {
AttributeDecl thisDecl = (AttributeDecl)fields.nextElement();
String attrVal = myElement.getAttribute(thisDecl.getName());
if (attrVal.length() == 0 && thisDecl.isOptional()) {
@@ -129,20 +128,20 @@ public class AttributeList extends JPanel { }
return null;
}
-
+
public void initNew(Element parent) {
AttributeDecl thisDecl;
StringEditField thisField;
Attr thisAttr;
this.myElement = parent;
-
+
if (model.getType().isSimpleType()) return; // no attributes in simple types
-
+
ComplexType content = (ComplexType)model.getType();
-
- for (Iterator e = attrSet.iterator(); e.hasNext();) {
- thisField = (StringEditField)e.next();
-
+
+ for (Iterator<StringEditField> e = attrSet.iterator(); e.hasNext();) {
+ thisField = e.next();
+
thisDecl = content.getAttributeDecl(thisField.getName());
thisAttr = newAttribute(myElement, thisDecl);
// add into parent - fill in field
@@ -151,8 +150,9 @@ public class AttributeList extends JPanel { } catch (Exception ex) { } // impossible name mismatch
}
}
- public void grabFocus() {
+ @Override
+ public void grabFocus() {
if (attrSet.size() > 0)
- ((StringEditField)attrSet.get(0)).grabFocus();
+ attrSet.get(0).grabFocus();
}
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/DataRecord.java b/source/com/c2kernel/gui/tabs/outcome/form/DataRecord.java index 9d0b633..7477ecd 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/DataRecord.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/DataRecord.java @@ -4,7 +4,6 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout;
import java.awt.Insets;
import java.util.ArrayList;
-import java.util.Iterator;
import javax.swing.JLabel;
import javax.swing.JTabbedPane;
@@ -26,7 +25,7 @@ public class DataRecord extends OutcomeStructure implements ChangeListener { AttributeList myAttributes;
JTabbedPane DRPanel = null;
boolean deferred;
- ArrayList deferredChildren = new ArrayList();
+ ArrayList<?> deferredChildren = new ArrayList<Object>();
Document parentDoc;
GridBagConstraints position;
GridBagLayout gridbag;
@@ -36,7 +35,7 @@ public class DataRecord extends OutcomeStructure implements ChangeListener { this.deferred = deferred;
if (!deferred) setupPanel();
}
-
+
public synchronized void activate() {
deferred = false;
try {
@@ -84,7 +83,8 @@ public class DataRecord extends OutcomeStructure implements ChangeListener { }
}
- public void addStructure(OutcomeStructure newElement) throws OutcomeException {
+ @Override
+ public void addStructure(OutcomeStructure newElement) throws OutcomeException {
super.addStructure(newElement);
if (newElement == null) return;
if (newElement instanceof DataRecord) {
@@ -127,7 +127,7 @@ public class DataRecord extends OutcomeStructure implements ChangeListener { position.gridy--;
position.gridheight=2;
position.weightx=0;
- position.fill=GridBagConstraints.NONE;
+ position.fill=GridBagConstraints.NONE;
gridbag.setConstraints(newField.getAttributes(), position);
this.add(newField.getAttributes());
position.gridx=0;
@@ -135,7 +135,7 @@ public class DataRecord extends OutcomeStructure implements ChangeListener { position.gridy++;
}
else {
- position.fill=GridBagConstraints.HORIZONTAL;
+ position.fill=GridBagConstraints.HORIZONTAL;
position.gridwidth=3;
position.weightx=1.0;
position.gridy++;
@@ -146,48 +146,49 @@ public class DataRecord extends OutcomeStructure implements ChangeListener { }
}
- public void addInstance(Element myElement, Document parentDoc) throws OutcomeException {
+ @Override
+ public void addInstance(Element myElement, Document parentDoc) throws OutcomeException {
Logger.msg(8, "Accepting DR "+myElement.getTagName());
if (this.myElement != null) throw new CardinalException("DataRecord "+this.getName()+" cannot repeat.");
this.myElement = myElement;
this.parentDoc = parentDoc;
-
+
if (!deferred)
populateInstance();
}
-
+
public void populateInstance() throws OutcomeException {
myAttributes.setInstance(myElement);
-
+
NodeList childElements = myElement.getChildNodes();
-
+
for (int i=0; i<childElements.getLength();i++) {
if (!(childElements.item(i) instanceof Element)) // ignore chardata here
continue;
Element thisElement = (Element) childElements.item(i);
// find the child structure with this name
- OutcomeStructure thisStructure = (OutcomeStructure)subStructure.get(thisElement.getTagName());
- if (thisStructure == null)
+ OutcomeStructure thisStructure = subStructure.get(thisElement.getTagName());
+ if (thisStructure == null)
throw new StructuralException("DR "+model.getName()+" not expecting "+thisElement.getTagName());
thisStructure.addInstance(thisElement, parentDoc);
}
-
+
// make sure any dimensions have the minimum
- for (Iterator e=subStructure.keySet().iterator(); e.hasNext();) {
- String structureName = (String)e.next();
- OutcomeStructure thisStructure = (OutcomeStructure)subStructure.get(structureName);
+ for (Object name2 : subStructure.keySet()) {
+ String structureName = (String)name2;
+ OutcomeStructure thisStructure = subStructure.get(structureName);
int count = 0;
-
- if (thisStructure instanceof Dimension) {
+
+ if (thisStructure instanceof Dimension) {
Dimension thisDimension = (Dimension)thisStructure;
thisDimension.setParentElement(myElement);
count = thisDimension.getChildCount();
}
- else
+ else
count = thisStructure.getElement()==null?0:1;
-
+
int total = thisStructure.getModel().getMinOccurs();
//if (total == 0) total++;
for (int i = count;i<total;i++) {
@@ -195,25 +196,26 @@ public class DataRecord extends OutcomeStructure implements ChangeListener { }
}
}
-
- public Element initNew(Document parent) {
+
+ @Override
+ public Element initNew(Document parent) {
Logger.msg(6, "Creating DR "+model.getName());
if (deferred) activate();
-
+
// make a new Element
myElement = parent.createElement(model.getName());
// populate
- for (Iterator e=order.iterator(); e.hasNext();) {
- String structureName = (String)e.next();
- OutcomeStructure thisStructure = (OutcomeStructure)subStructure.get(structureName);
- if (thisStructure instanceof Dimension)
+ for (Object name2 : order) {
+ String structureName = (String)name2;
+ OutcomeStructure thisStructure = subStructure.get(structureName);
+ if (thisStructure instanceof Dimension)
((Dimension)thisStructure).setParentElement(myElement);
int count = 0;
while (count < thisStructure.getModel().getMinOccurs()) {
myElement.appendChild(thisStructure.initNew(parent));
count++;
}
- }
+ }
// set up attributes
myAttributes.initNew(myElement);
@@ -222,28 +224,31 @@ public class DataRecord extends OutcomeStructure implements ChangeListener { }
- public void stateChanged(ChangeEvent e) {
+ @Override
+ public void stateChanged(ChangeEvent e) {
JTabbedPane targetPane = (JTabbedPane)e.getSource();
DataRecord targetTab = (DataRecord)targetPane.getSelectedComponent();
if (targetTab == this) {
helpPane.setHelp(getName(), getHelp());
if (deferred) SwingUtilities.invokeLater(
new Thread(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
activate();
}
}
));
}
}
-
+
/**
* sets focus to first editable child
*/
- public void grabFocus() {
+ @Override
+ public void grabFocus() {
if (myAttributes.attrSet.size() > 0)
myAttributes.grabFocus();
else if (order.size()> 0)
- ((OutcomeStructure)subStructure.get(order.get(0))).grabFocus();
+ subStructure.get(order.get(0)).grabFocus();
}
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java b/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java index 8de306b..c91c5df 100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/Dimension.java @@ -1,6 +1,6 @@ package com.c2kernel.gui.tabs.outcome.form;
-import java.awt.*;
import java.awt.FlowLayout;
+import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
@@ -11,7 +11,15 @@ import java.awt.event.FocusListener; import java.util.ArrayList;
import java.util.Iterator;
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
import javax.swing.border.EtchedBorder;
import javax.swing.table.JTableHeader;
@@ -38,7 +46,7 @@ public class Dimension extends OutcomeStructure implements ActionListener { Box tableBox;
ArrayList<DimensionInstance> instances = new ArrayList<DimensionInstance>(); // stores DimensionInstances if tabs
ArrayList<Element> elements = new ArrayList<Element>(); // stores current children
-
+
JButton addButton;
JButton delButton;
@@ -61,17 +69,17 @@ public class Dimension extends OutcomeStructure implements ActionListener { position.insets = new Insets(0,0,0,0);
// TODO: an element or attribute of the dimension can be flagged as an index, so it can be used as a title for a tab
-
+
// set up the border
setBorder(BorderFactory.createTitledBorder(
BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), model.getName()));
-
+
msg = new JLabel("No elements");
msg.setFont(new Font("SansSerif", Font.ITALIC, msg.getFont().getSize()));
gridbag.setConstraints(msg, position);
add(msg);
position.gridy++;
-
+
// decide whether a table or tabs
try {
tableModel = new DimensionTableModel(model, readOnly);
@@ -90,10 +98,10 @@ public class Dimension extends OutcomeStructure implements ActionListener { gridbag.setConstraints(tableBox, position);
add(tableBox);
tableBox.setVisible(false);
-
+
} catch (StructuralException e) {
// use tabs
- Logger.msg(8, "DIM "+model.getName()+" - Will be tabs: "+e.getMessage());
+ Logger.msg(8, "DIM "+model.getName()+" - Will be tabs: "+e.getMessage());
mode = TABS;
tabs = new JTabbedPane();
gridbag.setConstraints(tabs, position);
@@ -101,7 +109,7 @@ public class Dimension extends OutcomeStructure implements ActionListener { tabs.setVisible(false);
}
if (!readOnly) {
- JPanel rowAdjust = new JPanel(new FlowLayout());
+ JPanel rowAdjust = new JPanel(new FlowLayout());
addButton = new JButton("+");
addButton.setActionCommand("add");
addButton.addActionListener(this);
@@ -113,19 +121,20 @@ public class Dimension extends OutcomeStructure implements ActionListener { delButton.setEnabled(false);
rowAdjust.add(delButton);
-
+
position.gridy++; position.weighty=0; position.weightx=0;
gridbag.setConstraints(rowAdjust, position);
this.add(rowAdjust);
}
-
+
}
-
+
public void setParentElement(Element parent) {
this.parent = parent;
}
- public void addInstance(Element myElement, Document parentDoc) throws OutcomeException {
+ @Override
+ public void addInstance(Element myElement, Document parentDoc) throws OutcomeException {
if (Logger.doLog(6))
Logger.msg(6, "DIM - adding instance "+ (elements.size()+1) +" for "+myElement.getTagName());
if (parent == null) setParentElement((Element)myElement.getParentNode());
@@ -134,24 +143,24 @@ public class Dimension extends OutcomeStructure implements ActionListener { tableModel.addInstance(myElement, -1);
elements.add(myElement);
}
- else {
+ else {
DimensionInstance target;
elements.add(myElement);
if (instances.size() < elements.size())
target = newInstance();
else
- target = (DimensionInstance)instances.get(elements.size()-1);
+ target = instances.get(elements.size()-1);
target.addInstance(myElement, parentDoc);
}
checkButtons();
}
-
+
public int getChildCount() {
return elements.size();
}
public DimensionInstance newInstance() {
- DimensionInstance newInstance = null;
+ DimensionInstance newInstance = null;
try {
newInstance = new DimensionInstance(model, readOnly, helpPane, deferChild);
instances.add(newInstance);
@@ -166,37 +175,38 @@ public class Dimension extends OutcomeStructure implements ActionListener { }
return newInstance;
}
-
- public String validateStructure() {
+
+ @Override
+ public String validateStructure() {
if (mode == TABLE)
return table.validateStructure();
else {
StringBuffer errors = new StringBuffer();
- for (Iterator iter = instances.iterator(); iter.hasNext();) {
- OutcomeStructure element = (OutcomeStructure)iter.next();
+ for (Iterator<DimensionInstance> iter = instances.iterator(); iter.hasNext();) {
+ OutcomeStructure element = iter.next();
errors.append(element.validateStructure());
}
- return errors.toString();
+ return errors.toString();
}
}
-
+
public void checkButtons() {
// check if data visible
boolean dataVisible = elements.size() > 0;
if (mode == TABS) tabs.setVisible(dataVisible);
else tableBox.setVisible(dataVisible);
msg.setVisible(!dataVisible);
-
+
if (readOnly) return;
-
+
if (elements.size() <= model.getMinOccurs() || elements.size() == 0) {
- delButton.setEnabled(false);
+ delButton.setEnabled(false);
delButton.setToolTipText("Minimum row count of "+model.getMinOccurs()+" reached.");
} else {
- delButton.setEnabled(true);
+ delButton.setEnabled(true);
delButton.setToolTipText(null);
}
-
+
if (elements.size() < model.getMaxOccurs() || model.getMaxOccurs() == Particle.UNBOUNDED) {
addButton.setEnabled(true);
addButton.setToolTipText(null);
@@ -205,8 +215,9 @@ public class Dimension extends OutcomeStructure implements ActionListener { addButton.setToolTipText("Maximum row count of "+model.getMaxOccurs()+" reached.");
}
}
-
- public Element initNew(Document parent) {
+
+ @Override
+ public Element initNew(Document parent) {
Element newElement;
if (mode == TABLE) {
@@ -220,19 +231,20 @@ public class Dimension extends OutcomeStructure implements ActionListener { if (instances.size() < elements.size()+1)
newTab = newInstance();
else
- newTab = (DimensionInstance)instances.get(elements.size()-1);
+ newTab = instances.get(elements.size()-1);
newElement = newTab.initNew(parent);
elements.add(newElement);
- checkButtons();
+ checkButtons();
return newElement;
}
}
-
- public void actionPerformed(ActionEvent e) {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
int index;
if (mode == TABS) index = tabs.getSelectedIndex();
else {
- index = table.getSelectedRow();
+ index = table.getSelectedRow();
if (index == -1) index = tableModel.getRowCount();
}
try {
@@ -246,16 +258,16 @@ public class Dimension extends OutcomeStructure implements ActionListener { JOptionPane.showMessageDialog(null, ex.getMessage(), "Table error", JOptionPane.ERROR_MESSAGE);
}
}
-
+
public void addRow(int index) throws CardinalException {
- if (elements.size() == model.getMaxOccurs())
+ if (elements.size() == model.getMaxOccurs())
throw new CardinalException("Maximum size of table reached");
-
+
if (mode == TABLE) {
Element newRow = tableModel.initNew(parent.getOwnerDocument(), index);
elements.add(index, newRow);
try {
- Element following = (Element)elements.get(index+1);
+ Element following = elements.get(index+1);
parent.insertBefore(newRow, following);
} catch (IndexOutOfBoundsException ex) {
parent.appendChild(newRow);
@@ -268,9 +280,9 @@ public class Dimension extends OutcomeStructure implements ActionListener { parent.appendChild(newTab);
}
checkButtons();
-
- }
-
+
+ }
+
public void removeRow(int index) throws CardinalException {
if (elements.size() <= model.getMinOccurs())
throw new CardinalException("Minimum size of table reached");
@@ -284,12 +296,12 @@ public class Dimension extends OutcomeStructure implements ActionListener { }
}
else {
- Element elementToGo = (Element)elements.get(index);
+ Element elementToGo = elements.get(index);
parent.removeChild(elementToGo);
instances.remove(index);
tabs.remove(index);
for (int i = index; i<instances.size(); i++) {
- DimensionInstance thisInstance = (DimensionInstance)instances.get(i);
+ DimensionInstance thisInstance = instances.get(i);
thisInstance.setTabNumber(i+1);
tabs.setTitleAt(i, thisInstance.getName());
}
@@ -297,9 +309,9 @@ public class Dimension extends OutcomeStructure implements ActionListener { elements.remove(index);
checkButtons();
}
-
+
private class DomKeyPushTable extends JTable implements DomainKeyConsumer, FocusListener {
-
+
Dimension dim;
public DomKeyPushTable(DimensionTableModel model, Dimension parent) {
super(model);
@@ -307,11 +319,13 @@ public class Dimension extends OutcomeStructure implements ActionListener { this.dim = parent;
}
- public void push(DomainPath key) {
+ @Override
+ public void push(DomainPath key) {
push(key.getName());
}
- public void push(String name) {
+ @Override
+ public void push(String name) {
int col = getSelectedColumn();
int row = getSelectedRow();
if (cellEditor != null)
@@ -333,27 +347,30 @@ public class Dimension extends OutcomeStructure implements ActionListener { if (row+1 < getRowCount()) {
Logger.msg(8, "Shifting selection to row "+(row+1));
changeSelection(row+1, col, false, false);
- }
+ }
}
}
-
- public void focusGained(FocusEvent e) {
+
+ @Override
+ public void focusGained(FocusEvent e) {
if (!readOnly)
MainFrame.itemFinder.setConsumer(this, "Insert");
}
- public void focusLost(FocusEvent e) {
+ @Override
+ public void focusLost(FocusEvent e) {
// release the itemFinder
- if (!readOnly)
+ if (!readOnly)
MainFrame.itemFinder.clearConsumer(this);
}
-
+
public String validateStructure() {
if (cellEditor != null)
cellEditor.stopCellEditing();
return null;
}
+ @Override
public void changeSelection( int rowIndex, int columnIndex, boolean toggle, boolean extend) {
super.changeSelection(rowIndex, columnIndex, toggle, extend);
DimensionTableModel dimModel = (DimensionTableModel)dataModel;
@@ -361,8 +378,9 @@ public class Dimension extends OutcomeStructure implements ActionListener { }
}
-
- public void grabFocus() {
+
+ @Override
+ public void grabFocus() {
if (mode == TABLE) {
if (table.getSelectedRow() == -1 && table.getRowCount() > 0) {
table.changeSelection(0, 0, false, false);
@@ -371,7 +389,7 @@ public class Dimension extends OutcomeStructure implements ActionListener { table.requestFocus();
}
else if (instances.size()> 0)
- ((DimensionInstance)instances.get(0)).grabFocus();
+ instances.get(0).grabFocus();
}
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java b/source/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java index 07fbe1b..649886b 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java @@ -9,7 +9,7 @@ public class DimensionInstance extends DataRecord { Dimension parentDimension;
int tabNumber;
String tabName = null;
-
+
public DimensionInstance(ElementDecl model, boolean readOnly , HelpPane help, boolean deferred) throws OutcomeException {
super(model, readOnly, help, deferred);
}
@@ -17,14 +17,15 @@ public class DimensionInstance extends DataRecord { public void setTabNumber(int tabNumber) {
this.tabNumber=tabNumber;
}
-
+
public void setParent(Dimension parent) {
this.parentDimension = parent;
}
-
- public String getName() {
+
+ @Override
+ public String getName() {
//TODO appinfo for picking out attributes or child elements for tab name
- if (tabName == null)
+ if (tabName == null)
return Integer.toString(tabNumber);
else
return tabName;
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java b/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java index 1a606fb..45bdbc8 100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/DimensionTableModel.java @@ -4,15 +4,29 @@ import java.util.Enumeration; import javax.swing.table.AbstractTableModel;
-import org.exolab.castor.xml.schema.*;
-import org.w3c.dom.*;
+import org.exolab.castor.xml.schema.Annotated;
+import org.exolab.castor.xml.schema.AttributeDecl;
+import org.exolab.castor.xml.schema.ComplexType;
+import org.exolab.castor.xml.schema.ContentModelGroup;
+import org.exolab.castor.xml.schema.ElementDecl;
+import org.exolab.castor.xml.schema.Group;
+import org.exolab.castor.xml.schema.Order;
+import org.exolab.castor.xml.schema.Particle;
+import org.exolab.castor.xml.schema.SimpleType;
+import org.exolab.castor.xml.schema.SimpleTypesFactory;
+import org.exolab.castor.xml.schema.XMLType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
import com.c2kernel.gui.tabs.outcome.OutcomeException;
import com.c2kernel.utils.Language;
import com.c2kernel.utils.Logger;
public class DimensionTableModel extends AbstractTableModel {
-
+
ElementDecl model;
ArrayList<String> columnHeadings = new ArrayList<String>();
ArrayList<Class<?>> columnClasses = new ArrayList<Class<?>>();
@@ -25,7 +39,7 @@ public class DimensionTableModel extends AbstractTableModel { public DimensionTableModel(ElementDecl model, boolean readOnly) throws StructuralException {
XMLType modelContent = model.getType();
-
+
this.model = model;
this.readOnly = readOnly;
// use text node for simple types
@@ -47,7 +61,7 @@ public class DimensionTableModel extends AbstractTableModel { addColumn(model.getName(), baseType, typeCode, new Boolean(model.getFixedValue() != null));
}
// process attributes
- for (Enumeration e = elementType.getAttributeDecls(); e.hasMoreElements();) {
+ for (Enumeration<?> e = elementType.getAttributeDecls(); e.hasMoreElements();) {
AttributeDecl thisAttr = (AttributeDecl)e.nextElement();
addColumn(thisAttr.getName(), thisAttr, thisAttr.getSimpleType().getTypeCode(), new Boolean(thisAttr.isFixed()));
}
@@ -63,30 +77,30 @@ public class DimensionTableModel extends AbstractTableModel { columnDecls.add(decl);
columnClasses.add(OutcomeStructure.getJavaClass(typeCode));
colReadOnly.add(readOnly);
-
+
// read help
String helpText;
if (decl instanceof SimpleType)
helpText = OutcomeStructure.extractHelp(model);
else
helpText = OutcomeStructure.extractHelp(decl);
-
- if (helpText.length() == 0)
+
+ if (helpText.length() == 0)
helpText = "<i>"+Language.translate("No help is available for this cell")+"</i>";
-
+
colHelp.add(helpText);
}
public void enumerateElements(ContentModelGroup group) throws StructuralException {
- for (Enumeration childElements = group.enumerate(); childElements.hasMoreElements(); ) {
+ for (Enumeration<?> childElements = group.enumerate(); childElements.hasMoreElements(); ) {
Particle thisParticle = (Particle)childElements.nextElement();
String extraHeader = "";
if (thisParticle instanceof Group) {
Group thisGroup = (Group)thisParticle;
Order order = thisGroup.getOrder();
- if (order == Order.sequence || order == Order.all)
+ if (order == Order.sequence || order == Order.all)
enumerateElements(thisGroup);
else // we only support sequences in data structures such as these
throw new StructuralException("Element "+thisGroup.getName()+". Expecting sequence or all. Got "+thisGroup.getOrder());
@@ -101,9 +115,9 @@ public class DimensionTableModel extends AbstractTableModel { if (elementType.getParticleCount() > 0 ||
thisElement.getMaxOccurs() > 1)
throw new StructuralException("Too deep for a table");
- for (Enumeration attrs = elementType.getAttributeDecls(); attrs.hasMoreElements();) {
+ for (Enumeration<?> attrs = elementType.getAttributeDecls(); attrs.hasMoreElements();) {
AttributeDecl thisAttr = (AttributeDecl)attrs.nextElement();
- if (!thisAttr.isFixed())
+ if (!thisAttr.isFixed())
throw new StructuralException("Non-fixed attributes of child elements not supported in tables.");
else
extraHeader=extraHeader+" ("+thisAttr.getName()+":"+(thisAttr.getFixedValue()!=null?thisAttr.getFixedValue():thisAttr.getDefaultValue())+")";
@@ -118,7 +132,7 @@ public class DimensionTableModel extends AbstractTableModel { else
typeCode = ((SimpleType)thisElement.getType()).getTypeCode();
}
-
+
//add to list
addColumn(thisElement.getName()+extraHeader, thisElement, typeCode, new Boolean(thisElement.getFixedValue() != null));
}
@@ -139,35 +153,35 @@ public class DimensionTableModel extends AbstractTableModel { if (childElement.hasChildNodes()) {
Node thisNode = childElement.getFirstChild();
if (thisNode.getNodeType() == Node.TEXT_NODE)
- newRow[i] = OutcomeStructure.getTypedValue(((Text)thisNode).getData(), (Class)columnClasses.get(i));
+ newRow[i] = OutcomeStructure.getTypedValue(((Text)thisNode).getData(), columnClasses.get(i));
else
throw new StructuralException("First child of Field " + thisElementDecl.getName() + " was not Text. (NodeType:"+thisNode.getNodeType()+")");
}
else { // create text node
- newRow[i] = this.setupDefaultElement(thisElementDecl, childElement, (Class)columnClasses.get(i));
+ newRow[i] = this.setupDefaultElement(thisElementDecl, childElement, columnClasses.get(i));
}
break;
case 0: // element is missing - create it
Element newElement = myElement.getOwnerDocument().createElement(thisElementDecl.getName());
myElement.appendChild(newElement); //TODO: not in the right place in sequence. should insert it
- newRow[i] = setupDefaultElement(thisElementDecl, newElement, (Class)columnClasses.get(i));
- break;
+ newRow[i] = setupDefaultElement(thisElementDecl, newElement, columnClasses.get(i));
+ break;
default:
throw new CardinalException("Element "+thisElementDecl.getName()+" appeared more than once.");
}
}
else if (columnDecls.get(i) instanceof AttributeDecl) { //attribute
AttributeDecl thisAttrDecl = (AttributeDecl)columnDecls.get(i);
- newRow[i] = OutcomeStructure.getTypedValue(myElement.getAttribute(thisAttrDecl.getName()), (Class)columnClasses.get(i));
+ newRow[i] = OutcomeStructure.getTypedValue(myElement.getAttribute(thisAttrDecl.getName()), columnClasses.get(i));
}
- else { // first child node
+ else { // first child node
Node thisNode = myElement.getFirstChild();
if (thisNode == null) {
thisNode = myElement.getOwnerDocument().createTextNode("");
myElement.appendChild(thisNode);
}
if (thisNode.getNodeType() == Node.TEXT_NODE || thisNode.getNodeType() == Node.CDATA_SECTION_NODE)
- newRow[i] = OutcomeStructure.getTypedValue(((Text)thisNode).getData(), (Class)columnClasses.get(i));
+ newRow[i] = OutcomeStructure.getTypedValue(((Text)thisNode).getData(), columnClasses.get(i));
else
throw new StructuralException("First child of Column " + myElement.getTagName() + " was not Text");
}
@@ -176,31 +190,37 @@ public class DimensionTableModel extends AbstractTableModel { rows.add(index, newRow);
fireTableRowsInserted(index, index);
}
- public Class<?> getColumnClass(int columnIndex) {
+ @Override
+ public Class<?> getColumnClass(int columnIndex) {
return columnClasses.get(columnIndex);
}
- public String getColumnName(int columnIndex) {
- return (String)columnHeadings.get(columnIndex);
+ @Override
+ public String getColumnName(int columnIndex) {
+ return columnHeadings.get(columnIndex);
}
- public int getRowCount() {
+ @Override
+ public int getRowCount() {
return rows.size();
}
- public int getColumnCount() {
+ @Override
+ public int getColumnCount() {
return columnHeadings.size();
}
- public boolean isCellEditable(int rowIndex, int columnIndex) {
- boolean isReadOnly = readOnly || ((Boolean)colReadOnly.get(columnIndex)).booleanValue();
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ boolean isReadOnly = readOnly || colReadOnly.get(columnIndex).booleanValue();
return !isReadOnly;
}
- public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
- Object[] thisRow = (Object[])rows.get(rowIndex);
+ @Override
+ public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+ Object[] thisRow = rows.get(rowIndex);
thisRow[columnIndex]=aValue;
- Element myElement = (Element)elements.get(rowIndex);
+ Element myElement = elements.get(rowIndex);
// update node
if (columnDecls.get(columnIndex) instanceof ElementDecl) { // sub element
ElementDecl thisDecl = (ElementDecl)columnDecls.get(columnIndex);
@@ -213,7 +233,7 @@ public class DimensionTableModel extends AbstractTableModel { AttributeDecl thisDecl = (AttributeDecl) columnDecls.get(columnIndex);
myElement.setAttribute(thisDecl.getName(), aValue.toString());
}
- else { // first child node
+ else { // first child node
Text textNode = (Text)myElement.getFirstChild();
textNode.setData(aValue.toString());
}
@@ -221,14 +241,14 @@ public class DimensionTableModel extends AbstractTableModel { }
public Element removeRow(int rowIndex) {
- Element elementToGo = (Element)elements.get(rowIndex);
+ Element elementToGo = elements.get(rowIndex);
elements.remove(rowIndex);
rows.remove(rowIndex);
fireTableRowsDeleted(rowIndex,rowIndex);
return elementToGo;
}
-
- public Object setupDefaultElement(ElementDecl thisDecl, Element parent, Class type) {
+
+ public Object setupDefaultElement(ElementDecl thisDecl, Element parent, Class<?> type) {
Object newValue;
String defaultValue = thisDecl.getFixedValue();
if (defaultValue == null)
@@ -237,13 +257,13 @@ public class DimensionTableModel extends AbstractTableModel { newValue = "";
else
newValue = OutcomeStructure.getTypedValue(defaultValue, type);
-
+
Text newNode = parent.getOwnerDocument().createTextNode(newValue.toString());
parent.appendChild(newNode);
// fixed attributes
try {
ComplexType content = (ComplexType)thisDecl.getType();
- for (Enumeration attrs = content.getAttributeDecls(); attrs.hasMoreElements();) {
+ for (Enumeration<?> attrs = content.getAttributeDecls(); attrs.hasMoreElements();) {
AttributeDecl thisAttr = (AttributeDecl)attrs.nextElement();
parent.setAttribute(thisAttr.getName(), thisAttr.getFixedValue()!=null?thisAttr.getFixedValue():thisAttr.getDefaultValue());
}
@@ -251,16 +271,17 @@ public class DimensionTableModel extends AbstractTableModel { return newValue;
}
- public Object getValueAt(int rowIndex, int columnIndex) {
- Object[] thisRow = (Object[])rows.get(rowIndex);
+ @Override
+ public Object getValueAt(int rowIndex, int columnIndex) {
+ Object[] thisRow = rows.get(rowIndex);
if (!(getColumnClass(columnIndex).equals(thisRow[columnIndex].getClass())))
Logger.warning(thisRow[columnIndex]+" should be "+getColumnClass(columnIndex)+" is a "+thisRow[columnIndex].getClass().getName());
return thisRow[columnIndex];
}
-
+
public String validateStructure() { // remove empty rows
for (int j=0; j < rows.size(); j++) {
- Object[] elems = (Object[])rows.get(j);
+ Object[] elems = rows.get(j);
boolean empty = true;
for (int i = 0; i < elems.length && empty; i++)
empty &= OutcomeStructure.isEmpty(elems[i]);
@@ -272,37 +293,37 @@ public class DimensionTableModel extends AbstractTableModel { }
return null;
}
-
+
public Element initNew(Document parent, int index) {
if (index == -1) index = elements.size();
Object[] newRow = new Object[columnHeadings.size()];
Element myElement = parent.createElement(model.getName());
for (int i=0; i<columnDecls.size(); i++) {
- if (columnDecls.get(i) instanceof ElementDecl) { // sub element
+ if (columnDecls.get(i) instanceof ElementDecl) { // sub element
ElementDecl childElementDecl = (ElementDecl)columnDecls.get(i);
Element childElement = parent.createElement(childElementDecl.getName());
- Object newValue = setupDefaultElement(childElementDecl, childElement, (Class)columnClasses.get(i));
+ Object newValue = setupDefaultElement(childElementDecl, childElement, columnClasses.get(i));
myElement.appendChild(childElement);
newRow[i] = newValue;
}
else if (columnDecls.get(i) instanceof AttributeDecl) { //attribute
AttributeDecl thisAttrDecl = (AttributeDecl)columnDecls.get(i);
String newValue = thisAttrDecl.getFixedValue()!=null?thisAttrDecl.getFixedValue():thisAttrDecl.getDefaultValue();
- newRow[i] = OutcomeStructure.getTypedValue(newValue, (Class)columnClasses.get(i));
+ newRow[i] = OutcomeStructure.getTypedValue(newValue, columnClasses.get(i));
myElement.setAttribute(thisAttrDecl.getName(), newRow[i].toString());
}
- else { // first child node
- newRow[i] = setupDefaultElement(model, myElement, (Class)columnClasses.get(i));
+ else { // first child node
+ newRow[i] = setupDefaultElement(model, myElement, columnClasses.get(i));
}
}
elements.add(index,myElement);
rows.add(index, newRow);
fireTableRowsInserted(index,index);
return myElement;
- }
-
+ }
+
public String getHelp(int i) {
- return (String)colHelp.get(i);
+ return colHelp.get(i);
}
-
+
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/Field.java b/source/com/c2kernel/gui/tabs/outcome/form/Field.java index e1bc35c..9d21c97 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/Field.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/Field.java @@ -58,16 +58,18 @@ public class Field extends OutcomeStructure { return myAttributes;
}
- public void addStructure(OutcomeStructure newElement) throws StructuralException {
+ @Override
+ public void addStructure(OutcomeStructure newElement) throws StructuralException {
throw new StructuralException("Field "+model.getName()+" cannot have child structures");
}
- public void addInstance(Element myElement, Document parentDoc) throws OutcomeException {
+ @Override
+ public void addInstance(Element myElement, Document parentDoc) throws OutcomeException {
Logger.msg(6, "Accepting Field "+myElement.getTagName());
if (this.myElement != null) throw new CardinalException("Field "+this.getName()+" cannot repeat");
this.myElement = myElement;
- try {
+ try {
if (myElementPanel == null)
Logger.error("Field should be empty. Discarding contents.");
else {
@@ -77,9 +79,9 @@ public class Field extends OutcomeStructure { textNode = parentDoc.createTextNode(getDefaultValue());
myElement.appendChild(textNode);
}
-
+
myElementPanel.setData(textNode);
- }
+ }
} catch (ClassCastException ex) {
throw new StructuralException("First child node of Field " + this.getName() + " was not Text: "+myElement.getFirstChild().getNodeType());
}
@@ -88,7 +90,8 @@ public class Field extends OutcomeStructure { // check if valid
- public String validateStructure() {
+ @Override
+ public String validateStructure() {
myAttributes.validateAttributes();
if (myElementPanel != null) myElementPanel.updateNode();
Text contents = (Text)myElement.getFirstChild();
@@ -99,7 +102,8 @@ public class Field extends OutcomeStructure { return null;
}
- public Element initNew(Document parent) {
+ @Override
+ public Element initNew(Document parent) {
Logger.msg(6, "Creating Field "+this.getName());
// make a new Element
@@ -119,7 +123,7 @@ public class Field extends OutcomeStructure { return myElement;
}
-
+
private String getDefaultValue() {
String defaultValue = model.getFixedValue();
if (defaultValue == null) defaultValue = model.getDefaultValue();
@@ -127,7 +131,8 @@ public class Field extends OutcomeStructure { return defaultValue;
}
- public void grabFocus() {
+ @Override
+ public void grabFocus() {
if (myElementPanel != null)
myElementPanel.grabFocus();
else
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/HelpPane.java b/source/com/c2kernel/gui/tabs/outcome/form/HelpPane.java index 0f0f812..aa8e13e 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/HelpPane.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/HelpPane.java @@ -15,9 +15,9 @@ import com.c2kernel.utils.Language; **************************************************************************/
public class HelpPane extends JEditorPane {
-
+
public static final String header = "<h2><font color=\"blue\">"+Language.translate("Help")+"</font></h2>";
-
+
public HelpPane() {
super();
setEditable(false);
@@ -25,24 +25,24 @@ public class HelpPane extends JEditorPane { setContentType("text/html");
setPreferredSize(new java.awt.Dimension(200,400));
}
-
+
public void setHelp(String title, String helpText) {
setText(header+"<h3>"+title+"</h3><br>"+toHTML(helpText));
}
-
+
/**
* Unfortunately JEditorPane will only display HTML3.2, whereas to embed HTML in an xsd we must
* use XHTML so it will be valid XML. This method does a quick and dirty removal of stuff that
* the JEditorPane cannot display
- *
+ *
* @param xhtml
* @return
*/
public static String toHTML(String xhtml) {
int startPos, endPos;
//remove xml header
- while((startPos = xhtml.indexOf("<?")) != -1 &&
+ while((startPos = xhtml.indexOf("<?")) != -1 &&
(endPos = xhtml.indexOf("?>")) != -1) {
xhtml = xhtml.substring(0,startPos)+xhtml.substring(endPos+2);
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java b/source/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java index d9f6b55..3c5da27 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/MultiLinePasteAdapter.java @@ -1,12 +1,19 @@ package com.c2kernel.gui.tabs.outcome.form;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.util.StringTokenizer;
-import com.c2kernel.utils.Logger;
+import javax.swing.JComponent;
+import javax.swing.JOptionPane;
+import javax.swing.JTable;
+import javax.swing.KeyStroke;
-import java.awt.datatransfer.*;
-import java.util.*;
+import com.c2kernel.utils.Logger;
/**
* ExcelAdapter enables Copy-Paste Clipboard functionality on JTables.
* The clipboard data format used by the adapter is compatible with
@@ -64,7 +71,8 @@ public class MultiLinePasteAdapter implements ActionListener { * Paste is done by aligning the upper left corner of the selection with the
* 1st element in the current selection of the JTable.
*/
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().compareTo("Copy") == 0) {
StringBuffer sbf = new StringBuffer();
// Check to ensure we have selected only a contiguous block of
@@ -127,7 +135,7 @@ public class MultiLinePasteAdapter implements ActionListener { } catch (Exception ex) {
Logger.exceptionDialog(ex);
}
-
+
}
}
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java b/source/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java index 10c3542..7809480 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/OutcomeEditor.java @@ -27,14 +27,14 @@ class OutcomeEditor extends JFrame implements ActionListener { JFileChooser chooser;
OutcomePanel outcome;
OutcomeValidator thisValid;
-
+
public OutcomeEditor(File schema, File instance, boolean readOnly) {
URL schemaURL = null;
URL instanceURL = null;
schemaFile = schema;
instanceFile = instance;
this.readOnly = readOnly;
-
+
try {
chooser = new JFileChooser();
chooser.setCurrentDirectory(new File(new File(".").getCanonicalPath()));
@@ -47,12 +47,13 @@ class OutcomeEditor extends JFrame implements ActionListener { this.setTitle("Outcome Editor");
GridBagLayout gridbag = new GridBagLayout();
getContentPane().setLayout(gridbag);
-
+
addWindowListener(
new java.awt.event.WindowAdapter() {
- public void windowClosing(java.awt.event.WindowEvent evt) {
+ @Override
+ public void windowClosing(java.awt.event.WindowEvent evt) {
System.exit(0);
- }
+ }
}
);
// select files if url is empty
@@ -64,12 +65,12 @@ class OutcomeEditor extends JFrame implements ActionListener { System.exit(1);
}
}
-
+
try {
schemaURL = schemaFile.toURL();
- } catch (Exception e) {
+ } catch (Exception e) {
System.out.println("Invalid schema URL");
- System.exit(1);
+ System.exit(1);
}
if (instanceFile == null) { // prompt for schema
@@ -79,7 +80,7 @@ class OutcomeEditor extends JFrame implements ActionListener { try {
instanceURL = instanceFile.toURL();
} catch (Exception e) { }
-
+
try {
if (instanceFile != null && instanceFile.exists())
outcome = new OutcomePanel(schemaURL, instanceURL, readOnly);
@@ -93,14 +94,14 @@ class OutcomeEditor extends JFrame implements ActionListener { thisValid = OutcomeValidator.getValidator(thisSchema);
} catch (Exception e) { e.printStackTrace(); System.exit(0);}
-
-
+
+
GridBagConstraints c = new GridBagConstraints();
c.gridx = 0; c.gridy = 0;
c.anchor = GridBagConstraints.NORTHWEST;
c.fill = GridBagConstraints.BOTH;
c.weightx = 1.0; c.weighty = 1.0;
- c.gridwidth = 2; c.ipadx = 5; c.ipady = 5;
+ c.gridwidth = 2; c.ipadx = 5; c.ipady = 5;
gridbag.setConstraints(outcome, c);
this.getContentPane().add(outcome);
@@ -111,7 +112,7 @@ class OutcomeEditor extends JFrame implements ActionListener { gridbag.setConstraints(saveButton, c);
this.getContentPane().add(saveButton);
if (readOnly) saveButton.setEnabled(false);
-
+
JButton saveAsButton = new JButton("Save As");
saveAsButton.setActionCommand("saveas");
saveAsButton.addActionListener(this);
@@ -165,18 +166,19 @@ class OutcomeEditor extends JFrame implements ActionListener { new OutcomeEditor(schema, instance, readOnly);
}
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().indexOf("save") == 0) {
String output;
output = outcome.getOutcome();
-
+
String errors = thisValid.validate(output);
if (errors != null && errors.length() > 0) {
int choice = JOptionPane.showConfirmDialog(null, errors+"\n\nSave anyway?", "Errors validating document", JOptionPane.YES_NO_OPTION);
if (choice != JOptionPane.YES_OPTION)
return;
}
-
+
if (instanceFile == null || e.getActionCommand().equals("saveas")) {
instanceFile = getFile("Choose Instance File", "xml");
if (instanceFile == null) {
@@ -200,11 +202,13 @@ class OutcomeEditor extends JFrame implements ActionListener { this.extension = extension;
}
- public String getDescription() {
+ @Override
+ public String getDescription() {
return extension.toUpperCase()+" Files";
}
- public boolean accept(File f) {
+ @Override
+ public boolean accept(File f) {
if ((f.isFile() && f.getName().endsWith(extension.toLowerCase())) || f.isDirectory()) {
return true;
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java b/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java index 4bb7347..6d20183 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java @@ -89,7 +89,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler splitPane.setDividerSize(9);
pane = splitPane;
}
-
+
GridBagConstraints c = new GridBagConstraints();
c.gridx = 0;
@@ -165,8 +165,9 @@ public class OutcomePanel extends JPanel implements OutcomeHandler this.setOutcome(outcomeURL);
}
- // Parse from Strings
- public void setOutcome(String outcome) throws InvalidOutcomeException
+ // Parse from Strings
+ @Override
+ public void setOutcome(String outcome) throws InvalidOutcomeException
{
try
@@ -179,7 +180,8 @@ public class OutcomePanel extends JPanel implements OutcomeHandler }
}
- public void setDescription(String schema) throws InvalidSchemaException
+ @Override
+ public void setDescription(String schema) throws InvalidSchemaException
{
if (schema == null)
throw new InvalidSchemaException("Null schema supplied");
@@ -194,7 +196,8 @@ public class OutcomePanel extends JPanel implements OutcomeHandler }
- public void setReadOnly(boolean readOnly)
+ @Override
+ public void setReadOnly(boolean readOnly)
{
this.readOnly = readOnly;
}
@@ -218,7 +221,8 @@ public class OutcomePanel extends JPanel implements OutcomeHandler }
}
- public void run()
+ @Override
+ public void run()
{
Thread.currentThread().setName("Outcome Panel Builder");
try
@@ -271,7 +275,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler ElementDecl rootElementDecl = null;
docElement = (outcomeDOM == null) ? null : outcomeDOM.getDocumentElement();
- for (Enumeration globalElements = schemaSOM.getElementDecls(); globalElements.hasMoreElements();)
+ for (Enumeration<?> globalElements = schemaSOM.getElementDecls(); globalElements.hasMoreElements();)
{
rootElementDecl = (ElementDecl) globalElements.nextElement();
// REVISIT: We don't detect which is the most likely root element if there is more than one root decl
@@ -284,7 +288,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler if (rootElementDecl == null)
throw new InvalidSchemaException("No root elements defined");
documentRoot = new DataRecord(rootElementDecl, readOnly, help, false);
-
+
Logger.msg(5, "Finished structure. Populating...");
if (docElement == null)
{
@@ -302,7 +306,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler outcomeTab.addTab(rootElementDecl.getName(), documentRoot);
outcomeTab.setSelectedIndex(0);
- scrollpane.setViewportView(outcomeTab);
+ scrollpane.setViewportView(outcomeTab);
panelBuilt = true;
revalidate();
@@ -311,12 +315,14 @@ public class OutcomePanel extends JPanel implements OutcomeHandler documentRoot.grabFocus();
}
- public JPanel getPanel() throws OutcomeNotInitialisedException
+ @Override
+ public JPanel getPanel() throws OutcomeNotInitialisedException
{
return this;
}
- public String getOutcome()
+ @Override
+ public String getOutcome()
{
if (useForm)
{
@@ -348,14 +354,17 @@ public class OutcomePanel extends JPanel implements OutcomeHandler return serializedDoc;
}
- public boolean isUnsaved() {
+ @Override
+ public boolean isUnsaved() {
return unsaved;
}
-
- public void saved() {
+
+ @Override
+ public void saved() {
unsaved = false;
}
-
+
+ @Override
public void export(File targetFile) throws Exception {
FileStringUtility.string2File(targetFile, getOutcome());
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java b/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java index a535da6..aee09df 100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/OutcomeStructure.java @@ -4,7 +4,6 @@ import java.math.BigInteger; import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import javax.swing.ImageIcon;
import javax.swing.JPanel;
@@ -49,11 +48,11 @@ public abstract class OutcomeStructure extends JPanel { subStructure = new HashMap<String, OutcomeStructure>();
Logger.msg(8, "Creating " + model.getName() + " structure as " +
this.getClass().getName().substring(this.getClass().getName().lastIndexOf('.') + 1));
-
+
String doc = extractHelp(model);
if (doc.length() > 0) help = doc;
}
-
+
public boolean getReadOnly() {
return readOnly;
}
@@ -69,21 +68,21 @@ public abstract class OutcomeStructure extends JPanel { public OutcomeStructure createStructure(ElementDecl model, boolean readOnly, HelpPane help) throws OutcomeException {
XMLType elementType = model.getType();
ComplexType elementComplexType;
-
+
if (model.getMaxOccurs() == 0) return null;
-
+
// if more than one can occur - dimension
- if (model.getMaxOccurs() > 1
- || model.getMaxOccurs() == Particle.UNBOUNDED
- || model.getMinOccurs() == 0)
+ if (model.getMaxOccurs() > 1
+ || model.getMaxOccurs() == Particle.UNBOUNDED
+ || model.getMinOccurs() == 0)
return new Dimension(model, readOnly, help);
-
+
// must have a type from now on
if (elementType == null)
throw new StructuralException("Element "+model.getName()+" is elementary yet has no type.");
// simple types will be fields
if (elementType instanceof SimpleType) return new Field(model, readOnly, help);
-
+
// otherwise is a complex type
try {
elementComplexType = (ComplexType)elementType;
@@ -91,10 +90,10 @@ public abstract class OutcomeStructure extends JPanel { catch (ClassCastException e) {
throw new StructuralException("Unknown XMLType for element " + model.getName());
}
-
+
//when no element children - field
if (elementComplexType.getParticleCount() == 0) return new Field(model, readOnly, help);
-
+
//everything else is a data record
return new DataRecord(model, readOnly, help, deferChild);
}
@@ -113,11 +112,11 @@ public abstract class OutcomeStructure extends JPanel { enumerateElements((ComplexType)base);
}
- for (Enumeration elements = group.enumerate(); elements.hasMoreElements(); ) {
+ for (Enumeration<?> elements = group.enumerate(); elements.hasMoreElements(); ) {
Particle thisParticle = (Particle)elements.nextElement();
if (thisParticle instanceof Group) {
Group thisGroup = (Group)thisParticle;
- if (thisGroup instanceof ModelGroup) {
+ if (thisGroup instanceof ModelGroup) {
// HACK: Castor strangeness - model groups don't seem to resolve their own references. If fixed, this will still work
ModelGroup thisModel = (ModelGroup)thisGroup;
if (thisModel.hasReference()) thisGroup = thisModel.getReference();
@@ -152,39 +151,39 @@ public abstract class OutcomeStructure extends JPanel { public Element getElement() {
return myElement;
}
-
- public String getName() {
+
+ @Override
+ public String getName() {
if (model == null) return null;
return model.getName();
}
-
+
public ElementDecl getModel() {
return model;
}
-
+
public String getHelp() {
return help;
}
-
+
public String validateStructure() {
StringBuffer errors = new StringBuffer();
- for (Iterator iter = subStructure.values().iterator(); iter.hasNext();) {
- OutcomeStructure element = (OutcomeStructure)iter.next();
+ for (OutcomeStructure element : subStructure.values()) {
errors.append(element.validateStructure());
}
return errors.toString();
}
-
+
public abstract Element initNew(Document parent);
-
+
public static String extractHelp(Annotated model) {
- Enumeration e = model.getAnnotations();
+ Enumeration<?> e = model.getAnnotations();
StringBuffer doc = new StringBuffer();
if (e.hasMoreElements()) { // look for HTML
Annotation note = (Annotation)e.nextElement();
- for (Enumeration g = note.getDocumentation(); g.hasMoreElements();) {
+ for (Enumeration<?> g = note.getDocumentation(); g.hasMoreElements();) {
Documentation thisDoc = (Documentation)g.nextElement();
- for (Enumeration h = thisDoc.getObjects(); h.hasMoreElements();) {
+ for (Enumeration<?> h = thisDoc.getObjects(); h.hasMoreElements();) {
AnyNode node = (AnyNode)h.nextElement();
String line = node.toString();
if (line.length() == 0)
@@ -193,21 +192,22 @@ public abstract class OutcomeStructure extends JPanel { doc.append(line).append("\n");
}
}
- }
+ }
}
-
+
return doc.toString();
}
-
- public abstract void grabFocus();
- public static Class getJavaClass(int typeCode) {
+ @Override
+ public abstract void grabFocus();
+
+ public static Class<?> getJavaClass(int typeCode) {
switch (typeCode) {
-
+
// boolean
case SimpleTypesFactory.BOOLEAN_TYPE:
return Boolean.class;
-
+
// integers
case SimpleTypesFactory.INTEGER_TYPE:
case SimpleTypesFactory.NON_POSITIVE_INTEGER_TYPE:
@@ -216,7 +216,7 @@ public abstract class OutcomeStructure extends JPanel { case SimpleTypesFactory.POSITIVE_INTEGER_TYPE:
case SimpleTypesFactory.INT_TYPE:
case SimpleTypesFactory.UNSIGNED_INT_TYPE:
- case SimpleTypesFactory.SHORT_TYPE:
+ case SimpleTypesFactory.SHORT_TYPE:
case SimpleTypesFactory.UNSIGNED_SHORT_TYPE:
case SimpleTypesFactory.LONG_TYPE:
case SimpleTypesFactory.UNSIGNED_LONG_TYPE:
@@ -228,19 +228,19 @@ public abstract class OutcomeStructure extends JPanel { case SimpleTypesFactory.DOUBLE_TYPE:
case SimpleTypesFactory.DECIMAL_TYPE:
return BigDecimal.class;
-
+
// images
case SimpleTypesFactory.BASE64BINARY_TYPE:
case SimpleTypesFactory.HEXBINARY_TYPE:
return ImageIcon.class;
-
- // everything else is a string for now
+
+ // everything else is a string for now
default:
return String.class;
}
}
-
- public static Object getTypedValue(String value, Class type) {
+
+ public static Object getTypedValue(String value, Class<?> type) {
try {
if (type.equals(Boolean.class))
if (value == null || value.equals(""))
@@ -250,7 +250,7 @@ public abstract class OutcomeStructure extends JPanel { else if (type.equals(BigInteger.class))
if (value == null || value.equals(""))
return new BigInteger("0");
- else
+ else
return new BigInteger(value);
else if (type.equals(BigDecimal.class))
if (value == null || value.equals(""))
@@ -262,10 +262,10 @@ public abstract class OutcomeStructure extends JPanel { }
return value==null?"":value;
}
-
+
public static boolean isEmpty(Object value) {
if (value == null) return true;
-
+
if (value instanceof String) {
if (((String)value).length() == 0) return true;
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayEditField.java index e7dc8bc..742d1b4 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayEditField.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayEditField.java @@ -25,7 +25,7 @@ import com.c2kernel.utils.Language; **************************************************************************/
public class ArrayEditField extends StringEditField implements ActionListener {
-
+
Box arrayBox;
Box expandBox;
Box editBox;
@@ -34,20 +34,20 @@ public class ArrayEditField extends StringEditField implements ActionListener { JButton expandButton;
JButton contractButton;
JButton addButton;
- JButton removeButton;
+ JButton removeButton;
ArrayTableModel arrayModel;
JLabel arrayLabel = new JLabel("Array");
boolean panelShown = false;
boolean readOnly = false;
-
+
public ArrayEditField(SimpleType type) {
- arrayBox = Box.createVerticalBox();
+ arrayBox = Box.createVerticalBox();
arrayBox.add(arrayLabel);
arrayButton = new JButton(Language.translate("Show"));
arrayButton.addActionListener(this);
arrayButton.setActionCommand("toggle");
arrayBox.add(arrayButton);
-
+
expandBox = Box.createHorizontalBox();
expandButton = new JButton(">>");
expandButton.setToolTipText("Increase the number of columns displaying this array");
@@ -58,15 +58,15 @@ public class ArrayEditField extends StringEditField implements ActionListener { contractButton.setToolTipText("Decrease the number of columns displaying this array");
contractButton.addActionListener(this);
contractButton.setActionCommand("contract");
-
+
expandBox.add(contractButton);
expandBox.add(Box.createHorizontalGlue());
expandBox.add(expandButton);
-
+
arrayModel = new ArrayTableModel(type);
if (arrayModel.getColumnCount() < 2) contractButton.setEnabled(false);
arrayView = new JScrollPane(new JTable(arrayModel));
-
+
editBox = Box.createHorizontalBox();
addButton = new JButton("+");
addButton.setToolTipText("Add a field to the end of this array");
@@ -75,7 +75,7 @@ public class ArrayEditField extends StringEditField implements ActionListener { removeButton = new JButton("-");
removeButton.setToolTipText("Remove the last field from this array");
removeButton.addActionListener(this);
- removeButton.setActionCommand("remove");
+ removeButton.setActionCommand("remove");
editBox.add(addButton);
editBox.add(Box.createHorizontalGlue());
editBox.add(removeButton);
@@ -83,32 +83,37 @@ public class ArrayEditField extends StringEditField implements ActionListener { /**
*
*/
- public String getDefaultValue() {
+ @Override
+ public String getDefaultValue() {
return "";
}
/**
*
*/
- public String getText() {
+ @Override
+ public String getText() {
return arrayModel.getData();
}
/**
*
*/
- public void setText(String text) {
+ @Override
+ public void setText(String text) {
arrayModel.setData(text);
arrayLabel.setText("Array ("+arrayModel.getArrayLength()+" values)");
}
/**
*
*/
- public Component getControl() {
+ @Override
+ public Component getControl() {
return arrayBox;
}
/**
*
*/
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals("toggle")) {
arrayBox.removeAll();
if (panelShown) {
@@ -122,7 +127,7 @@ public class ArrayEditField extends StringEditField implements ActionListener { arrayBox.add(Box.createVerticalStrut(7));
arrayBox.add(arrayButton);
arrayBox.add(Box.createVerticalStrut(7));
- arrayBox.add(expandBox);
+ arrayBox.add(expandBox);
arrayBox.add(Box.createVerticalStrut(7));
arrayBox.add(arrayView);
if (!readOnly) arrayBox.add(editBox);
@@ -138,7 +143,7 @@ public class ArrayEditField extends StringEditField implements ActionListener { else if (e.getActionCommand().equals("remove")) {
arrayModel.removeField();
arrayLabel.setText("Array ("+arrayModel.getArrayLength()+" values)");
- }
+ }
else {
int currentCols = arrayModel.getColumnCount();
if (e.getActionCommand().equals("extend"))
@@ -154,10 +159,12 @@ public class ArrayEditField extends StringEditField implements ActionListener { /**
*
*/
- public JTextComponent makeTextField() {
+ @Override
+ public JTextComponent makeTextField() {
// not used by array
return null;
}
+ @Override
public void setEditable(boolean editable) {
readOnly = !editable;
arrayModel.setReadOnly(!readOnly);
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java index c7934c0..341c33a 100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ArrayTableModel.java @@ -23,10 +23,10 @@ import com.c2kernel.utils.Language; public class ArrayTableModel extends AbstractTableModel {
ArrayList<Object> contents = new ArrayList<Object>();
- Class type;
+ Class<?> type;
int numCols = 1;
boolean readOnly = false;
-
+
public ArrayTableModel(SimpleType type) {
super();
this.type = OutcomeStructure.getJavaClass(type.getTypeCode());
@@ -35,7 +35,7 @@ public class ArrayTableModel extends AbstractTableModel { public void setReadOnly(boolean readOnly) {
this.readOnly = readOnly;
}
-
+
public void setData(String data) {
contents.clear();
StringTokenizer tok = new StringTokenizer(data);
@@ -43,16 +43,16 @@ public class ArrayTableModel extends AbstractTableModel { contents.add(OutcomeStructure.getTypedValue(tok.nextToken(), type));
fireTableStructureChanged();
}
-
+
public String getData() {
if (contents.size() == 0) return "";
- Iterator iter = contents.iterator();
+ Iterator<Object> iter = contents.iterator();
StringBuffer result = new StringBuffer(iter.next().toString());
while (iter.hasNext())
result.append(" ").append(iter.next().toString());
return result.toString();
}
-
+
public void addField() {
contents.add(OutcomeStructure.getTypedValue("", type));
fireTableStructureChanged();
@@ -62,45 +62,52 @@ public class ArrayTableModel extends AbstractTableModel { contents.remove(contents.size()-1);
fireTableStructureChanged();
}
-
- public Class<?> getColumnClass(int columnIndex) {
+
+ @Override
+ public Class<?> getColumnClass(int columnIndex) {
return type;
}
- public int getColumnCount() {
+ @Override
+ public int getColumnCount() {
return numCols;
}
-
+
public int getArrayLength() {
return contents.size();
}
-
+
public void setColumnCount(int newCols) {
numCols = newCols;
fireTableStructureChanged();
}
- public String getColumnName(int column) {
+ @Override
+ public String getColumnName(int column) {
return Language.translate("Value");
}
- public int getRowCount() {
+ @Override
+ public int getRowCount() {
return (contents.size()/numCols)+1;
}
- public Object getValueAt(int arg0, int arg1) {
+ @Override
+ public Object getValueAt(int arg0, int arg1) {
int index = arg1+(arg0 * numCols);
if (index >= contents.size())
return null;
return contents.get(arg1+(arg0 * numCols));
}
- public boolean isCellEditable(int rowIndex, int columnIndex) {
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
if (columnIndex+(rowIndex*numCols) > contents.size()-1) return false;
return !readOnly;
}
- public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+ @Override
+ public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
contents.set(columnIndex+(rowIndex*numCols), aValue);
}
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/BooleanEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/BooleanEditField.java index 5776f73..c831eb4 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/BooleanEditField.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/BooleanEditField.java @@ -17,51 +17,58 @@ import com.c2kernel.utils.Logger; * All rights reserved.
**************************************************************************/
public class BooleanEditField extends StringEditField {
-
+
JCheckBox checkbox;
-
+
public BooleanEditField() {
checkbox = new JCheckBox();
checkbox.setSelected(false);
checkbox.addFocusListener(this);
}
-
- public String getText() {
+
+ @Override
+ public String getText() {
return String.valueOf(checkbox.isSelected());
}
- public void setText(String text) {
+ @Override
+ public void setText(String text) {
boolean newState = false;
try {
newState = Boolean.valueOf(text).booleanValue();
} catch (Exception ex) {
Logger.error("Invalid value for checkbox: "+text);
}
- checkbox.setSelected(newState);
+ checkbox.setSelected(newState);
}
- public void setEditable(boolean editable) {
+ @Override
+ public void setEditable(boolean editable) {
super.setEditable(editable);
checkbox.setEnabled(editable);
}
- public Component getControl() {
+ @Override
+ public Component getControl() {
return checkbox;
}
-
- public String getDefaultValue() {
+
+ @Override
+ public String getDefaultValue() {
return "false";
- }
-
+ }
+
/** don't reserve the item finder for a boolean */
- public void focusGained(FocusEvent e) {
+ @Override
+ public void focusGained(FocusEvent e) {
helpPane.setHelp(name, helpText);
}
-
+
/**
*
*/
- public JTextComponent makeTextField() {
+ @Override
+ public JTextComponent makeTextField() {
// not used by boolean
return null;
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java index 303a870..ef56046 100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java @@ -19,9 +19,9 @@ import com.c2kernel.scripting.Script; import com.c2kernel.utils.Logger;
/*******************************************************************************
- *
+ *
* $Revision: 1.4 $ $Date: 2005/08/16 13:59:56 $
- *
+ *
* Copyright (C) 2003 CERN - European Organization for Nuclear Research All
* rights reserved.
******************************************************************************/
@@ -40,28 +40,33 @@ public class ComboField extends StringEditField { this.listNode = listNode;
createLOV();
}
-
- public String getDefaultValue() {
+
+ @Override
+ public String getDefaultValue() {
if (vals.getDefaultKey() != null)
return vals.get(vals.getDefaultKey()).toString();
else
return "";
}
- public String getText() {
+ @Override
+ public String getText() {
return vals.get(comboModel.getSelectedItem()).toString();
}
- public JTextComponent makeTextField() {
+ @Override
+ public JTextComponent makeTextField() {
// not used by this control
return null;
}
- public void setText(String text) {
+ @Override
+ public void setText(String text) {
comboModel.setSelectedItem(text);
}
- public Component getControl() {
+ @Override
+ public Component getControl() {
return comboField;
}
@@ -76,12 +81,12 @@ public class ComboField extends StringEditField { if (lovType.equals("PathList"))
populateLOVFromLDAP(param);
}
-
+
// handle enumerations
// TODO: should be ANDed with above results
if (content.hasFacet(Facet.ENUMERATION)) {
//ListOfValues andList = new ListOfValues();
- Enumeration enums = content.getFacets(Facet.ENUMERATION);
+ Enumeration<?> enums = content.getFacets(Facet.ENUMERATION);
while (enums.hasMoreElements()) {
Facet thisEnum = (Facet)enums.nextElement();
vals.put(thisEnum.getValue(), thisEnum.getValue(), false);
@@ -99,8 +104,8 @@ public class ComboField extends StringEditField { */
private void populateLOVFromLDAP(String param) {
// TODO '/root/path;prop=val;prop=val'
-
-
+
+
}
private void populateLOVFromScript(String scriptName) {
@@ -116,12 +121,14 @@ public class ComboField extends StringEditField { }
}
- public void setDecl(AttributeDecl model) throws StructuralException {
+ @Override
+ public void setDecl(AttributeDecl model) throws StructuralException {
super.setDecl(model);
createLOV();
}
- public void setDecl(ElementDecl model) throws StructuralException {
+ @Override
+ public void setDecl(ElementDecl model) throws StructuralException {
super.setDecl(model);
createLOV();
}
@@ -130,7 +137,8 @@ public class ComboField extends StringEditField { *
*/
- public void setEditable(boolean editable) {
+ @Override
+ public void setEditable(boolean editable) {
comboField.setEditable(editable);
}
}
\ No newline at end of file diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java index d77dff3..fabaed8 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/DecimalEditField.java @@ -26,44 +26,50 @@ public class DecimalEditField extends StringEditField { field.setToolTipText("This field must contains a decimal number e.g. 3.14159265");
}
- public String getText() {
+ @Override
+ public String getText() {
return field.getText();
}
- public void setText(String text) {
+ @Override
+ public void setText(String text) {
field.setText(text);
}
-
- public String getDefaultValue() {
+
+ @Override
+ public String getDefaultValue() {
return "0.0";
- }
-
- public JTextComponent makeTextField() {
+ }
+
+ @Override
+ public JTextComponent makeTextField() {
return new DecimalTextField();
}
-
+
private class DecimalTextField extends JTextField {
public DecimalTextField() {
super();
setHorizontalAlignment(RIGHT);
}
- protected Document createDefaultModel() {
+ @Override
+ protected Document createDefaultModel() {
return new Decimal();
}
}
-
+
private class Decimal extends PlainDocument {
BigDecimal currentVal = new BigDecimal(0.0);
- public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+ @Override
+ public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
if (str == null || str.equals("")) {
return;
}
-
+
String proposedResult = null;
if (getLength() == 0) {
@@ -73,23 +79,24 @@ public class DecimalEditField extends StringEditField { currentBuffer.insert(offs, str);
proposedResult = currentBuffer.toString();
}
-
+
try {
currentVal = parse(proposedResult);
super.insertString(offs, str, a);
} catch (Exception e) {
Toolkit.getDefaultToolkit().beep();
}
-
+
}
- public void remove(int offs, int len) throws BadLocationException {
+ @Override
+ public void remove(int offs, int len) throws BadLocationException {
String currentText = this.getText(0, getLength());
String beforeOffset = currentText.substring(0, offs);
String afterOffset = currentText.substring(len + offs, currentText.length());
String proposedResult = beforeOffset + afterOffset;
-
+
if (proposedResult.length() == 0) { // empty is ok
super.remove(offs, len);
return;
@@ -97,17 +104,17 @@ public class DecimalEditField extends StringEditField { try {
currentVal = parse(proposedResult);
super.remove(offs, len);
- } catch (Exception e) {
+ } catch (Exception e) {
Toolkit.getDefaultToolkit().beep();
}
- }
+ }
public BigDecimal parse(String proposedResult) throws NumberFormatException {
BigDecimal value = new BigDecimal(0);
if ( proposedResult.length() != 0) {
- value = new BigDecimal(proposedResult);
+ value = new BigDecimal(proposedResult);
}
return value;
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/FieldConstraints.java b/source/com/c2kernel/gui/tabs/outcome/form/field/FieldConstraints.java deleted file mode 100755 index d09cd91..0000000 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/FieldConstraints.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.c2kernel.gui.tabs.outcome.form.field;
-
-import java.util.Enumeration;
-
-import org.exolab.castor.types.AnyNode;
-import org.exolab.castor.xml.schema.Annotation;
-import org.exolab.castor.xml.schema.AppInfo;
-import org.exolab.castor.xml.schema.XMLType;
-
-/**************************************************************************
- *
- * $Revision: 1.1 $
- * $Date: 2005/04/26 06:48:12 $
- *
- * Copyright (C) 2003 CERN - European Organization for Nuclear Research
- * All rights reserved.
- **************************************************************************/
-
-public class FieldConstraints {
-
- XMLType content;
- ListOfValues lov;
- int rows = 1;
-
- public FieldConstraints(XMLType content) {
- this.content = content;
- Enumeration e = content.getAnnotations();
- while (e.hasMoreElements()) {
- Annotation note = (Annotation)e.nextElement();
- for (Enumeration f = note.getAppInfo(); f.hasMoreElements();) {
- addAppInfo((AppInfo)f.nextElement());
- }
- }
- }
-
- private void addAppInfo(AppInfo element) {
- Enumeration e = element.getObjects();
- while (e.hasMoreElements()) {
- AnyNode node = (AnyNode)e.nextElement();
-
- }
- }
-
- public ListOfValues getLOV() {
- return lov;
- }
-
- public int getRows() {
- return rows;
- }
-}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java index b0bb079..716a073 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java @@ -31,15 +31,17 @@ public class ImageEditField extends StringEditField { static JFileChooser chooser = new JFileChooser();
static {
chooser.addChoosableFileFilter(new javax.swing.filechooser.FileFilter() {
+ @Override
public String getDescription() {
return "Image Files";
}
+ @Override
public boolean accept(File f) {
return (f.isDirectory() || (f.isFile() && (f.getName()
.endsWith(".gif")
|| f.getName().endsWith(".jpg")
- || f.getName().endsWith(".jpeg")
+ || f.getName().endsWith(".jpeg")
|| f.getName().endsWith(".png"))));
}
});
@@ -51,6 +53,7 @@ public class ImageEditField extends StringEditField { imagePanel = Box.createVerticalBox();
browseButton = new JButton("Browse");
browseButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
int returnVal = chooser.showOpenDialog(null);
if (returnVal == JFileChooser.APPROVE_OPTION) {
@@ -77,18 +80,22 @@ public class ImageEditField extends StringEditField { imagePanel.add(browseButton);
}
+ @Override
public String getDefaultValue() {
return "";
}
+ @Override
public Component getControl() {
return imagePanel;
}
+ @Override
public String getText() {
return encodedImage == null ? "" : encodedImage;
}
+ @Override
public void setText(String text) {
encodedImage = text;
if (text != null && text.length() > 0) {
@@ -98,6 +105,7 @@ public class ImageEditField extends StringEditField { }
}
+ @Override
public void setEditable(boolean editable) {
browseButton.setVisible(false);
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/IntegerEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/IntegerEditField.java index 7c858a4..e2c3df4 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/IntegerEditField.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/IntegerEditField.java @@ -19,44 +19,50 @@ import javax.swing.text.PlainDocument; * All rights reserved.
**************************************************************************/
public class IntegerEditField extends StringEditField {
-
+
public IntegerEditField() {
super();
field.setToolTipText("This field must contains a whole number e.g. 3");
}
- public String getText() {
+ @Override
+ public String getText() {
return field.getText();
}
- public void setText(String text) {
+ @Override
+ public void setText(String text) {
field.setText(text);
}
- public String getDefaultValue() {
+ @Override
+ public String getDefaultValue() {
return "0";
}
-
- public JTextComponent makeTextField() {
+
+ @Override
+ public JTextComponent makeTextField() {
return new IntegerTextField();
}
-
+
private class IntegerTextField extends JTextField {
public IntegerTextField() {
super();
setHorizontalAlignment(RIGHT);
}
- protected Document createDefaultModel() {
+ @Override
+ protected Document createDefaultModel() {
return new IntegerDocument();
}
}
-
+
private class IntegerDocument extends PlainDocument {
BigInteger currentVal = new BigInteger("0");
- public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+ @Override
+ public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
if (str == null || str.equals("")) {
return;
@@ -71,17 +77,18 @@ public class IntegerEditField extends StringEditField { currentBuffer.insert(offs, str);
proposedResult = currentBuffer.toString();
}
-
+
try {
currentVal = parse(proposedResult);
super.insertString(offs, str, a);
} catch (Exception e) {
Toolkit.getDefaultToolkit().beep();
}
-
+
}
- public void remove(int offs, int len) throws BadLocationException {
+ @Override
+ public void remove(int offs, int len) throws BadLocationException {
String currentText = this.getText(0, getLength());
String beforeOffset = currentText.substring(0, offs);
@@ -95,17 +102,17 @@ public class IntegerEditField extends StringEditField { try {
currentVal = parse(proposedResult);
super.remove(offs, len);
- } catch (Exception e) {
+ } catch (Exception e) {
Toolkit.getDefaultToolkit().beep();
}
- }
+ }
public BigInteger parse(String proposedResult) throws NumberFormatException {
BigInteger value = new BigInteger("0");
if ( proposedResult.length() != 0) {
- value = new BigInteger(proposedResult);
+ value = new BigInteger(proposedResult);
}
return value;
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java index 3204766..f95c5c9 100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java @@ -18,14 +18,14 @@ public class ListOfValues extends HashMap<String, Object> { public ListOfValues() {
super();
}
-
+
public String put(String key, String value, boolean isDefaultKey) {
if (isDefaultKey) defaultKey = key;
return (String)super.put(key, value);
}
-
+
public String getDefaultKey() {
return defaultKey;
}
-
+
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/LongStringEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/LongStringEditField.java index b782c65..140d7f2 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/LongStringEditField.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/LongStringEditField.java @@ -26,10 +26,12 @@ public class LongStringEditField extends StringEditField { field.setToolTipText(Language.translate("This field can contain any string."));
}
- public JTextComponent makeTextField() {
+ @Override
+ public JTextComponent makeTextField() {
return new JTextArea();
}
- public Component getControl() {
+ @Override
+ public Component getControl() {
if (bigScroller == null) {
bigScroller = new JScrollPane(field);
}
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java index 310ee2e..a9b55a4 100755..100644 --- a/source/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java +++ b/source/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java @@ -42,33 +42,33 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { HelpPane helpPane;
String helpText;
protected JTextComponent field;
-
+
boolean isValid = true;
boolean editable = true;
String name;
-
- public StringEditField() {
+
+ public StringEditField() {
field = makeTextField();
if (field != null)
field.addFocusListener(this);
}
-
+
private static StringEditField getFieldForType(SimpleType type) {
// handle lists special
- if (type instanceof ListType)
+ if (type instanceof ListType)
return new ArrayEditField(type.getBuiltInBaseType());
// is a combobox
if (type.hasFacet(Facet.ENUMERATION))
return new ComboField(type, null);
//find LOVscript
- Enumeration e = type.getAnnotations();
+ Enumeration<?> e = type.getAnnotations();
while (e.hasMoreElements()) {
Annotation note = (Annotation)e.nextElement();
- for (Enumeration f = note.getAppInfo(); f.hasMoreElements();) {
+ for (Enumeration<?> f = note.getAppInfo(); f.hasMoreElements();) {
AppInfo thisAppInfo = (AppInfo)f.nextElement();
- for (Enumeration g = thisAppInfo.getObjects(); g.hasMoreElements();) {
+ for (Enumeration<?> g = thisAppInfo.getObjects(); g.hasMoreElements();) {
AnyNode appInfoNode = (AnyNode)g.nextElement();
if (appInfoNode.getLocalName().equals("ScriptList")
|| appInfoNode.getLocalName().equals("LDAPList")) {
@@ -82,12 +82,12 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { if (type.getLength()!=null) length = type.getLength().longValue();
else if (type.getMaxLength()!=null) length = type.getMaxLength().longValue();
else if (type.getMinLength()!=null) length = type.getMinLength().longValue();
-
+
// find base type if derived
if (!(type.isBuiltInType()))
- type = type.getBuiltInBaseType();
+ type = type.getBuiltInBaseType();
// else derive the class
- Class contentClass = OutcomeStructure.getJavaClass(type.getTypeCode());
+ Class<?> contentClass = OutcomeStructure.getJavaClass(type.getTypeCode());
// disable list edits for the moment
if (contentClass.equals(Boolean.class))
return new BooleanEditField();
@@ -96,7 +96,7 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { else if (contentClass.equals(BigDecimal.class))
return new DecimalEditField();
else if (contentClass.equals(ImageIcon.class))
- return new ImageEditField();
+ return new ImageEditField();
else if (length > 60)
return new LongStringEditField();
else return new StringEditField();
@@ -107,7 +107,7 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { newField.setDecl(model);
return newField;
}
-
+
public static StringEditField getEditField(ElementDecl model) throws StructuralException {
try {
XMLType baseType = model.getType();
@@ -120,7 +120,7 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { throw new StructuralException("No type defined in model");
}
}
-
+
public void setDecl(AttributeDecl model) throws StructuralException {
this.model=model;
this.content=model.getSimpleType();
@@ -132,7 +132,7 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { this.model=model;
this.name = model.getName();
XMLType type = model.getType();
-
+
// derive base type
if (type.isSimpleType())
this.content = (SimpleType)type;
@@ -141,9 +141,9 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { if (this.content == null) throw new StructuralException("No declared base type of element");
- //
+ //
if (model.getFixedValue() != null) setEditable(false);
-
+
}
public void setData(Attr newData) throws StructuralException {
@@ -178,26 +178,28 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { public Node getData() {
return data;
}
-
+
public String getDefaultValue() {
return "";
}
-
+
public void setHelp(HelpPane helpPane, String helpText) {
this.helpPane = helpPane;
this.helpText = helpText;
}
- public void focusLost(FocusEvent e) {
+ @Override
+ public void focusLost(FocusEvent e) {
if (MainFrame.itemFinder != null)
MainFrame.itemFinder.clearConsumer(this);
updateNode();
}
- public void focusGained(FocusEvent e) {
+ @Override
+ public void focusGained(FocusEvent e) {
helpPane.setHelp(name, helpText);
if (editable && MainFrame.itemFinder != null)
- MainFrame.itemFinder.setConsumer(this, "Insert");
+ MainFrame.itemFinder.setConsumer(this, "Insert");
}
public void updateNode() {
@@ -213,23 +215,25 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { /**
* Read domkey from barcode input
*/
- public void push(DomainPath key) {
+ @Override
+ public void push(DomainPath key) {
setText(key.getName());
}
/**
* Read string from barcode input
*/
- public void push(String key) {
+ @Override
+ public void push(String key) {
setText(key);
}
-
+
public void setEditable(boolean editable) {
this.editable = editable;
if (field != null)
field.setEditable(editable);
}
-
+
public String getText() {
return field.getText();
}
@@ -237,15 +241,15 @@ public class StringEditField implements FocusListener, DomainKeyConsumer { public void setText(String text) {
field.setText(text);
}
-
+
public JTextComponent makeTextField() {
return new JTextField();
}
-
+
public Component getControl() {
return field;
}
-
+
public void grabFocus() {
getControl().requestFocus();
}
|