Revision: 3483
Author: ferguson.sebastian
Date: Fri Apr 30 14:27:46 2010
Log: Changed the button names from 'OK' and 'Cancel' to 'Apply'
and 'Close.' Fixed the get dependencies method in KettleSettings.
http://code.google.com/p/power-architect/source/detail?r=3483
Modified:
/trunk/src/main/java/ca/sqlpower/architect/etl/kettle/KettleSettings.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/GroupEditorPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/etl/kettle/KettleSettings.java
Thu Mar 18 07:58:15 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/etl/kettle/KettleSettings.java
Fri Apr 30 14:27:46 2010
@@ -163,7 +163,7 @@
}
public List<? extends SPObject> getDependencies() {
- return null;
+ return Collections.emptyList();
}
public void removeDependency(SPObject dependency) {
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/GroupEditorPanel.java
Wed Apr 7 13:56:01 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/GroupEditorPanel.java
Fri Apr 30 14:27:46 2010
@@ -122,13 +122,13 @@
public void removeUpdate(DocumentEvent e) { hasUnsavedChanges =
true; }
};
- private final Action okAction = new AbstractAction("OK") {
+ private final Action okAction = new AbstractAction("Apply") {
public void actionPerformed(ActionEvent e) {
applyChanges();
}
};
- private final Action cancelAction = new AbstractAction("Cancel") {
+ private final Action cancelAction = new AbstractAction("Close") {
public void actionPerformed(ActionEvent e) {
discardChanges();
closeAction.actionPerformed(e);
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java
Wed Apr 7 13:56:01 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java
Fri Apr 30 14:27:46 2010
@@ -142,13 +142,13 @@
}
};
- private final Action okAction = new AbstractAction("OK") {
+ private final Action okAction = new AbstractAction("Apply") {
public void actionPerformed(ActionEvent e) {
applyChanges();
}
};
- private final Action cancelAction = new AbstractAction("Cancel") {
+ private final Action cancelAction = new AbstractAction("Close") {
public void actionPerformed(ActionEvent e) {
discardChanges();
closeAction.actionPerformed(e);