Revision: 3723
Author: [email protected]
Date: Tue Jul 13 10:58:50 2010
Log: Changed the revision table to use its preset date format, and added
keyboard navigation (expand/collapse) to the DBTree.
http://code.google.com/p/power-architect/source/detail?r=3723
Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/DBTree.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/RevisionsTable.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Tue Jul 13 10:25:39 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Tue Jul 13 10:58:50 2010
@@ -173,6 +173,8 @@
*/
public class ArchitectFrame extends JFrame {
+ private static final String CYCLE_TAB_ACTION
= "ca.sqlpower.architect.swingui.CYCLE_TAB_ACTION";
+
private static Logger logger = Logger.getLogger(ArchitectFrame.class);
public static final double ZOOM_STEP = 0.25;
@@ -1067,9 +1069,9 @@
helpMenu.add(checkForUpdateAction);
menuBar.add(helpMenu);
- menuBar.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
ActionEvent.CTRL_MASK), "cycleTabAction");
- menuBar.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
ActionEvent.CTRL_MASK+ActionEvent.SHIFT_MASK), "cycleTabAction");
- menuBar.getActionMap().put("cycleTabAction", cycleTabAction);
+ menuBar.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
ActionEvent.CTRL_MASK), CYCLE_TAB_ACTION);
+ menuBar.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
ActionEvent.CTRL_MASK+ActionEvent.SHIFT_MASK), CYCLE_TAB_ACTION);
+ menuBar.getActionMap().put(CYCLE_TAB_ACTION, cycleTabAction);
return menuBar;
}
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/DBTree.java Mon Jul
12 08:21:11 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/DBTree.java Tue Jul
13 10:58:50 2010
@@ -127,6 +127,9 @@
private static final Object KEY_DELETE_SELECTED
= "ca.sqlpower.architect.swingui.DBTree.KEY_DELETE_SELECTED";
//$NON-NLS-1$
+ private static final String KEY_LEFT
= "ca.sqlpower.architect.swingui.DBTree.KEY_LEFT";
+ private static final String KEY_RIGHT
= "ca.sqlpower.architect.swingui.DBTree.KEY_RIGHT";
+
/**
* The model behind this DB tree.
*/
@@ -202,7 +205,7 @@
}
});
}
-
+
// ----------- INSTANCE METHODS ------------
/**
@@ -913,6 +916,31 @@
}
}
}
+ });
+
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0),
KEY_LEFT);
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0),
KEY_RIGHT);
+
+ getActionMap().put(KEY_LEFT, new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ TreePath selection = getSelectionPath();
+ if (isExpanded(selection) &&
treeModel.getChildCount(selection.getLastPathComponent()) != 0) {
+ setExpandedState(selection, false);
+ } else {
+ if (selection.getPathCount() != 2) {
+ setSelectionPath(selection.getParentPath());
+ }
+ }
+ }
+ });
+
+ getActionMap().put(KEY_RIGHT, new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ TreePath selection = getSelectionPath();
+ if (!(treeModel.isLeaf(selection.getLastPathComponent()) |
| isExpanded(selection))) {
+ setExpandedState(selection, true);
+ }
+ }
});
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/RevisionsTable.java
Mon May 10 19:04:12 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/RevisionsTable.java
Tue Jul 13 10:58:50 2010
@@ -182,7 +182,7 @@
for (int i = 0; i < transactions.size(); i++) {
TransactionInformation transaction = transactions.get(i);
data[i][0] =
String.valueOf(transaction.getVersionNumber()) + " ";
- data[i][1] = new Date(transaction.getTimeCreated()) + " ";
+ data[i][1] =
TransactionInformation.DATE_FORMAT.format(transaction.getTimeCreated())
+ " ";
data[i][2] = transaction.getVersionAuthor() + " ";
data[i][3] = transaction.getSimpleDescription();
