Author: [email protected]
Date: Tue Jan 6 10:36:19 2009
New Revision: 2904
Removed:
trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingConstants.java
Modified:
trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java
trunk/src/ca/sqlpower/architect/swingui/DBTree.java
trunk/src/ca/sqlpower/architect/swingui/PlayPen.java
trunk/src/ca/sqlpower/architect/swingui/RelationalPlayPenFactory.java
trunk/src/ca/sqlpower/architect/swingui/Relationship.java
trunk/src/ca/sqlpower/architect/swingui/TablePane.java
trunk/src/ca/sqlpower/architect/swingui/action/AbstractTableTargetedAction.java
trunk/src/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
trunk/src/ca/sqlpower/architect/swingui/action/EditRelationshipAction.java
trunk/src/ca/sqlpower/architect/swingui/action/EditTableAction.java
trunk/src/ca/sqlpower/architect/swingui/action/InsertColumnAction.java
trunk/src/ca/sqlpower/architect/swingui/action/InsertIndexAction.java
trunk/src/ca/sqlpower/architect/swingui/action/ReverseRelationshipAction.java
Log:
We fixed the bug 1109.We deleted the class ArchitectSwingConstants and
place the constant ACTION_COMMAND_SRC_PLAYPEN into class PlayPen and
ACTION_COMMAND_SRC_DBTREE into class DBTree.We also fixed the code which
then no longer compiled.
Modified: trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java Tue Jan 6
10:36:19 2009
@@ -452,23 +452,23 @@
ppBar.add(zoomToFitAction);
ppBar.addSeparator();
tempButton = ppBar.add(deleteSelectedAction);
-
tempButton.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ tempButton.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
ppBar.addSeparator();
tempButton = ppBar.add(createTableAction);
-
tempButton.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ tempButton.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
ppBar.addSeparator();
tempButton = ppBar.add(insertIndexAction);
-
tempButton.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ tempButton.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
ppBar.addSeparator();
tempButton = ppBar.add(insertColumnAction);
-
tempButton.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ tempButton.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
tempButton = ppBar.add(editSelectedAction);
-
tempButton.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ tempButton.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
ppBar.addSeparator();
ppBar.add(createNonIdentifyingRelationshipAction);
ppBar.add(createIdentifyingRelationshipAction);
tempButton = ppBar.add(editRelationshipAction);
-
tempButton.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ tempButton.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
ppBar.setFocusable(false);
for (Component c : ppBar.getComponents()) {
Modified: trunk/src/ca/sqlpower/architect/swingui/DBTree.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/DBTree.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/DBTree.java Tue Jan 6 10:36:19
2009
@@ -82,6 +82,9 @@
public class DBTree extends JTree implements DragSourceListener {
private static Logger logger = Logger.getLogger(DBTree.class);
+ // actionCommand identifier for actions shared by DBTree
+ public static final String ACTION_COMMAND_SRC_DBTREE = "DBTree";
+
protected DragSource ds;
protected JPopupMenu popup;
protected JMenu dbcsMenu;
@@ -345,7 +348,7 @@
mi = new JMenuItem();
mi.setAction(af.getInsertIndexAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE);
+ mi.setActionCommand(ACTION_COMMAND_SRC_DBTREE);
newMenu.add(mi);
if (p.getLastPathComponent() instanceof SQLTable) {
mi.setEnabled(true);
@@ -355,7 +358,7 @@
mi = new JMenuItem();
mi.setAction(af.getEditIndexAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE);
+ mi.setActionCommand(ACTION_COMMAND_SRC_DBTREE);
newMenu.add(mi);
if (p.getLastPathComponent() instanceof SQLIndex) {
mi.setEnabled(true);
@@ -369,7 +372,7 @@
mi = new JMenuItem();
mi.setAction(af.getInsertColumnAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE);
+ mi.setActionCommand(ACTION_COMMAND_SRC_DBTREE);
newMenu.add(mi);
if (p.getLastPathComponent() instanceof SQLTable ||
p.getLastPathComponent() instanceof SQLColumn) {
mi.setEnabled(true);
@@ -379,7 +382,7 @@
mi = new JMenuItem();
mi.setAction(af.getEditColumnAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE);
+ mi.setActionCommand(ACTION_COMMAND_SRC_DBTREE);
newMenu.add(mi);
if (p.getLastPathComponent() instanceof SQLColumn) {
mi.setEnabled(true);
@@ -415,7 +418,7 @@
mi = new JMenuItem();
mi.setAction(af.getEditRelationshipAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE);
+ mi.setActionCommand(ACTION_COMMAND_SRC_DBTREE);
newMenu.add(mi);
if (p.getLastPathComponent() instanceof SQLRelationship) {
mi.setEnabled(true);
@@ -443,7 +446,7 @@
mi = new JMenuItem();
mi.setAction(af.getEditTableAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE);
+ mi.setActionCommand(ACTION_COMMAND_SRC_DBTREE);
newMenu.add(mi);
if (p.getLastPathComponent() instanceof SQLTable) {
mi.setEnabled(true);
@@ -469,7 +472,7 @@
mi = new JMenuItem();
mi.setAction(af.getDeleteSelectedAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE);
+ mi.setActionCommand(ACTION_COMMAND_SRC_DBTREE);
newMenu.add(mi);
if (p.getLastPathComponent() instanceof SQLTable ||
p.getLastPathComponent() instanceof SQLColumn ||
Modified: trunk/src/ca/sqlpower/architect/swingui/PlayPen.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/PlayPen.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/PlayPen.java Tue Jan 6
10:36:19 2009
@@ -151,7 +151,9 @@
public void cancel();
}
-
+ // actionCommand identifier for actions shared by Playpen
+ public static final String ACTION_COMMAND_SRC_PLAYPEN = "PlayPen";
+
private static Logger logger = Logger.getLogger(PlayPen.class);
public enum MouseModeType {IDLE,
Modified:
trunk/src/ca/sqlpower/architect/swingui/RelationalPlayPenFactory.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/RelationalPlayPenFactory.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/RelationalPlayPenFactory.java
Tue Jan 6 10:36:19 2009
@@ -130,7 +130,7 @@
menu.add(mi);
mi = new JMenuItem("Show PlayPen Components");
//$NON-NLS-1$
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
mi.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
StringBuffer componentList = new StringBuffer();
@@ -144,7 +144,7 @@
menu.add(mi);
mi = new JMenuItem("Show Undo Vector"); //$NON-NLS-1$
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
mi.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
JOptionPane.showMessageDialog(pp, new
JScrollPane(new JTextArea(session.getUndoManager()
@@ -230,7 +230,7 @@
pp.getActionMap().put(KEY_EDIT_SELECTION, new AbstractAction() {
public void actionPerformed(ActionEvent e) {
ActionEvent ev = new ActionEvent(e.getSource(), e.getID(),
-
ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN, e.getWhen(),
e.getModifiers());
+ PlayPen.ACTION_COMMAND_SRC_PLAYPEN, e.getWhen(),
e.getModifiers());
af.getEditSelectedAction().actionPerformed(ev);
}
});
Modified: trunk/src/ca/sqlpower/architect/swingui/Relationship.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/Relationship.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/Relationship.java Tue Jan 6
10:36:19 2009
@@ -141,11 +141,11 @@
JMenu setFocusToRelatedTables = new
JMenu(Messages.getString("Relationship.setFocusMenu")); //$NON-NLS-1$
mi = new JMenuItem();
mi.setAction(af.getFocusToParentAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
setFocusToRelatedTables.add(mi);
mi = new JMenuItem();
mi.setAction(af.getFocusToChildAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
setFocusToRelatedTables.add(mi);
popup.add(setFocusToRelatedTables);
@@ -153,7 +153,7 @@
popup.add(mi);
mi = new JMenuItem(af.getEditRelationshipAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
popup.add(mi);
if (logger.isDebugEnabled()) {
@@ -174,7 +174,7 @@
popup.addSeparator();
mi = new JMenuItem(af.getDeleteSelectedAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
popup.add(mi);
}
@@ -525,7 +525,7 @@
session.getArchitectFrame().getEditRelationshipAction().actionPerformed
(new ActionEvent(evt.getSource(),
ActionEvent.ACTION_PERFORMED,
-
ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN));
+ PlayPen.ACTION_COMMAND_SRC_PLAYPEN));
} else if (evt.getClickCount() == 1 && evt.getButton() ==
MouseEvent.BUTTON1){
if (isSelected() && componentPreviouslySelected) {
setSelected(false, SelectionEvent.SINGLE_SELECT);
Modified: trunk/src/ca/sqlpower/architect/swingui/TablePane.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/TablePane.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/TablePane.java Tue Jan 6
10:36:19 2009
@@ -923,7 +923,7 @@
mi = new JMenuItem();
mi.setAction(af.getInsertIndexAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
tablePanePopup.add(mi);
try {
if (model != null && model.getIndicesFolder().getChildCount()
0) {
@@ -931,7 +931,7 @@
menu.setIcon(SPSUtils.createIcon("edit_index",
Messages.getString("TablePane.editIndexTooltip"),
ArchitectSwingSessionContext.ICON_SIZE)); //$NON-NLS-1$ //$NON-NLS-2$
for (SQLIndex index : model.getIndices()) {
JMenuItem menuItem = new JMenuItem(new
EditSpecificIndexAction(getPlayPen().getSession(), index));
-
menuItem.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+
menuItem.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
menu.add(menuItem);
}
tablePanePopup.add(menu);
@@ -944,12 +944,12 @@
mi = new JMenuItem();
mi.setAction(af.getInsertColumnAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
tablePanePopup.add(mi);
mi = new JMenuItem();
mi.setAction(af.getEditColumnAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
tablePanePopup.add(mi);
tablePanePopup.addSeparator();
@@ -957,13 +957,13 @@
JMenu align = new
JMenu(Messages.getString("TablePane.alignTablesMenu")); //$NON-NLS-1$
mi = new JMenuItem();
mi.setAction(af.getAlignTableHorizontalAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
align.add(mi);
mi = new JMenuItem();
mi.setAction(af.getAlignTableVerticalAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
align.add(mi);
tablePanePopup.add(align);
@@ -1028,25 +1028,25 @@
mi = new JMenuItem();
mi.setAction(af.getEditTableAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
tablePanePopup.add(mi);
tablePanePopup.addSeparator();
mi = new JMenuItem();
mi.setAction(getPlayPen().bringToFrontAction);
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
tablePanePopup.add(mi);
mi = new JMenuItem();
mi.setAction(getPlayPen().sendToBackAction);
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
tablePanePopup.add(mi);
if (logger.isDebugEnabled()) {
tablePanePopup.addSeparator();
mi = new JMenuItem("Show listeners"); //$NON-NLS-1$
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
mi.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
List<PlayPenComponent> selection =
getPlayPen().getSelectedItems();
@@ -1061,7 +1061,7 @@
tablePanePopup.add(mi);
mi = new JMenuItem("Show Selection List"); //$NON-NLS-1$
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
mi.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
List<PlayPenComponent> selection =
getPlayPen().getSelectedItems();
@@ -1079,7 +1079,7 @@
tablePanePopup.addSeparator();
mi = new JMenuItem();
mi.setAction(af.getDeleteSelectedAction());
-
mi.setActionCommand(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ mi.setActionCommand(PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
tablePanePopup.add(mi);
return tablePanePopup;
@@ -1102,10 +1102,10 @@
ArchitectFrame af =
pp.getSession().getArchitectFrame();
if (selectedColIndex == ITEM_INDEX_TITLE) {
af.getEditTableAction().actionPerformed
- (new ActionEvent(TablePane.this,
ActionEvent.ACTION_PERFORMED,
ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN));
+ (new ActionEvent(TablePane.this,
ActionEvent.ACTION_PERFORMED, PlayPen.ACTION_COMMAND_SRC_PLAYPEN));
} else if (selectedColIndex >= 0) {
af.getEditColumnAction().actionPerformed
- (new ActionEvent(TablePane.this,
ActionEvent.ACTION_PERFORMED,
ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN));
+ (new ActionEvent(TablePane.this,
ActionEvent.ACTION_PERFORMED, PlayPen.ACTION_COMMAND_SRC_PLAYPEN));
}
}
}
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/AbstractTableTargetedAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/action/AbstractTableTargetedAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/action/AbstractTableTargetedAction.java
Tue Jan 6 10:36:19 2009
@@ -29,9 +29,9 @@
import ca.sqlpower.architect.SQLObject;
import ca.sqlpower.architect.SQLTable;
import ca.sqlpower.architect.swingui.ASUtils;
-import ca.sqlpower.architect.swingui.ArchitectSwingConstants;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.DBTree;
+import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.Selectable;
import ca.sqlpower.architect.swingui.TablePane;
import ca.sqlpower.architect.swingui.event.SelectionEvent;
@@ -61,7 +61,7 @@
public void actionPerformed(ActionEvent evt) {
try {
- if
(evt.getActionCommand().equals(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN))
{
+ if
(evt.getActionCommand().equals(PlayPen.ACTION_COMMAND_SRC_PLAYPEN)) {
List selection = playpen.getSelectedItems();
if (selection.size() < 1) {
JOptionPane.showMessageDialog(playpen,
Messages.getString("AbstractTableTargetedAction.selectTable"));
//$NON-NLS-1$
@@ -73,7 +73,7 @@
} else {
JOptionPane.showMessageDialog(playpen,
Messages.getString("AbstractTableTargetedAction.selectedItemNotRecognized"));
//$NON-NLS-1$
}
- } else if
(evt.getActionCommand().equals(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE))
{
+ } else if
(evt.getActionCommand().equals(DBTree.ACTION_COMMAND_SRC_DBTREE)) {
TreePath [] selections = dbt.getSelectionPaths();
// This statement ensures that there is only one item
selected
// except for the special case of SQLColumns, in which its
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
Tue Jan 6 10:36:19 2009
@@ -43,9 +43,9 @@
import ca.sqlpower.architect.SQLRelationship;
import ca.sqlpower.architect.SQLTable;
import ca.sqlpower.architect.SQLIndex.Column;
-import ca.sqlpower.architect.swingui.ArchitectSwingConstants;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.DBTree;
+import ca.sqlpower.architect.swingui.PlayPen;
public class DeleteSelectedAction extends AbstractArchitectAction {
private static final Logger logger =
Logger.getLogger(DeleteSelectedAction.class);
@@ -60,7 +60,7 @@
public DeleteSelectedAction(ArchitectSwingSession session) throws
ArchitectException {
super(session, Messages.getString("DeleteSelectedAction.name"),
Messages.getString("DeleteSelectedAction.description"), "delete");
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
- putValue(ACTION_COMMAND_KEY,
ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ putValue(ACTION_COMMAND_KEY, PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
dbt = frame.getDbTree();
dbt.addTreeSelectionListener(treeSelectionHandler);
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/EditRelationshipAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/action/EditRelationshipAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/action/EditRelationshipAction.java
Tue Jan 6 10:36:19 2009
@@ -29,10 +29,10 @@
import ca.sqlpower.architect.SQLObject;
import ca.sqlpower.architect.SQLRelationship;
-import ca.sqlpower.architect.swingui.ArchitectSwingConstants;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.ColumnMappingPanel;
import ca.sqlpower.architect.swingui.DBTree;
+import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.PlayPenComponent;
import ca.sqlpower.architect.swingui.Relationship;
import ca.sqlpower.architect.swingui.RelationshipEditPanel;
@@ -59,7 +59,7 @@
}
public void actionPerformed(ActionEvent evt) {
- if
(evt.getActionCommand().equals(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN))
{
+ if
(evt.getActionCommand().equals(PlayPen.ACTION_COMMAND_SRC_PLAYPEN)) {
List<PlayPenComponent> selection =
playpen.getSelectedItems();
if (selection.size() < 1) {
JOptionPane.showMessageDialog(playpen,
Messages.getString("EditRelationshipAction.noRelationshipsSelected"));
//$NON-NLS-1$
@@ -71,7 +71,7 @@
} else {
JOptionPane.showMessageDialog(playpen,
Messages.getString("EditRelationshipAction.pleaseSelectRelationship"));
//$NON-NLS-1$
}
- } else if
(evt.getActionCommand().equals(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE))
{
+ } else if
(evt.getActionCommand().equals(DBTree.ACTION_COMMAND_SRC_DBTREE)) {
TreePath [] selections = dbt.getSelectionPaths();
if (selections.length < 1) {
JOptionPane.showMessageDialog(dbt,
Messages.getString("EditRelationshipAction.noRelationshipsSelected"));
//$NON-NLS-1$
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/EditTableAction.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/action/EditTableAction.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/action/EditTableAction.java Tue
Jan 6 10:36:19 2009
@@ -31,9 +31,9 @@
import ca.sqlpower.architect.SQLColumn;
import ca.sqlpower.architect.SQLObject;
import ca.sqlpower.architect.SQLTable;
-import ca.sqlpower.architect.swingui.ArchitectSwingConstants;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.DBTree;
+import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.TableEditPanel;
import ca.sqlpower.architect.swingui.TablePane;
import ca.sqlpower.swingui.DataEntryPanelBuilder;
@@ -52,7 +52,7 @@
}
public void actionPerformed(ActionEvent evt) {
- if
(evt.getActionCommand().equals(ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN))
{
+ if
(evt.getActionCommand().equals(PlayPen.ACTION_COMMAND_SRC_PLAYPEN)) {
List selection = playpen.getSelectedItems();
if (selection.size() < 1) {
JOptionPane.showMessageDialog(playpen,
Messages.getString("EditTableAction.noTablesSelected")); //$NON-NLS-1$
@@ -65,7 +65,7 @@
JOptionPane.showMessageDialog(playpen,
Messages.getString("EditTableAction.cannotRecognizeItem")); //$NON-NLS-1$
}
- } else if
(evt.getActionCommand().equals(ArchitectSwingConstants.ACTION_COMMAND_SRC_DBTREE))
{
+ } else if
(evt.getActionCommand().equals(DBTree.ACTION_COMMAND_SRC_DBTREE)) {
TreePath [] selections = dbt.getSelectionPaths();
logger.debug("selections length is: " + selections.length);
//$NON-NLS-1$
if (selections.length == 1 || selections.length == 2) {
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/InsertColumnAction.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/action/InsertColumnAction.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/action/InsertColumnAction.java
Tue Jan 6 10:36:19 2009
@@ -28,8 +28,8 @@
import ca.sqlpower.architect.SQLColumn;
import ca.sqlpower.architect.SQLObject;
import ca.sqlpower.architect.SQLTable;
-import ca.sqlpower.architect.swingui.ArchitectSwingConstants;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
+import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.TablePane;
public class InsertColumnAction extends AbstractTableTargetedAction {
@@ -37,7 +37,7 @@
public InsertColumnAction(ArchitectSwingSession session) {
super(session, Messages.getString("InsertColumnAction.name"),
Messages.getString("InsertColumnAction.description"), "new_column");
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- putValue(ACTION_COMMAND_KEY,
ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ putValue(ACTION_COMMAND_KEY,
PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
putValue(ACCELERATOR_KEY,KeyStroke.getKeyStroke(KeyEvent.VK_C,0));
setEnabled(false);
}
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/InsertIndexAction.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/action/InsertIndexAction.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/action/InsertIndexAction.java
Tue Jan 6 10:36:19 2009
@@ -29,9 +29,9 @@
import ca.sqlpower.architect.SQLIndex;
import ca.sqlpower.architect.SQLObject;
import ca.sqlpower.architect.SQLTable;
-import ca.sqlpower.architect.swingui.ArchitectSwingConstants;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.IndexEditPanel;
+import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.TablePane;
import ca.sqlpower.swingui.DataEntryPanelBuilder;
@@ -41,7 +41,7 @@
public InsertIndexAction(ArchitectSwingSession session) {
super(session, Messages.getString("InsertIndexAction.name"),
Messages.getString("InsertIndexAction.description"), "new_index");
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- putValue(ACTION_COMMAND_KEY,
ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ putValue(ACTION_COMMAND_KEY, PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I,
0));
setEnabled(false);
}
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/ReverseRelationshipAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/action/ReverseRelationshipAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/action/ReverseRelationshipAction.java
Tue Jan 6 10:36:19 2009
@@ -43,8 +43,8 @@
import ca.sqlpower.architect.SQLRelationship;
import ca.sqlpower.architect.SQLTable;
import ca.sqlpower.architect.swingui.ASUtils;
-import ca.sqlpower.architect.swingui.ArchitectSwingConstants;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
+import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.PlayPenComponent;
import ca.sqlpower.architect.swingui.Relationship;
@@ -56,7 +56,7 @@
public ReverseRelationshipAction(ArchitectSwingSession session) {
super(session,
Messages.getString("ReverseRelationshipAction.name"), //$NON-NLS-1$
Messages.getString("ReverseRelationshipAction.description"), "reverse");
//$NON-NLS-1$ //$NON-NLS-2$
- putValue(ACTION_COMMAND_KEY,
ArchitectSwingConstants.ACTION_COMMAND_SRC_PLAYPEN);
+ putValue(ACTION_COMMAND_KEY, PlayPen.ACTION_COMMAND_SRC_PLAYPEN);
}
/**
