Revision: 1202
Author: jhoskens
Date: 2006-06-14 04:57:20 -0700 (Wed, 14 Jun 2006)
ViewCVS: http://svn.sourceforge.net/spring-rich-c/?rev=1202&view=rev
Log Message:
-----------
fix for RCP-365
- Renamed constants in CommandFaceDescriptor
- Fixed largeIcon/Icon bug in setLargeIconInfo()
- getters renamed
- Both events fired (info & icon) when setting icon and iconInfo is
blank.(implicitely creates info)
Modified Paths:
--------------
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/command/config/CommandFaceDescriptor.java
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/CommandFaceDescriptorTests.java
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/command/config/CommandFaceDescriptor.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/command/config/CommandFaceDescriptor.java
2006-06-14 08:08:31 UTC (rev 1201)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/command/config/CommandFaceDescriptor.java
2006-06-14 11:57:20 UTC (rev 1202)
@@ -37,12 +37,16 @@
public class CommandFaceDescriptor extends AbstractPropertyChangePublisher
implements DescribedElement,
VisualizedElement, CommandLabelConfigurable, DescriptionConfigurable,
CommandIconConfigurable {
- public static final String BUTTON_LABEL_INFO_PROPERTY = "buttonLabelInfo";
+ public static final String LABEL_INFO_PROPERTY = "labelInfo";
- public static final String BUTTON_ICON_INFO_PROPERTY = "iconInfo";
+ public static final String ICON_PROPERTY = "icon";
- public static final String BUTTON_LARGE_ICON_INFO_PROPETY =
"largeIconInfo";
+ public static final String LARGE_ICON_PROPERTY = "largeIcon";
+ public static final String ICON_INFO_PROPERTY = "iconInfo";
+
+ public static final String LARGE_ICON_INFO_PROPERTY = "largeIconInfo";
+
public static final CommandFaceDescriptor BLANK_FACE_DESCRIPTOR = new
CommandFaceDescriptor();
private String caption;
@@ -120,14 +124,18 @@
return labelInfo.getAccelerator();
}
- protected CommandButtonLabelInfo getButtonLabelInfo() {
+ protected CommandButtonLabelInfo getLabelInfo() {
return labelInfo;
}
- protected CommandButtonIconInfo getButtonIconInfo() {
+ protected CommandButtonIconInfo getIconInfo() {
return iconInfo;
}
+ protected CommandButtonIconInfo getLargeIconInfo() {
+ return largeIconInfo;
+ }
+
public void setCaption(String shortDescription) {
String old = this.caption;
this.caption = shortDescription;
@@ -150,7 +158,7 @@
}
CommandButtonLabelInfo old = this.labelInfo;
this.labelInfo = labelInfo;
- firePropertyChange(BUTTON_LABEL_INFO_PROPERTY, old, this.labelInfo);
+ firePropertyChange(LABEL_INFO_PROPERTY, old, this.labelInfo);
}
public void setIconInfo(CommandButtonIconInfo iconInfo) {
@@ -159,42 +167,46 @@
}
CommandButtonIconInfo old = this.iconInfo;
this.iconInfo = iconInfo;
- firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, this.iconInfo);
+ firePropertyChange(ICON_INFO_PROPERTY, old, this.iconInfo);
}
public void setLargeIconInfo(CommandButtonIconInfo largeIconInfo) {
if (largeIconInfo == null) {
- iconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
+ largeIconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
}
CommandButtonIconInfo old = this.largeIconInfo;
this.largeIconInfo = largeIconInfo;
- firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, this.iconInfo);
+ firePropertyChange(LARGE_ICON_INFO_PROPERTY, old, this.largeIconInfo);
}
public void setIcon(Icon icon) {
+ Icon old = null;
if (iconInfo == CommandButtonIconInfo.BLANK_ICON_INFO) {
if (icon != null) {
- setIconInfo(new CommandButtonIconInfo(icon));
+ // New IconInfo fires event
+ setIconInfo(new CommandButtonIconInfo(icon));
}
}
else {
- Icon old = iconInfo.getIcon();
+ old = iconInfo.getIcon();
this.iconInfo.setIcon(icon);
- firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, icon);
}
+ firePropertyChange(ICON_PROPERTY, old, icon);
}
public void setLargeIcon(Icon icon) {
+ Icon old = null;
if (largeIconInfo == CommandButtonIconInfo.BLANK_ICON_INFO) {
if (icon != null) {
- setLargeIconInfo(new CommandButtonIconInfo(icon));
+ // new IconInfo fires event
+ setLargeIconInfo(new CommandButtonIconInfo(icon));
}
}
else {
- Icon old = largeIconInfo.getIcon();
+ old = largeIconInfo.getIcon();
this.largeIconInfo.setIcon(icon);
- firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, icon);
}
+ firePropertyChange(LARGE_ICON_PROPERTY, old, icon);
}
public void configureLabel(AbstractButton button) {
@@ -235,4 +247,4 @@
"buttonLabelInfo", labelInfo).append("buttonIconInfo",
iconInfo).toString();
}
-}
\ No newline at end of file
+}
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/CommandFaceDescriptorTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/CommandFaceDescriptorTests.java
2006-06-14 08:08:31 UTC (rev 1201)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/CommandFaceDescriptorTests.java
2006-06-14 11:57:20 UTC (rev 1202)
@@ -46,11 +46,11 @@
public void testDefaultConstructor() {
CommandFaceDescriptor descriptor = new CommandFaceDescriptor();
- assertEquals(LabelInfoFactory.BLANK_BUTTON_LABEL,
descriptor.getButtonLabelInfo());
+ assertEquals(LabelInfoFactory.BLANK_BUTTON_LABEL,
descriptor.getLabelInfo());
assertTrue(descriptor.isBlank());
assertEquals(LabelInfoFactory.BLANK_BUTTON_LABEL.getText(),
descriptor.getText());
assertNull(descriptor.getDescription());
- assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getButtonIconInfo());
+ assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getIconInfo());
assertNull(descriptor.getCaption());
}
@@ -67,28 +67,28 @@
public void testConstructorWithEncodedLabel() {
CommandFaceDescriptor descriptor = new CommandFaceDescriptor("&[EMAIL
PROTECTED] T");
assertEquals("Test", descriptor.getText());
-
assertFalse(LabelInfoFactory.BLANK_BUTTON_LABEL.equals(descriptor.getButtonLabelInfo()));
+
assertFalse(LabelInfoFactory.BLANK_BUTTON_LABEL.equals(descriptor.getLabelInfo()));
assertFalse(descriptor.isBlank());
assertNull(descriptor.getDescription());
assertNull(descriptor.getCaption());
- assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getButtonIconInfo());
+ assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getIconInfo());
}
public void testConstructorWithEmptyEncodedLabel() {
CommandFaceDescriptor descriptor = new CommandFaceDescriptor("");
- assertEquals(LabelInfoFactory.BLANK_BUTTON_LABEL,
descriptor.getButtonLabelInfo());
+ assertEquals(LabelInfoFactory.BLANK_BUTTON_LABEL,
descriptor.getLabelInfo());
}
public void testConstructorWithEncodedLabelAndIcon() {
CommandFaceDescriptor descriptor = new CommandFaceDescriptor("&[EMAIL
PROTECTED] T", EmptyIcon.SMALL, "caption");
assertEquals("Test", descriptor.getText());
-
assertFalse(LabelInfoFactory.BLANK_BUTTON_LABEL.equals(descriptor.getButtonLabelInfo()));
+
assertFalse(LabelInfoFactory.BLANK_BUTTON_LABEL.equals(descriptor.getLabelInfo()));
assertFalse(descriptor.isBlank());
assertNull(descriptor.getDescription());
assertEquals("caption", descriptor.getCaption());
-
assertFalse(CommandButtonIconInfo.BLANK_ICON_INFO.equals(descriptor.getButtonIconInfo()));
- assertEquals(EmptyIcon.SMALL,
descriptor.getButtonIconInfo().getIcon());
+
assertFalse(CommandButtonIconInfo.BLANK_ICON_INFO.equals(descriptor.getIconInfo()));
+ assertEquals(EmptyIcon.SMALL, descriptor.getIconInfo().getIcon());
}
public void testSetDescription() {
@@ -115,11 +115,11 @@
public void testSetIconNull() {
descriptor.setIcon(null);
- assertNull(descriptor.getButtonIconInfo().getIcon());
+ assertNull(descriptor.getIconInfo().getIcon());
descriptor.setIconInfo(CommandButtonIconInfo.BLANK_ICON_INFO);
descriptor.setIcon(null);
- assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getButtonIconInfo());
+ assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getIconInfo());
}
public void testSetIcon() {
@@ -131,7 +131,7 @@
assertEquals(descriptor, propertyChangeListener.source);
assertEquals(oldIcon, propertyChangeListener.oldValue);
assertEquals(descriptor.getIcon(), propertyChangeListener.newValue);
- assertEquals(CommandFaceDescriptor.BUTTON_ICON_INFO_PROPERTY,
propertyChangeListener.propertyName);
+ assertEquals(CommandFaceDescriptor.ICON_PROPERTY,
propertyChangeListener.propertyName);
propertyChangeListener.reset();
// no change
@@ -139,14 +139,40 @@
assertFalse(propertyChangeListener.changed);
}
+ public void testSetLargeIconNull() {
+ descriptor.setLargeIcon(null);
+ assertNull(descriptor.getLargeIconInfo().getIcon());
+
+ descriptor.setLargeIconInfo(CommandButtonIconInfo.BLANK_ICON_INFO);
+ descriptor.setLargeIcon(null);
+ assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getLargeIconInfo());
+ }
+
+ public void testSetLargeIcon() {
+ Icon oldIcon = descriptor.getLargeIcon();
+ descriptor.setLargeIcon(EmptyIcon.LARGE);
+ assertEquals(EmptyIcon.LARGE, descriptor.getLargeIcon());
+
+ assertTrue(propertyChangeListener.changed);
+ assertEquals(descriptor, propertyChangeListener.source);
+ assertEquals(oldIcon, propertyChangeListener.oldValue);
+ assertEquals(descriptor.getLargeIcon(),
propertyChangeListener.newValue);
+ assertEquals(CommandFaceDescriptor.LARGE_ICON_PROPERTY,
propertyChangeListener.propertyName);
+
+ propertyChangeListener.reset();
+ // no change
+ descriptor.setLargeIcon(EmptyIcon.LARGE);
+ assertFalse(propertyChangeListener.changed);
+ }
+
public void testSetNullIconInfo() {
descriptor.setIconInfo(null);
- assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getButtonIconInfo());
+ assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getIconInfo());
}
public void testSetNullLabelInfo() {
descriptor.setLabelInfo(null);
- assertEquals(LabelInfoFactory.BLANK_BUTTON_LABEL,
descriptor.getButtonLabelInfo());
+ assertEquals(LabelInfoFactory.BLANK_BUTTON_LABEL,
descriptor.getLabelInfo());
}
public void testConfigureWithConfigurer() {
@@ -188,16 +214,16 @@
}
public void testSetLabelInfoAsText() {
- CommandButtonLabelInfo oldLabelInfo = descriptor.getButtonLabelInfo();
+ CommandButtonLabelInfo oldLabelInfo = descriptor.getLabelInfo();
descriptor.setButtonLabelInfo("&Other [EMAIL PROTECTED] O");
- CommandButtonLabelInfo newLabelInfo = descriptor.getButtonLabelInfo();
+ CommandButtonLabelInfo newLabelInfo = descriptor.getLabelInfo();
assertEquals(LabelInfoFactory.createButtonLabelInfo("&Other [EMAIL
PROTECTED] O"), newLabelInfo);
assertTrue(propertyChangeListener.changed);
assertEquals(descriptor, propertyChangeListener.source);
assertEquals(oldLabelInfo, propertyChangeListener.oldValue);
assertEquals(newLabelInfo, propertyChangeListener.newValue);
- assertEquals(CommandFaceDescriptor.BUTTON_LABEL_INFO_PROPERTY,
propertyChangeListener.propertyName);
+ assertEquals(CommandFaceDescriptor.LABEL_INFO_PROPERTY,
propertyChangeListener.propertyName);
propertyChangeListener.reset();
// no change
@@ -206,16 +232,16 @@
}
public void testSetLabelInfo() {
- CommandButtonLabelInfo oldLabelInfo = descriptor.getButtonLabelInfo();
+ CommandButtonLabelInfo oldLabelInfo = descriptor.getLabelInfo();
CommandButtonLabelInfo newLabelInfo =
LabelInfoFactory.createButtonLabelInfo("&Other [EMAIL PROTECTED] O");
descriptor.setLabelInfo(newLabelInfo);
- assertEquals(newLabelInfo, descriptor.getButtonLabelInfo());
+ assertEquals(newLabelInfo, descriptor.getLabelInfo());
assertTrue(propertyChangeListener.changed);
assertEquals(descriptor, propertyChangeListener.source);
assertEquals(oldLabelInfo, propertyChangeListener.oldValue);
assertEquals(newLabelInfo, propertyChangeListener.newValue);
- assertEquals(CommandFaceDescriptor.BUTTON_LABEL_INFO_PROPERTY,
propertyChangeListener.propertyName);
+ assertEquals(CommandFaceDescriptor.LABEL_INFO_PROPERTY,
propertyChangeListener.propertyName);
propertyChangeListener.reset();
// no change
@@ -240,27 +266,27 @@
};
descriptor.configure(action);
- assertEquals("name", descriptor.getButtonLabelInfo().getText(),
action.getValue(Action.NAME));
- assertEquals("mnemonic", new
Integer(descriptor.getButtonLabelInfo().getMnemonic()), action
+ assertEquals("name", descriptor.getLabelInfo().getText(),
action.getValue(Action.NAME));
+ assertEquals("mnemonic", new
Integer(descriptor.getLabelInfo().getMnemonic()), action
.getValue(Action.MNEMONIC_KEY));
- assertEquals("accelerator",
descriptor.getButtonLabelInfo().getAccelerator(), action
+ assertEquals("accelerator",
descriptor.getLabelInfo().getAccelerator(), action
.getValue(Action.ACCELERATOR_KEY));
- assertEquals("icon", descriptor.getButtonIconInfo().getIcon(),
action.getValue(Action.SMALL_ICON));
+ assertEquals("icon", descriptor.getIconInfo().getIcon(),
action.getValue(Action.SMALL_ICON));
assertEquals("caption", descriptor.getCaption(),
action.getValue(Action.SHORT_DESCRIPTION));
assertEquals("description", descriptor.getDescription(),
action.getValue(Action.LONG_DESCRIPTION));
}
public void testSetIconInfo() {
- CommandButtonIconInfo oldIconInfo = descriptor.getButtonIconInfo();
+ CommandButtonIconInfo oldIconInfo = descriptor.getIconInfo();
CommandButtonIconInfo newIconInfo = new
CommandButtonIconInfo(EmptyIcon.LARGE);
descriptor.setIconInfo(newIconInfo);
- assertEquals(newIconInfo, descriptor.getButtonIconInfo());
+ assertEquals(newIconInfo, descriptor.getIconInfo());
assertTrue(propertyChangeListener.changed);
assertEquals(descriptor, propertyChangeListener.source);
assertEquals(oldIconInfo, propertyChangeListener.oldValue);
assertEquals(newIconInfo, propertyChangeListener.newValue);
- assertEquals(CommandFaceDescriptor.BUTTON_ICON_INFO_PROPERTY,
propertyChangeListener.propertyName);
+ assertEquals(CommandFaceDescriptor.ICON_INFO_PROPERTY,
propertyChangeListener.propertyName);
propertyChangeListener.reset();
// no change
@@ -268,6 +294,24 @@
assertFalse(propertyChangeListener.changed);
}
+ public void testSetLargeIconInfo() {
+ CommandButtonIconInfo oldIconInfo = descriptor.getLargeIconInfo();
+ CommandButtonIconInfo newIconInfo = new
CommandButtonIconInfo(EmptyIcon.LARGE);
+ descriptor.setLargeIconInfo(newIconInfo);
+ assertEquals(newIconInfo, descriptor.getLargeIconInfo());
+
+ assertTrue(propertyChangeListener.changed);
+ assertEquals(descriptor, propertyChangeListener.source);
+ assertEquals(oldIconInfo, propertyChangeListener.oldValue);
+ assertEquals(newIconInfo, propertyChangeListener.newValue);
+ assertEquals(CommandFaceDescriptor.LARGE_ICON_INFO_PROPERTY,
propertyChangeListener.propertyName);
+
+ propertyChangeListener.reset();
+ // no change
+ descriptor.setLargeIconInfo(newIconInfo);
+ assertFalse(propertyChangeListener.changed);
+ }
+
private static class TestPropertyChangeListener implements
PropertyChangeListener {
private boolean changed = false;
@@ -313,11 +357,11 @@
public void testConstructorWithButtonLabelInfo() {
CommandFaceDescriptor descriptor = new
CommandFaceDescriptor(buttonLabelInfo);
- assertEquals(buttonLabelInfo, descriptor.getButtonLabelInfo());
+ assertEquals(buttonLabelInfo, descriptor.getLabelInfo());
assertFalse(descriptor.isBlank());
assertEquals("Test", descriptor.getText());
assertNull(descriptor.getDescription());
- assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getButtonIconInfo());
+ assertEquals(CommandButtonIconInfo.BLANK_ICON_INFO,
descriptor.getIconInfo());
assertNull(descriptor.getCaption());
}
@@ -328,9 +372,9 @@
buttonLabelInfo = LabelInfoFactory.createButtonLabelInfo("&[EMAIL
PROTECTED] T");
descriptor = new CommandFaceDescriptor("&[EMAIL PROTECTED] T",
EmptyIcon.SMALL, "caption");
descriptor.setDescription("long description");
- assertNotNull(descriptor.getButtonLabelInfo().getAccelerator());
+ assertNotNull(descriptor.getLabelInfo().getAccelerator());
propertyChangeListener = new TestPropertyChangeListener();
descriptor.addPropertyChangeListener(propertyChangeListener);
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
spring-rich-c-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs
