Revision: 1772
http://svn.sourceforge.net/spring-rich-c/?rev=1772&view=rev
Author: jhoskens
Date: 2007-07-09 00:58:55 -0700 (Mon, 09 Jul 2007)
Log Message:
-----------
First part in refactoring: RCP-479
Created interface Message & implementation DefaultMessage + renamed getText
method
Modified Paths:
--------------
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/control/MessageReportingOverlay.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/Message.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/AlertMessageAreaPane.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/ConfirmationDialog.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/DefaultMessageAreaModel.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/MessageDialog.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/TitledApplicationDialog.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/TitledPageApplicationDialog.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/exceptionhandling/DefaultRegisterableExceptionHandler.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/SimpleValidationResultsReporter.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/builder/support/ValidationInterceptor.java
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/DefaultMessageAreaModelTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/support/DialogPageUtilsTests.java
Added Paths:
-----------
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/DefaultMessage.java
Modified:
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
===================================================================
---
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -22,7 +22,7 @@
import org.springframework.binding.validation.Severity;
import org.springframework.richclient.application.ApplicationServicesLocator;
import
org.springframework.richclient.application.config.ApplicationObjectConfigurer;
-import org.springframework.richclient.core.Message;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.dialog.MessageDialog;
import org.springframework.richclient.settings.SettingsException;
import org.springframework.richclient.settings.SettingsManager;
@@ -58,7 +58,7 @@
try {
dialog.setSettings(settingsManager.getUserSettings());
} catch (SettingsException e) {
- new MessageDialog("Error", new Message(e.getMessage(),
Severity.ERROR)).showDialog();
+ new MessageDialog("Error", new DefaultMessage(e.getMessage(),
Severity.ERROR)).showDialog();
e.printStackTrace();
}
}
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/control/MessageReportingOverlay.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/control/MessageReportingOverlay.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/control/MessageReportingOverlay.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -20,6 +20,7 @@
import org.springframework.binding.validation.Severity;
import org.springframework.richclient.application.ApplicationServices;
import org.springframework.richclient.application.ApplicationServicesLocator;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.core.Guarded;
import org.springframework.richclient.core.Message;
import org.springframework.richclient.dialog.Messagable;
@@ -85,9 +86,9 @@
*/
public void setMessage(Message message) {
if (message == null) {
- message = Message.EMPTY_MESSAGE;
+ message = DefaultMessage.EMPTY_MESSAGE;
}
- setToolTipText(message.getText());
+ setToolTipText(message.getMessage());
Severity severity = message.getSeverity();
if (severity != null) {
Added:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/DefaultMessage.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/DefaultMessage.java
(rev 0)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/DefaultMessage.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2002-2004 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+package org.springframework.richclient.core;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.text.JTextComponent;
+
+import org.springframework.binding.validation.Severity;
+import org.springframework.core.style.ToStringCreator;
+import org.springframework.richclient.application.ApplicationServicesLocator;
+import org.springframework.richclient.image.IconSource;
+import org.springframework.richclient.image.NoSuchImageResourceException;
+import org.springframework.richclient.util.LabelUtils;
+import org.springframework.util.ObjectUtils;
+
+public class DefaultMessage implements Message, Serializable {
+ private long timestamp = new Date().getTime();
+
+ private String text;
+
+ private Severity severity;
+
+ public static DefaultMessage EMPTY_MESSAGE = new DefaultMessage("", null);
+
+ public DefaultMessage(String text) {
+ this(text, Severity.INFO);
+ }
+
+ public DefaultMessage(String text, Severity severity) {
+ if (text == null) {
+ text = "";
+ }
+ this.text = text;
+ this.severity = severity;
+ }
+
+ public long getTimestamp() {
+ return timestamp;
+ }
+
+ public String getMessage() {
+ return text;
+ }
+
+ public Severity getSeverity() {
+ return severity;
+ }
+
+ public void renderMessage(JComponent component) {
+ if (component instanceof JTextComponent) {
+ ((JTextComponent)component).setText(getMessage());
+ }
+ else if (component instanceof JLabel) {
+ JLabel label = (JLabel)component;
+ label.setText(LabelUtils.htmlBlock(getMessage()));
+ label.setIcon(getIcon());
+ }
+ else {
+ throw new IllegalArgumentException("Unsupported component type " +
component);
+ }
+ }
+
+ public Icon getIcon() {
+ if (severity == null) {
+ return null;
+ }
+ try {
+ IconSource iconSource =
(IconSource)ApplicationServicesLocator.services().getService(IconSource.class);
+ return iconSource.getIcon("severity." + severity.getLabel());
+ }
+ catch (NoSuchImageResourceException e) {
+ return null;
+ }
+ }
+
+ public boolean equals(Object o) {
+ if (!(o instanceof DefaultMessage)) {
+ return false;
+ }
+ DefaultMessage m = (DefaultMessage)o;
+ return text.equals(m.text) && ObjectUtils.nullSafeEquals(severity,
m.severity);
+ }
+
+ public int hashCode() {
+ return text.hashCode() + (severity != null ? severity.hashCode() : 0);
+ }
+
+ public String toString() {
+ return new ToStringCreator(this).append("message",
text).append("severity", severity).toString();
+ }
+}
\ No newline at end of file
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/Message.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/Message.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/Message.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -15,112 +15,31 @@
*/
package org.springframework.richclient.core;
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.swing.Icon;
import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.text.JTextComponent;
import org.springframework.binding.validation.Severity;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.richclient.application.ApplicationServicesLocator;
-import org.springframework.richclient.image.IconSource;
-import org.springframework.richclient.image.NoSuchImageResourceException;
-import org.springframework.richclient.util.LabelUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-public class Message implements Serializable {
- private long timestamp = new Date().getTime();
-
- private String text;
+public interface Message {
- private Severity severity;
-
- public static Message EMPTY_MESSAGE = new Message("", null);
-
- public Message(String text) {
- this(text, Severity.INFO);
- }
-
- public Message(String text, Severity severity) {
- if (text == null) {
- text = "";
- }
- this.text = text;
- this.severity = severity;
- }
-
- public long getTimestamp() {
- return timestamp;
- }
+ /**
+ * Timestamp of message creation.
+ *
+ * @return time in long format.
+ */
+ long getTimestamp();
- public String getText() {
- return text;
- }
+ /**
+ * @return textual message.
+ */
+ String getMessage();
- public Severity getSeverity() {
- return severity;
- }
-
- public boolean isEmpty() {
- return !StringUtils.hasText(text);
- }
-
- public boolean isInfoMessage() {
- return !isEmpty() && severity == Severity.INFO;
- }
-
- public boolean isWarningMessage() {
- return !isEmpty() && severity == Severity.WARNING;
- }
-
- public boolean isErrorMessage() {
- return !isEmpty() && severity == Severity.ERROR;
- }
-
- public void renderMessage(JComponent component) {
- if (component instanceof JTextComponent) {
- ((JTextComponent)component).setText(getText());
- }
- else if (component instanceof JLabel) {
- JLabel label = (JLabel)component;
- label.setText(LabelUtils.htmlBlock(getText()));
- label.setIcon(getIcon());
- }
- else {
- throw new IllegalArgumentException("Unsupported component type " +
component);
- }
- }
-
- public Icon getIcon() {
- if (severity == null) {
- return null;
- }
- try {
- IconSource iconSource =
(IconSource)ApplicationServicesLocator.services().getService(IconSource.class);
- return iconSource.getIcon("severity." + severity.getLabel());
- }
- catch (NoSuchImageResourceException e) {
- return null;
- }
- }
-
- public boolean equals(Object o) {
- if (!(o instanceof Message)) {
- return false;
- }
- Message m = (Message)o;
- return text.equals(m.text) && ObjectUtils.nullSafeEquals(severity,
m.severity);
- }
-
- public int hashCode() {
- return text.hashCode() + (severity != null ? severity.hashCode() : 0);
- }
-
- public String toString() {
- return new ToStringCreator(this).append("message",
text).append("severity", severity).toString();
- }
+ /**
+ * @return Severity of this message.
+ */
+ Severity getSeverity();
+
+ /**
+ * @param component visual component to decorate.
+ */
+ void renderMessage(JComponent component);
}
\ No newline at end of file
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/AlertMessageAreaPane.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/AlertMessageAreaPane.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/AlertMessageAreaPane.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -128,10 +128,10 @@
}
private void update( Message message ) {
- String text = message.getText();
+ String text = message.getMessage();
// try to split it into two parts
- String[] parts = message.getText().split( "\\n" );
+ String[] parts = message.getMessage().split( "\\n" );
if( parts.length > 1 ) {
StringBuffer sb = new StringBuffer();
sb.append( "<html>" );
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/ConfirmationDialog.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/ConfirmationDialog.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/ConfirmationDialog.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -22,7 +22,7 @@
import javax.swing.KeyStroke;
import javax.swing.UIManager;
-import org.springframework.richclient.core.Message;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.util.Assert;
/**
@@ -58,7 +58,7 @@
Assert.hasText(message, "The confirmation message is required");
this.confirmationMessage = message;
if(this.messageAreaPane != null) {
- messageAreaPane.setMessage(new Message(message));
+ messageAreaPane.setMessage(new DefaultMessage(message));
}
}
@@ -98,7 +98,7 @@
icon = UIManager.getIcon("OptionPane.questionIcon");
}
this.messageAreaPane.setDefaultIcon(icon);
- this.messageAreaPane.setMessage(new Message(confirmationMessage));
+ this.messageAreaPane.setMessage(new
DefaultMessage(confirmationMessage));
return messageAreaPane.getControl();
}
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/DefaultMessageAreaModel.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/DefaultMessageAreaModel.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/DefaultMessageAreaModel.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -20,6 +20,8 @@
import javax.swing.JComponent;
+import org.springframework.binding.validation.Severity;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.core.Message;
import org.springframework.richclient.util.EventListenerListHelper;
import org.springframework.util.ObjectUtils;
@@ -36,7 +38,7 @@
private Messagable delegate;
- private Message message = Message.EMPTY_MESSAGE;
+ private Message message = DefaultMessage.EMPTY_MESSAGE;
private EventListenerListHelper listenerList = new
EventListenerListHelper(PropertyChangeListener.class);
@@ -60,20 +62,20 @@
}
public boolean hasInfoMessage() {
- return message.isWarningMessage();
+ return message.getSeverity() == Severity.INFO;
}
public boolean hasErrorMessage() {
- return message.isErrorMessage();
+ return message.getSeverity() == Severity.ERROR;
}
public boolean hasWarningMessage() {
- return message.isWarningMessage();
+ return message.getSeverity() == Severity.WARNING;
}
public void setMessage(Message message) {
if (message == null) {
- message = Message.EMPTY_MESSAGE;
+ message = DefaultMessage.EMPTY_MESSAGE;
}
if (ObjectUtils.nullSafeEquals(this.message, message)) {
return;
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/MessageDialog.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/MessageDialog.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/MessageDialog.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -21,6 +21,7 @@
import javax.swing.JComponent;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.core.Message;
import org.springframework.util.Assert;
@@ -95,7 +96,7 @@
* @param text the message text
*/
public void setMessage( String text ) {
- setMessage( new Message( text ) );
+ setMessage( new DefaultMessage( text ) );
}
/**
@@ -105,7 +106,7 @@
*/
public void setMessage( Message message ) {
Assert.notNull( message, "The message is required" );
- Assert.hasText( message.getText(), "The message text is required" );
+ Assert.hasText( message.getMessage(), "The message text is required" );
this.message = message;
}
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/TitledApplicationDialog.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/TitledApplicationDialog.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/TitledApplicationDialog.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -24,6 +24,7 @@
import javax.swing.JPanel;
import javax.swing.JSeparator;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.core.DescriptionConfigurable;
import org.springframework.richclient.core.Message;
import org.springframework.richclient.image.config.ImageConfigurable;
@@ -34,7 +35,7 @@
DescriptionConfigurable {
private TitlePane titlePane = new TitlePane();
- private Message description = new Message("Title pane description");
+ private Message description = new DefaultMessage("Title pane description");
private JComponent pageControl;
@@ -58,7 +59,7 @@
public void setDescription(String description) {
Message old = this.description;
- Message message = new Message(description);
+ Message message = new DefaultMessage(description);
if (!ObjectUtils.nullSafeEquals(old, message)) {
this.description = message;
if (!titlePane.getMessage().equals(old)) {
@@ -85,14 +86,11 @@
public void setMessage(Message message) {
if (message == null) {
- message = Message.EMPTY_MESSAGE;
+ titlePane.setMessage(getDescription());
}
- if (!message.isEmpty()) {
+ else {
titlePane.setMessage(message);
}
- else {
- titlePane.setMessage(getDescription());
- }
}
public boolean isMessageShowing() {
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/TitledPageApplicationDialog.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/TitledPageApplicationDialog.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/TitledPageApplicationDialog.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -21,6 +21,7 @@
import javax.swing.JComponent;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.core.Message;
import org.springframework.richclient.form.Form;
import org.springframework.util.Assert;
@@ -79,7 +80,7 @@
}
protected Message getDescription() {
- return new Message(dialogPage.getDescription());
+ return new DefaultMessage(dialogPage.getDescription());
}
public void propertyChange(PropertyChangeEvent e) {
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/exceptionhandling/DefaultRegisterableExceptionHandler.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/exceptionhandling/DefaultRegisterableExceptionHandler.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/exceptionhandling/DefaultRegisterableExceptionHandler.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -7,6 +7,7 @@
import org.springframework.richclient.application.ApplicationWindow;
import org.springframework.richclient.application.Application;
import
org.springframework.richclient.application.config.ApplicationLifecycleAdvisor;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.core.Message;
import org.springframework.util.StringUtils;
import org.springframework.binding.validation.Severity;
@@ -45,10 +46,10 @@
.getMessage("applicationDialog.defaultException",
defaultMessage);
}
- Message message = new Message(exceptionMessage, Severity.ERROR);
+ Message message = new DefaultMessage(exceptionMessage, Severity.ERROR);
ApplicationWindow activeWindow =
Application.instance().getActiveWindow();
JFrame parentFrame = (activeWindow == null) ? null :
activeWindow.getControl();
- JOptionPane.showMessageDialog(parentFrame, message.getText(), "Error",
JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(parentFrame, message.getMessage(),
"Error", JOptionPane.ERROR_MESSAGE);
}
}
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/SimpleValidationResultsReporter.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/SimpleValidationResultsReporter.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/SimpleValidationResultsReporter.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -22,7 +22,7 @@
import org.springframework.binding.validation.ValidationMessage;
import org.springframework.binding.validation.ValidationResults;
import org.springframework.binding.validation.ValidationResultsModel;
-import org.springframework.richclient.core.Message;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.dialog.Messagable;
import org.springframework.util.Assert;
@@ -38,12 +38,15 @@
public class SimpleValidationResultsReporter implements
ValidationResultsReporter {
private static final Log logger =
LogFactory.getLog(SimpleValidationResultsReporter.class);
+ /** ResultsModel containing the messages. */
private ValidationResultsModel resultsModel;
+ /** Recipient for the newest message. */
private Messagable messageReceiver;
/**
* Constructor.
+ *
* @param formModel ValidatingFormModel to monitor and report on.
* @param messageReceiver The receiver for validation messages.
*/
@@ -55,6 +58,9 @@
init();
}
+ /**
+ * Initialize listener and trigger a first-time check.
+ */
private void init() {
resultsModel.addValidationListener(this);
@@ -62,6 +68,9 @@
validationResultsChanged( null );
}
+ /**
+ * Clear the messageReceiver.
+ */
public void clearErrors() {
messageReceiver.setMessage(null);
}
@@ -84,7 +93,7 @@
}
ValidationMessage message =
getNewestMessage(resultsModel);
messageReceiver.setMessage(message == null ? null
- : new Message(message.getMessage(),
message.getSeverity()));
+ : new
DefaultMessage(message.getMessage(), message.getSeverity()));
}
}
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/builder/support/ValidationInterceptor.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/builder/support/ValidationInterceptor.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/builder/support/ValidationInterceptor.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -23,6 +23,7 @@
import org.springframework.binding.validation.ValidationMessage;
import org.springframework.binding.validation.ValidationResults;
import org.springframework.binding.validation.ValidationResultsModel;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.core.Guarded;
import org.springframework.richclient.core.Message;
import org.springframework.richclient.dialog.Messagable;
@@ -96,7 +97,7 @@
public void validationResultsChanged(ValidationResults results)
{
if (results.getMessageCount(propertyName) > 0) {
ValidationMessage message =
getNewestMessage(results);
- messageReceiver.setMessage(new
Message(message.getMessage(), message.getSeverity()));
+ messageReceiver.setMessage(new
DefaultMessage(message.getMessage(), message.getSeverity()));
}
else {
messageReceiver.setMessage(null);
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/DefaultMessageAreaModelTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/DefaultMessageAreaModelTests.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/DefaultMessageAreaModelTests.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.springframework.binding.validation.Severity;
-import org.springframework.richclient.core.Message;
+import org.springframework.richclient.core.DefaultMessage;
/**
* @author Peter De Bruycker
@@ -36,25 +36,25 @@
DefaultMessageAreaModel buffer = new DefaultMessageAreaModel();
buffer.addPropertyChangeListener(ml1);
- buffer.setMessage(new Message("Msg"));
+ buffer.setMessage(new DefaultMessage("Msg"));
assertEquals(buffer, ml1.lastUpdated);
ml1.lastUpdated = null;
buffer.removePropertyChangeListener(ml1);
- buffer.setMessage(new Message("Msg1"));
+ buffer.setMessage(new DefaultMessage("Msg1"));
assertEquals(null, ml1.lastUpdated);
buffer.addPropertyChangeListener(Messagable.MESSAGE_PROPERTY, ml1);
- buffer.setMessage(new Message("Msg"));
+ buffer.setMessage(new DefaultMessage("Msg"));
assertEquals(buffer, ml1.lastUpdated);
ml1.lastUpdated = null;
buffer.removePropertyChangeListener(Messagable.MESSAGE_PROPERTY, ml1);
- buffer.setMessage(new Message("Msg1"));
+ buffer.setMessage(new DefaultMessage("Msg1"));
assertEquals(null, ml1.lastUpdated);
buffer.addPropertyChangeListener("Some Other Property", ml1);
- buffer.setMessage(new Message("Msg"));
+ buffer.setMessage(new DefaultMessage("Msg"));
assertEquals(null, ml1.lastUpdated);
}
@@ -65,7 +65,7 @@
buffer.addPropertyChangeListener(ml1);
buffer.addPropertyChangeListener(ml2);
- buffer.setMessage(new Message(msg));
+ buffer.setMessage(new DefaultMessage(msg));
assertMessageAndSeveritySet(buffer, msg, Severity.INFO);
// with delegate
@@ -73,12 +73,12 @@
buffer = new DefaultMessageAreaModel(delegate);
buffer.addPropertyChangeListener(ml1);
buffer.addPropertyChangeListener(ml2);
- buffer.setMessage(new Message(msg));
+ buffer.setMessage(new DefaultMessage(msg));
assertMessageAndSeveritySet(buffer, msg, Severity.INFO);
}
private void assertMessageAndSeveritySet(DefaultMessageAreaModel buffer,
String msg, Severity severity) {
- assertEquals("message was not set", msg,
buffer.getMessage().getText());
+ assertEquals("message was not set", msg,
buffer.getMessage().getMessage());
assertEquals("severity must be info", severity,
buffer.getMessage().getSeverity());
assertEquals("listener not notified", buffer.getDelegateFor(),
ml1.lastUpdated);
assertEquals("listener not notified", buffer.getDelegateFor(),
ml2.lastUpdated);
@@ -91,7 +91,7 @@
buffer.addPropertyChangeListener(ml1);
buffer.addPropertyChangeListener(ml2);
- buffer.setMessage(new Message(msg, Severity.ERROR));
+ buffer.setMessage(new DefaultMessage(msg, Severity.ERROR));
assertMessageAndSeveritySet(buffer, msg, Severity.ERROR);
// with delegate
@@ -100,7 +100,7 @@
buffer.addPropertyChangeListener(ml1);
buffer.addPropertyChangeListener(ml2);
- buffer.setMessage(new Message(msg, Severity.ERROR));
+ buffer.setMessage(new DefaultMessage(msg, Severity.ERROR));
assertMessageAndSeveritySet(buffer, msg, Severity.ERROR);
}
@@ -112,14 +112,14 @@
buffer.addPropertyChangeListener(ml1);
buffer.addPropertyChangeListener(ml2);
- buffer.setMessage(new Message(msg, severity));
+ buffer.setMessage(new DefaultMessage(msg, severity));
assertMessageAndSeveritySet(buffer, msg, severity);
ml1.lastUpdated = null;
ml2.lastUpdated = null;
// and again
- buffer.setMessage(new Message(msg, severity));
+ buffer.setMessage(new DefaultMessage(msg, severity));
assertNull(ml1.lastUpdated);
assertNull(ml2.lastUpdated);
}
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/support/DialogPageUtilsTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/support/DialogPageUtilsTests.java
2007-07-06 08:41:13 UTC (rev 1771)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/support/DialogPageUtilsTests.java
2007-07-09 07:58:55 UTC (rev 1772)
@@ -24,6 +24,7 @@
import org.springframework.richclient.application.Application;
import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
import org.springframework.richclient.command.ActionCommand;
+import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.core.Guarded;
import org.springframework.richclient.core.Message;
import org.springframework.richclient.dialog.AbstractDialogPage;
@@ -52,11 +53,11 @@
DialogPageUtils.addMessageMonitor(page, monitor);
monitor.resetMessageCount();
- page.setMessage(new Message("a message"));
- assertEquals("Message text not equal", monitor.getMessage().getText(),
"a message");
+ page.setMessage(new DefaultMessage("a message"));
+ assertEquals("Message text not equal",
monitor.getMessage().getMessage(), "a message");
- page.setMessage(new Message("another message"));
- assertEquals("Message text not equal", monitor.getMessage().getText(),
"another message");
+ page.setMessage(new DefaultMessage("another message"));
+ assertEquals("Message text not equal",
monitor.getMessage().getMessage(), "another message");
assertEquals("Message count incorrect", 2, monitor.getMessageCount());
}
@@ -100,8 +101,8 @@
TitlePane titlePane = DialogPageUtils.createTitlePane(page);
- page.setMessage(new Message("test message"));
- assertEquals("Message text not equal",
titlePane.getMessage().getText(), "test message");
+ page.setMessage(new DefaultMessage("test message"));
+ assertEquals("Message text not equal",
titlePane.getMessage().getMessage(), "test message");
}
/**
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
spring-rich-c-cvs mailing list
spring-rich-c-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs
