Revision: 4015
Author: [email protected]
Date: Thu Dec 2 12:11:49 2010
Log: Label panels for newly-created labels now override the label-derived
values so that they do not default to being invisible.
http://code.google.com/p/power-architect/source/detail?r=4015
Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/CreateLabelAction.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/EditLabelAction.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/CreateLabelAction.java
Mon Aug 9 15:23:27 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/CreateLabelAction.java
Thu Dec 2 12:11:49 2010
@@ -81,7 +81,7 @@
@Override
public DataEntryPanel place(final Point p) throws
SQLObjectException {
label.setLocation(p);
- LabelEditorPanel editPanel = frame.getEditLabelAction().new
PlayPenLabelEditorPanel(label.getLabel(), false) {
+ LabelEditorPanel editPanel = frame.getEditLabelAction().new
PlayPenLabelEditorPanel(label.getLabel(), false, true) {
@Override
public boolean applyChanges() {
ArchitectSwingSession session = getSession();
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/EditLabelAction.java
Mon Aug 16 12:53:40 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/EditLabelAction.java
Thu Dec 2 12:11:49 2010
@@ -41,8 +41,8 @@
public class PlayPenLabelEditorPanel extends LabelEditorPanel {
- public PlayPenLabelEditorPanel(SPLabel label, boolean variables) {
- super(label, variables);
+ public PlayPenLabelEditorPanel(SPLabel label, boolean variables,
boolean override) {
+ super(label, variables, override);
}
@Override
@@ -81,7 +81,7 @@
}
private void showDialog(final PlayPenLabel label) {
- DataEntryPanel panel = new
PlayPenLabelEditorPanel(label.getLabel(), false);
+ DataEntryPanel panel = new
PlayPenLabelEditorPanel(label.getLabel(), false, false);
JDialog editDialog =
DataEntryPanelBuilder.createDataEntryPanelDialog(
panel, frame,
Messages.getString("EditLabelAction.dialogTitle"),
//$NON-NLS-1$