Revision: 1773
http://svn.sourceforge.net/spring-rich-c/?rev=1773&view=rev
Author: jhoskens
Date: 2007-07-09 06:32:49 -0700 (Mon, 09 Jul 2007)
Log Message:
-----------
Second part in refactoring: RCP-479
Message moved to core module, Severity moved to core module and package
ValidationMesage now extends Message, DefaultValidationMessage extends
DefaultMessage
Places where validationMessage was converted to Message are fixed
Modified Paths:
--------------
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationMessage.java
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationMessageComparator.java
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationResults.java
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationMessage.java
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationResults.java
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationResultsModel.java
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/EmptyValidationResults.java
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/RulesValidator.java
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/ValangRichValidator.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/DefaultMessage.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/DefaultMessageAreaModel.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/OverlayValidationInterceptorFactory.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/builder/support/ValidationInterceptor.java
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/PropertyResults.java
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/ValidationResults.java
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/ValueValidationResults.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/DefaultFormModelTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationMessageTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationResultsModelTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationResultsTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/DefaultMessageAreaModelTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/rules/ValidationResultsTests.java
Added Paths:
-----------
trunk/spring-richclient/core/src/main/java/org/springframework/richclient/core/Message.java
trunk/spring-richclient/core/src/main/java/org/springframework/richclient/core/Severity.java
Removed Paths:
-------------
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/Severity.java
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/Message.java
Deleted:
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/Severity.java
===================================================================
---
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/Severity.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/Severity.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -1,31 +0,0 @@
-/*
- * 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.binding.validation;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-public class Severity extends ShortCodedLabeledEnum {
-
- public static final Severity INFO = new Severity(0, "info");
-
- public static final Severity WARNING = new Severity(50, "warning");
-
- public static final Severity ERROR = new Severity(100, "error");
-
- protected Severity(int magnitude, String label) {
- super(magnitude, label);
- }
-}
\ No newline at end of file
Modified:
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationMessage.java
===================================================================
---
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationMessage.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationMessage.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -15,7 +15,9 @@
*/
package org.springframework.binding.validation;
-public interface ValidationMessage {
+import org.springframework.richclient.core.Message;
+
+public interface ValidationMessage extends Message {
/**
* The property name for messages that have a global scope i.e. do not
@@ -24,25 +26,10 @@
public static final String GLOBAL_PROPERTY = null;
/**
- * The time that this validation message was created.
- */
- long getTimeStamp();
-
- /**
* The property that this validation message applies to; or
* <code>GLOBAL_PROPERTY</code> if this message does not apply
* to a specific property.
*/
String getProperty();
- /**
- * The severity of this message.
- */
- Severity getSeverity();
-
- /**
- * The text of this message. If any i18n is applcable this must
- * have already been allied to this message.
- */
- String getMessage();
}
Modified:
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationMessageComparator.java
===================================================================
---
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationMessageComparator.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationMessageComparator.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -40,7 +40,7 @@
ValidationMessage m1 = (ValidationMessage)o1;
ValidationMessage m2 = (ValidationMessage)o2;
int c;
- if (m1.getTimeStamp() == m2.getTimeStamp()) {
+ if (m1.getTimestamp() == m2.getTimestamp()) {
c = NullSafeComparator.NULLS_HIGH.compare(m1.getProperty(),
m2.getProperty());
if (c == 0) {
c = m1.getSeverity().compareTo(m2.getSeverity());
@@ -50,7 +50,7 @@
}
}
else {
- c = (m1.getTimeStamp() > m2.getTimeStamp()) ? -1 : 1;
+ c = (m1.getTimestamp() > m2.getTimestamp()) ? -1 : 1;
}
return c;
}
Modified:
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationResults.java
===================================================================
---
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationResults.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/ValidationResults.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -17,6 +17,8 @@
import java.util.Set;
+import org.springframework.richclient.core.Severity;
+
/**
* Interface to be implemented by objects that hold a list of validation
results for
* a specific object.
Copied:
trunk/spring-richclient/core/src/main/java/org/springframework/richclient/core/Message.java
(from rev 1772,
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/Message.java)
===================================================================
---
trunk/spring-richclient/core/src/main/java/org/springframework/richclient/core/Message.java
(rev 0)
+++
trunk/spring-richclient/core/src/main/java/org/springframework/richclient/core/Message.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -0,0 +1,44 @@
+/*
+ * 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 javax.swing.JComponent;
+
+
+public interface Message {
+
+ /**
+ * Timestamp of message creation.
+ *
+ * @return time in long format.
+ */
+ long getTimestamp();
+
+ /**
+ * @return textual message.
+ */
+ String getMessage();
+
+ /**
+ * @return Severity of this message.
+ */
+ Severity getSeverity();
+
+ /**
+ * @param component visual component to decorate.
+ */
+ void renderMessage(JComponent component);
+}
\ No newline at end of file
Copied:
trunk/spring-richclient/core/src/main/java/org/springframework/richclient/core/Severity.java
(from rev 1758,
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/validation/Severity.java)
===================================================================
---
trunk/spring-richclient/core/src/main/java/org/springframework/richclient/core/Severity.java
(rev 0)
+++
trunk/spring-richclient/core/src/main/java/org/springframework/richclient/core/Severity.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -0,0 +1,31 @@
+/*
+ * 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 org.springframework.core.enums.ShortCodedLabeledEnum;
+
+public class Severity extends ShortCodedLabeledEnum {
+
+ public static final Severity INFO = new Severity(0, "info");
+
+ public static final Severity WARNING = new Severity(50, "warning");
+
+ public static final Severity ERROR = new Severity(100, "error");
+
+ protected Severity(int magnitude, String label) {
+ super(magnitude, label);
+ }
+}
\ No newline at end of file
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-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/sandbox/src/main/java/org/springframework/richclient/preference/PreferenceManager.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -19,10 +19,10 @@
import java.util.Iterator;
import java.util.List;
-import org.springframework.binding.validation.Severity;
import org.springframework.richclient.application.ApplicationServicesLocator;
import
org.springframework.richclient.application.config.ApplicationObjectConfigurer;
import org.springframework.richclient.core.DefaultMessage;
+import org.springframework.richclient.core.Severity;
import org.springframework.richclient.dialog.MessageDialog;
import org.springframework.richclient.settings.SettingsException;
import org.springframework.richclient.settings.SettingsManager;
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationMessage.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationMessage.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationMessage.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -15,12 +15,10 @@
*/
package org.springframework.binding.validation.support;
-import java.io.Serializable;
-
-import org.springframework.binding.validation.Severity;
import org.springframework.binding.validation.ValidationMessage;
import org.springframework.core.style.ToStringCreator;
-import org.springframework.richclient.util.Assert;
+import org.springframework.richclient.core.DefaultMessage;
+import org.springframework.richclient.core.Severity;
import org.springframework.util.ObjectUtils;
/**
@@ -28,40 +26,18 @@
*
* @author Oliver Hutchison
*/
-public class DefaultValidationMessage implements ValidationMessage,
Serializable {
- private final long timeStamp;
-
+public class DefaultValidationMessage extends DefaultMessage implements
ValidationMessage {
private final String property;
- private final Severity severity;
-
- private final String message;
-
public DefaultValidationMessage(String property, Severity severity, String
message) {
- Assert.required(severity, "severity");
- Assert.required(message, "message");
- this.timeStamp = System.currentTimeMillis();
+ super(message, severity);
this.property = property;
- this.severity = severity;
- this.message = message;
}
- public long getTimeStamp() {
- return timeStamp;
- }
-
public String getProperty() {
return property;
}
- public Severity getSeverity() {
- return severity;
- }
-
- public String getMessage() {
- return message;
- }
-
public int hashCode() {
return (getProperty() != null ? (getProperty().hashCode() * 27) : 0) +
(getSeverity().getShortCode() * 9)
+ getMessage().hashCode();
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationResults.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationResults.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationResults.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -21,10 +21,10 @@
import java.util.Iterator;
import java.util.Set;
-import org.springframework.binding.validation.Severity;
import org.springframework.binding.validation.ValidationMessage;
import org.springframework.binding.validation.ValidationResults;
import org.springframework.core.style.ToStringCreator;
+import org.springframework.richclient.core.Severity;
import org.springframework.util.CachingMapDecorator;
import org.springframework.util.ObjectUtils;
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationResultsModel.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationResultsModel.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/DefaultValidationResultsModel.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -23,12 +23,12 @@
import java.util.List;
import java.util.Set;
-import org.springframework.binding.validation.Severity;
import org.springframework.binding.validation.ValidationListener;
import org.springframework.binding.validation.ValidationMessage;
import org.springframework.binding.validation.ValidationResults;
import org.springframework.binding.validation.ValidationResultsModel;
import org.springframework.core.style.ToStringCreator;
+import org.springframework.richclient.core.Severity;
import org.springframework.richclient.util.Assert;
import org.springframework.richclient.util.EventListenerListHelper;
import org.springframework.util.CachingMapDecorator;
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/EmptyValidationResults.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/EmptyValidationResults.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/EmptyValidationResults.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -18,9 +18,9 @@
import java.util.Collections;
import java.util.Set;
-import org.springframework.binding.validation.Severity;
import org.springframework.binding.validation.ValidationResults;
import org.springframework.core.style.ToStringCreator;
+import org.springframework.richclient.core.Severity;
/**
* An implementation of ValidationResults that contains no results.
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/RulesValidator.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/RulesValidator.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/RulesValidator.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -24,10 +24,10 @@
import org.springframework.binding.form.FormModel;
import
org.springframework.binding.form.support.FormModelPropertyAccessStrategy;
import org.springframework.binding.validation.RichValidator;
-import org.springframework.binding.validation.Severity;
import org.springframework.binding.validation.ValidationMessage;
import org.springframework.binding.validation.ValidationResults;
import org.springframework.richclient.application.ApplicationServicesLocator;
+import org.springframework.richclient.core.Severity;
import org.springframework.rules.PropertyConstraintProvider;
import org.springframework.rules.Rules;
import org.springframework.rules.RulesSource;
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/ValangRichValidator.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/ValangRichValidator.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/ValangRichValidator.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -36,13 +36,13 @@
import org.springframework.beans.TypeMismatchException;
import org.springframework.binding.form.FormModel;
import org.springframework.binding.validation.RichValidator;
-import org.springframework.binding.validation.Severity;
import org.springframework.binding.validation.ValidationMessage;
import org.springframework.binding.validation.ValidationResults;
import org.springframework.context.support.MessageSourceAccessor;
import org.springframework.core.MethodParameter;
import org.springframework.core.ReflectiveVisitorHelper;
import org.springframework.richclient.application.ApplicationServicesLocator;
+import org.springframework.richclient.core.Severity;
import org.springframework.util.Assert;
import org.springframework.util.CachingMapDecorator;
import org.springframework.util.StringUtils;
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-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/control/MessageReportingOverlay.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -17,12 +17,12 @@
import javax.swing.JLabel;
-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.core.Severity;
import org.springframework.richclient.dialog.Messagable;
import org.springframework.richclient.image.IconSource;
import org.springframework.richclient.util.OverlayHelper;
Modified:
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
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/DefaultMessage.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -16,14 +16,12 @@
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;
@@ -32,11 +30,11 @@
import org.springframework.util.ObjectUtils;
public class DefaultMessage implements Message, Serializable {
- private long timestamp = new Date().getTime();
+ private final long timestamp;
- private String text;
+ private final String message;
- private Severity severity;
+ private final Severity severity;
public static DefaultMessage EMPTY_MESSAGE = new DefaultMessage("", null);
@@ -44,11 +42,12 @@
this(text, Severity.INFO);
}
- public DefaultMessage(String text, Severity severity) {
- if (text == null) {
- text = "";
+ public DefaultMessage(String message, Severity severity) {
+ if (message == null) {
+ message = "";
}
- this.text = text;
+ this.timestamp = System.currentTimeMillis();
+ this.message = message;
this.severity = severity;
}
@@ -57,7 +56,7 @@
}
public String getMessage() {
- return text;
+ return message;
}
public Severity getSeverity() {
@@ -96,14 +95,14 @@
return false;
}
DefaultMessage m = (DefaultMessage)o;
- return text.equals(m.text) && ObjectUtils.nullSafeEquals(severity,
m.severity);
+ return message.equals(m.message) &&
ObjectUtils.nullSafeEquals(severity, m.severity);
}
public int hashCode() {
- return text.hashCode() + (severity != null ? severity.hashCode() : 0);
+ return message.hashCode() + (severity != null ? severity.hashCode() :
0);
}
public String toString() {
- return new ToStringCreator(this).append("message",
text).append("severity", severity).toString();
+ return new ToStringCreator(this).append("message",
message).append("severity", severity).toString();
}
}
\ No newline at end of file
Deleted:
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-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/core/Message.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -1,45 +0,0 @@
-/*
- * 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 javax.swing.JComponent;
-
-import org.springframework.binding.validation.Severity;
-
-public interface Message {
-
- /**
- * Timestamp of message creation.
- *
- * @return time in long format.
- */
- long getTimestamp();
-
- /**
- * @return textual message.
- */
- String getMessage();
-
- /**
- * @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-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/AlertMessageAreaPane.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -29,8 +29,8 @@
import javax.swing.UIManager;
import javax.swing.text.html.HTMLDocument;
-import org.springframework.binding.validation.Severity;
import org.springframework.richclient.core.Message;
+import org.springframework.richclient.core.Severity;
import org.springframework.richclient.core.UIConstants;
import org.springframework.richclient.factory.AbstractControlFactory;
import org.springframework.richclient.text.HtmlPane;
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-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/DefaultMessageAreaModel.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -20,9 +20,9 @@
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.core.Severity;
import org.springframework.richclient.util.EventListenerListHelper;
import org.springframework.util.ObjectUtils;
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-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/exceptionhandling/DefaultRegisterableExceptionHandler.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -9,8 +9,8 @@
import
org.springframework.richclient.application.config.ApplicationLifecycleAdvisor;
import org.springframework.richclient.core.DefaultMessage;
import org.springframework.richclient.core.Message;
+import org.springframework.richclient.core.Severity;
import org.springframework.util.StringUtils;
-import org.springframework.binding.validation.Severity;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
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-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/SimpleValidationResultsReporter.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -22,7 +22,6 @@
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.dialog.Messagable;
import org.springframework.util.Assert;
@@ -92,8 +91,7 @@
logger.debug("Form has errors; setting error
message.");
}
ValidationMessage message =
getNewestMessage(resultsModel);
- messageReceiver.setMessage(message == null ? null
- : new
DefaultMessage(message.getMessage(), message.getSeverity()));
+ messageReceiver.setMessage(message);
}
}
@@ -107,7 +105,7 @@
ValidationMessage newestMessage = null;
for (Iterator i = resultsModel.getMessages().iterator();
i.hasNext();) {
ValidationMessage message = (ValidationMessage)
i.next();
- if (newestMessage == null ||
newestMessage.getTimeStamp() < message.getTimeStamp()) {
+ if (newestMessage == null ||
newestMessage.getTimestamp() < message.getTimestamp()) {
newestMessage = message;
}
}
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/builder/support/OverlayValidationInterceptorFactory.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/builder/support/OverlayValidationInterceptorFactory.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/builder/support/OverlayValidationInterceptorFactory.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -23,8 +23,8 @@
import javax.swing.SwingConstants;
import org.springframework.binding.form.FormModel;
-import org.springframework.binding.validation.Severity;
import org.springframework.richclient.control.MessageReportingOverlay;
+import org.springframework.richclient.core.Severity;
import org.springframework.richclient.form.builder.FormComponentInterceptor;
import
org.springframework.richclient.form.builder.FormComponentInterceptorFactory;
import org.springframework.richclient.util.OverlayHelper;
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-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/form/builder/support/ValidationInterceptor.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -23,9 +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;
/**
@@ -97,7 +95,7 @@
public void validationResultsChanged(ValidationResults results)
{
if (results.getMessageCount(propertyName) > 0) {
ValidationMessage message =
getNewestMessage(results);
- messageReceiver.setMessage(new
DefaultMessage(message.getMessage(), message.getSeverity()));
+ messageReceiver.setMessage(message);
}
else {
messageReceiver.setMessage(null);
@@ -108,7 +106,7 @@
ValidationMessage newestMessage = null;
for (Iterator i =
results.getMessages(propertyName).iterator(); i.hasNext();) {
ValidationMessage message = (ValidationMessage)
i.next();
- if (newestMessage == null ||
newestMessage.getTimeStamp() < message.getTimeStamp()) {
+ if (newestMessage == null ||
newestMessage.getTimestamp() < message.getTimestamp()) {
newestMessage = message;
}
}
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/PropertyResults.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/PropertyResults.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/PropertyResults.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -17,10 +17,10 @@
import java.util.Locale;
-import org.springframework.binding.validation.Severity;
import org.springframework.context.MessageSource;
import org.springframework.core.closure.Constraint;
import org.springframework.richclient.application.ApplicationServicesLocator;
+import org.springframework.richclient.core.Severity;
/**
* @author Keith Donald
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/ValidationResults.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/ValidationResults.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/ValidationResults.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -7,8 +7,8 @@
*/
package org.springframework.rules.reporting;
-import org.springframework.binding.validation.Severity;
import org.springframework.core.closure.Constraint;
+import org.springframework.richclient.core.Severity;
/**
* @author Keith Donald
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/ValueValidationResults.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/ValueValidationResults.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/rules/reporting/ValueValidationResults.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -1,7 +1,7 @@
package org.springframework.rules.reporting;
-import org.springframework.binding.validation.Severity;
import org.springframework.core.closure.Constraint;
+import org.springframework.richclient.core.Severity;
/**
* @author Keith Donald
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/DefaultFormModelTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/DefaultFormModelTests.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/DefaultFormModelTests.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -25,7 +25,6 @@
import org.springframework.binding.support.BeanPropertyAccessStrategy;
import org.springframework.binding.support.TestBean;
import org.springframework.binding.support.TestPropertyChangeListener;
-import org.springframework.binding.validation.Severity;
import org.springframework.binding.validation.ValidationMessage;
import org.springframework.binding.validation.ValidationResults;
import org.springframework.binding.validation.ValidationResultsModel;
@@ -34,6 +33,7 @@
import org.springframework.binding.validation.support.DefaultValidationResults;
import org.springframework.binding.value.ValueModel;
import org.springframework.binding.value.support.ValueHolder;
+import org.springframework.richclient.core.Severity;
import java.util.Set;
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationMessageTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationMessageTests.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationMessageTests.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -16,6 +16,7 @@
package org.springframework.binding.validation;
import org.springframework.binding.validation.support.DefaultValidationMessage;
+import org.springframework.richclient.core.Severity;
import junit.framework.TestCase;
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationResultsModelTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationResultsModelTests.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationResultsModelTests.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -21,6 +21,7 @@
import org.springframework.binding.validation.support.DefaultValidationMessage;
import org.springframework.binding.validation.support.DefaultValidationResults;
import
org.springframework.binding.validation.support.DefaultValidationResultsModel;
+import org.springframework.richclient.core.Severity;
/**
* Tests for @link DefaultValidationResultsModel
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationResultsTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationResultsTests.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/validation/DefaultValidationResultsTests.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -19,6 +19,7 @@
import org.springframework.binding.validation.support.DefaultValidationMessage;
import org.springframework.binding.validation.support.DefaultValidationResults;
+import org.springframework.richclient.core.Severity;
import junit.framework.TestCase;
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-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/dialog/DefaultMessageAreaModelTests.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -20,8 +20,8 @@
import junit.framework.TestCase;
-import org.springframework.binding.validation.Severity;
import org.springframework.richclient.core.DefaultMessage;
+import org.springframework.richclient.core.Severity;
/**
* @author Peter De Bruycker
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/rules/ValidationResultsTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/rules/ValidationResultsTests.java
2007-07-09 07:58:55 UTC (rev 1772)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/rules/ValidationResultsTests.java
2007-07-09 13:32:49 UTC (rev 1773)
@@ -4,18 +4,23 @@
*/
package org.springframework.rules;
+import java.util.Date;
import java.util.Locale;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.support.StaticMessageSource;
import org.springframework.core.closure.Constraint;
import
org.springframework.richclient.application.support.DefaultApplicationServices;
import org.springframework.richclient.test.SpringRichTestCase;
import org.springframework.rules.constraint.CompoundConstraint;
import
org.springframework.rules.constraint.property.CompoundPropertyConstraint;
import org.springframework.rules.factory.Constraints;
+import org.springframework.rules.reporting.AlternativeMessageTranslator;
import org.springframework.rules.reporting.BeanValidationResults;
import org.springframework.rules.reporting.BeanValidationResultsCollector;
+import org.springframework.rules.reporting.DefaultMessageTranslator;
+import org.springframework.rules.reporting.MessageTranslator;
/**
* @author Keith Donald
@@ -83,4 +88,85 @@
message);
}
+ public void testJan()
+ {
+ StaticMessageSource messageSource = new StaticMessageSource();
+ messageSource.addMessage("greaterThan", Locale.getDefault(),
"greater than {0}");
+ messageSource.addMessage("greaterThanEqualTo",
Locale.getDefault(), "at least {0}");
+ messageSource.addMessage("lessThan", Locale.getDefault(), "less
than {0}");
+ messageSource.addMessage("lessThanEqualTo",
Locale.getDefault(), "no more than {0}");
+ messageSource.addMessage("equalTo", Locale.getDefault(), "equal
{0}");
+ messageSource.addMessage("required", Locale.getDefault(),
"required");
+ messageSource.addMessage("present", Locale.getDefault(),
"present");
+ messageSource.addMessage("typeMismatch", Locale.getDefault(),
"{0} has an invalid format");
+ messageSource.addMessage("unknown", Locale.getDefault(), "{0}
has an invalid format");
+ messageSource.addMessage("unique", Locale.getDefault(), "not
already exist");
+ messageSource.addMessage("range", Locale.getDefault(), "in
range {0} to {1}");
+ messageSource.addMessage("stringLengthConstraint",
Locale.getDefault(), "must be {0} characters");
+ messageSource.addMessage("fileChecks.FileExists",
Locale.getDefault(), "does not exist");
+ messageSource.addMessage("fileChecks.FileIsFile",
Locale.getDefault(), "is a directory");
+ messageSource.addMessage("fileChecks.FileIsReadable",
Locale.getDefault(), "is not readable");
+ messageSource.addMessage("and", Locale.getDefault(), "and");
+ messageSource.addMessage("or", Locale.getDefault(), "or");
+ messageSource.addMessage("not", Locale.getDefault(), "not");
+ messageSource.addMessage("verb.default", Locale.getDefault(),
"must be");
+ messageSource.addMessage("verb.default.negated",
Locale.getDefault(), "must not be");
+
+ DefaultMessageTranslator defaultTranslator = new
DefaultMessageTranslator(messageSource);
+ constraintMessages(defaultTranslator);
+ }
+
+ public void testJan2()
+ {
+ StaticMessageSource messageSource = new StaticMessageSource();
+ messageSource.addMessage("greaterThan", Locale.getDefault(),
"{0} greater than {1}");
+ messageSource.addMessage("greaterThanEqualTo",
Locale.getDefault(), "at least {0}");
+ messageSource.addMessage("lessThan", Locale.getDefault(), "{0}
less than {1}");
+ messageSource.addMessage("lessThanEqualTo",
Locale.getDefault(), "{0} no more than {1}");
+ messageSource.addMessage("equalTo", Locale.getDefault(), "{0}
equals {1}");
+ messageSource.addMessage("required", Locale.getDefault(), "{0}
required");
+ messageSource.addMessage("present", Locale.getDefault(), "{0}
present");
+ messageSource.addMessage("typeMismatch", Locale.getDefault(),
"{0} has an invalid format");
+ messageSource.addMessage("unknown", Locale.getDefault(), "{0}
has an invalid format");
+ messageSource.addMessage("unique", Locale.getDefault(), "{0}
not already exist");
+ messageSource.addMessage("range", Locale.getDefault(), "{0} in
range {1} to {2}");
+ messageSource.addMessage("stringLengthConstraint",
Locale.getDefault(), "{0} must be {1} characters");
+ messageSource.addMessage("fileChecks.FileExists",
Locale.getDefault(), "{0} does not exist");
+ messageSource.addMessage("fileChecks.FileIsFile",
Locale.getDefault(), "{0} is a directory");
+ messageSource.addMessage("fileChecks.FileIsReadable",
Locale.getDefault(), "{0} is not readable");
+ messageSource.addMessage("and", Locale.getDefault(), "and");
+ messageSource.addMessage("or", Locale.getDefault(), "or");
+ messageSource.addMessage("not", Locale.getDefault(), "not");
+ messageSource.addMessage("verb.default", Locale.getDefault(),
"must be");
+ messageSource.addMessage("verb.default.negated",
Locale.getDefault(), "must not be");
+
+ messageSource.addMessage("parameterizedBinaryConstraint",
Locale.getDefault(), "{0}");
+
+ AlternativeMessageTranslator translator = new
AlternativeMessageTranslator(messageSource);
+ constraintMessages(translator);
+ }
+
+ private void constraintMessages(MessageTranslator translator)
+ {
+ Constraints c = Constraints.instance();
+ String prefix = translator.getClass().getSimpleName() + ": ";
+ System.out.println(prefix + translator.getMessage("lastName",
null, c.required()));
+ System.out.println(prefix +
translator.getMessage(c.present("lastName")));
+ System.out.println(prefix +
translator.getMessage(c.value("age", c.gt(18))));
+ System.out.println(prefix +
translator.getMessage(c.gteProperty("age", "workyears")));
+ System.out.println(prefix + translator.getMessage("age", null,
c.range(18, 60)));
+ System.out.println(prefix + translator.getMessage("age", null,
c.lt(new Date())));
+
+
+ CompoundConstraint constraint =
+ constraints.or(
+ constraints.all(
+ "firstName",
+ new Constraint[]{
+
constraints.required(),
+
constraints.minLength(2)}),
+ constraints.not(
+
constraints.eqProperty("firstName", "lastName")));
+ System.out.println(prefix + translator.getMessage("firstName",
null, constraint));
+ }
}
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
