Author: ms1279
Date: Thu Apr 2 15:02:40 2009
New Revision: 2971
Modified:
trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSession.java
trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
trunk/src/ca/sqlpower/architect/swingui/ProjectSettingsPanel.java
trunk/src/ca/sqlpower/architect/swingui/TableEditPanel.java
trunk/src/ca/sqlpower/architect/swingui/messages.properties
Log:
Included an option to display either alias names or technical names in the
project settings panel and a field to type the alias name in the
TableEditPanel.
Included a setter and getter for the boolean usingAliasNames in the
ArchitectSwingSession and whatever class implements the
ArchitectSwingSession.
Removed the method isRelationshipLinesDirect() since it was not used
anywhere and there was a getRelationshipLines() right below it, doing the
same thing.
Modified:
trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
==============================================================================
---
trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
(original)
+++
trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Thu Apr 2 15:02:40 2009
@@ -79,6 +79,8 @@
private boolean showFkTag = true;
private boolean showAkTag = true;
+ private boolean usingAliasNames = false;
+
private ColumnVisibility choice = ColumnVisibility.ALL;
public TestingArchitectSwingSession(ArchitectSwingSessionContext
context) throws SQLObjectException {
@@ -341,6 +343,14 @@
public UserPrompter createUserPrompter(String question, UserPromptType
responseType, UserPromptOptions optionType, UserPromptResponse
defaultResponseType,
Object defaultResponse, String ... buttonNames) {
return new
DefaultUserPrompterFactory().createUserPrompter(question, responseType,
optionType, defaultResponseType, defaultResponse, buttonNames);
+ }
+
+ public boolean isUsingAliasNames() {
+ return usingAliasNames;
+ }
+
+ public void setUsingAliasNames(boolean usingAliasNames) {
+ this.usingAliasNames = usingAliasNames;
}
}
Modified: trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSession.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSession.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSession.java Thu
Apr 2 15:02:40 2009
@@ -192,6 +192,18 @@
public void setRelationshipLinesDirect(boolean direct);
/**
+ * Boolean to decide whether to display the logical(alias) names or
the physical(technical) names
+ * for columns and tables.
+ */
+ public boolean isUsingAliasNames();
+
+ /**
+ * To use alias names or not: True, if the alias names are to be
displayed. False, if the
+ * technical names are to be displayed.
+ */
+ public void setUsingAliasNames(boolean usingAliasNames);
+
+ /**
* Returns whether the PK Tags will be shown
*/
public boolean isShowPkTag();
Modified:
trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Thu Apr 2 15:02:40 2009
@@ -141,6 +141,7 @@
private ProjectModificationWatcher projectModificationWatcher;
private boolean relationshipLinesDirect;
+ private boolean usingAliasNames;
private boolean showPkTag = true;
private boolean showFkTag = true;
@@ -817,10 +818,6 @@
return projectModificationWatcher;
}
- public boolean isRelationshipLinesDirect() {
- return relationshipLinesDirect;
- }
-
public void setRelationshipLinesDirect(boolean
relationshipLinesDirect) {
this.relationshipLinesDirect = relationshipLinesDirect;
getPlayPen().repaint();
@@ -828,6 +825,15 @@
public boolean getRelationshipLinesDirect() {
return relationshipLinesDirect;
+ }
+
+ public boolean isUsingAliasNames() {
+ return usingAliasNames;
+ }
+
+ public void setUsingAliasNames(boolean usingAliasNames) {
+ this.usingAliasNames = usingAliasNames;
+ getPlayPen().repaint();
}
public SQLObjectRoot getRootObject() {
Modified: trunk/src/ca/sqlpower/architect/swingui/ProjectSettingsPanel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ProjectSettingsPanel.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/ProjectSettingsPanel.java Thu
Apr 2 15:02:40 2009
@@ -71,6 +71,9 @@
private JRadioButton showPkFk;
private JRadioButton showPk;
+ private JRadioButton technicalName;
+ private JRadioButton aliasName;
+
public ProjectSettingsPanel(ArchitectSwingSession session) {
this.session = session;
setup();
@@ -81,7 +84,7 @@
CellConstraints cc = new CellConstraints();
com.jgoodies.forms.layout.FormLayout layout = new
com.jgoodies.forms.layout.FormLayout(
"pref,pref", //$NON-NLS-1$
- "pref,4dlu,pref,4dlu,pref,4dlu,4dlu,pref,pref,4dlu,pref,pref,pref,pref,pref,pref");
//$NON-NLS-1$
+ "pref,4dlu,pref,4dlu,pref,4dlu,4dlu,pref,pref,4dlu,4dlu,pref,pref,4dlu,pref,pref,pref,pref,pref,pref,4dlu");
//$NON-NLS-1$
setLayout(layout);
int row = 1;
add(new
JLabel(Messages.getString("ProjectSettingsPanel.snapshotSourceDbOption")),
cc.xy(1, row)); //$NON-NLS-1$
@@ -109,6 +112,20 @@
lineStyleGroup.add(rectilinearRelationships);
lineStyleGroup.add(directRelationships);
+ row+=2;
+ add(new JSeparator(), cc.xyw(1, row, 2));
+
+ row++;
+ add(new
JLabel(Messages.getString("ProjectSettingsPanel.displayTechnicalOrAlias")),
cc.xy(1, row)); //$NON-NLS-1$
+ add(technicalName = new
JRadioButton(Messages.getString("ProjectSettingsPanel.displayTechnicalNames")),
cc.xy(2, row)); //$NON-NLS-1$
+
+ row++;
+ add(new JLabel(), cc.xy(1, row));
+ add(aliasName = new
JRadioButton(Messages.getString("ProjectSettingsPanel.displayAliasNames")),
cc.xy(2, row)); //$NON-NLS-1$
+ ButtonGroup nameDisplay = new ButtonGroup();
+ nameDisplay.add(technicalName);
+ nameDisplay.add(aliasName);
+
row++;
add(new JSeparator(), cc.xyw(1, row, 2));
@@ -138,9 +155,7 @@
column_show_settings.add(showPkFkUnique);
column_show_settings.add(showPkFk);
column_show_settings.add(showPk);
-
- /*
- */
+
}
private void revertToProjectSettings() {
Modified: trunk/src/ca/sqlpower/architect/swingui/TableEditPanel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/TableEditPanel.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/TableEditPanel.java Thu Apr 2
15:02:40 2009
@@ -52,7 +52,8 @@
*/
private JDialog editDialog;
protected SQLTable table;
- JTextField name;
+ JTextField technicalName;
+ JTextField aliasName;
JTextField pkName;
JTextArea remarks;
private JComboBox bgColor;
@@ -67,8 +68,10 @@
super(new FormLayout());
this.session = session;
this.tp = session.getPlayPen().findTablePane(t);
- add(new JLabel(Messages.getString("TableEditPanel.tableNameLabel")));
//$NON-NLS-1$
- add(name = new JTextField("", 30)); //$NON-NLS-1$
+ add(new
JLabel(Messages.getString("TableEditPanel.tableTechnicalNameLabel")));
//$NON-NLS-1$
+ add(technicalName = new JTextField("", 30)); //$NON-NLS-1$
+ add(new
JLabel(Messages.getString("TableEditPanel.tableAliasNameLabel")));
//$NON-NLS-1$
+ add(aliasName = new JTextField("", 30)); //$NON-NLS-1$
add(new
JLabel(Messages.getString("TableEditPanel.primaryKeyNameLabel")));
//$NON-NLS-1$
add(pkName = new JTextField("", 30)); //$NON-NLS-1$
add(new JLabel(Messages.getString("TableEditPanel.remarksLabel")));
//$NON-NLS-1$
@@ -99,7 +102,7 @@
private void editTable(SQLTable t) {
table = t;
- name.setText(t.getName());
+ technicalName.setText(t.getName());
try {
if (t.getPrimaryKeyIndex() == null) {
pkName.setEnabled(false);
@@ -112,7 +115,7 @@
throw new SQLObjectRuntimeException(e);
}
remarks.setText(t.getRemarks());
- name.selectAll();
+ technicalName.selectAll();
if (tp != null) {
bgColor.setSelectedItem(tp.getBackgroundColor());
@@ -134,7 +137,7 @@
StringBuffer warnings = new StringBuffer();
//We need to check if the table name and/or primary key name
is empty or not
//if they are, we need to warn the user since it will mess up
the SQLScripts we create
- if (name.getText().trim().length() == 0) {
+ if (technicalName.getText().trim().length() == 0) {
warnings.append(Messages.getString("TableEditPanel.blankTableNameWarning"));
//$NON-NLS-1$
}
@@ -156,7 +159,7 @@
table.getPrimaryKeyIndex().setName(pkName.getText());
}
- table.setName(name.getText());
+ table.setName(technicalName.getText());
table.setRemarks(remarks.getText());
if (tp != null) {
@@ -199,11 +202,11 @@
}
public String getNameText() {
- return name.getText();
+ return technicalName.getText();
}
public void setNameText(String newName) {
- name.setText(newName);
+ technicalName.setText(newName);
}
public String getPkNameText() {
Modified: trunk/src/ca/sqlpower/architect/swingui/messages.properties
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/messages.properties (original)
+++ trunk/src/ca/sqlpower/architect/swingui/messages.properties Thu Apr 2
15:02:40 2009
@@ -270,6 +270,9 @@
ProfileResultsViewer.search=Search:
ProfileResultsViewer.tableViewTab=Table View
ProjectSettingsPanel.directLineOption=Direct Lines
+ProjectSettingsPanel.displayAliasNames= Alias Names
+ProjectSettingsPanel.displayTechnicalNames= Technical Names
+ProjectSettingsPanel.displayTechnicalOrAlias= Display Tables and Columns
With:
ProjectSettingsPanel.numCommonProfileValues=Number of Common Values in
Profiles:
ProjectSettingsPanel.profileMode=Profile Creator Mode:
ProjectSettingsPanel.rectilinearLineOption=Rectilinear Lines
@@ -366,7 +369,8 @@
TableEditPanel.remarksLabel=Remarks
TableEditPanel.roundedCornersLabel=Rounded Corners
TableEditPanel.tableColourLabel=Table Colour
-TableEditPanel.tableNameLabel=Table Name
+TableEditPanel.tableTechnicalNameLabel=Technical Table Name
+TableEditPanel.tableAliasNameLabel= Alias Table Name
TableEditPanel.textColourLabel=Text Colour
TablePane.alignTablesMenu=Align Tables
TablePane.editIndexTooltip=Edit Index
