Author: simoneg
Date: Tue Sep 22 12:14:56 2009
New Revision: 817631
URL: http://svn.apache.org/viewvc?rev=817631&view=rev
Log:
LABS-465: display unmatched errors
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/magmaBeansview.css
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java?rev=817631&r1=817630&r2=817631&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
Tue Sep 22 12:14:56 2009
@@ -38,6 +38,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -48,6 +49,7 @@
private static int MAX_FIELD_SIZE = 80;
private List<LocalizableStringWithSubject> errors;
+ private List<LocalizableString> sentErrors = new
ArrayList<LocalizableString>();
private String code;
private Map<String, List<?>> lists = new HashMap<String, List<?>>();
private BeanHandler handler;
@@ -80,7 +82,30 @@
i++;
}
}
- out.write("</div></form>");
+ out.write("</div>");
+ List<LocalizableString> allerrs = new
ArrayList<LocalizableString>(this.errors);
+ allerrs.removeAll(sentErrors);
+ if (allerrs.size() > 0) {
+ out.write("<div
class=\"MagmaFormAdditionalErrors\"><ul>");
+ for (LocalizableString errmsg : allerrs) {
+ out.write("<li>");
+ if (errmsg instanceof
LocalizableStringWithSubject) {
+ Object subject =
((LocalizableStringWithSubject)errmsg).getSubject();
+ if (subject instanceof
PropertyInfo) {
+ out.write(new
LocalizableString(((PropertyInfo)subject).getName()).toString());
+ } else {
+
out.write(subject.toString());
+ }
+ out.write(" : ");
+ out.write(errmsg.toString());
+ } else {
+ out.write(errmsg.toString());
+ }
+ out.write("</li>");
+ }
+ out.write("</ul></div>");
+ }
+ out.write("</form>");
} catch (IOException e) {
throw new MagmaException(e, "Error writing to output");
}
@@ -122,6 +147,7 @@
if (errs.size() > 0) {
createBlockErrorsOutput(node, out, errs);
}
+ sentErrors.addAll(errs);
}
private void createInlineErrorsOutput(LabelNode node, Writer out,
List<LocalizableString> errs) throws IOException {
Modified:
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/magmaBeansview.css
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/magmaBeansview.css?rev=817631&r1=817630&r2=817631&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/magmaBeansview.css
(original)
+++
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/magmaBeansview.css
Tue Sep 22 12:14:56 2009
@@ -136,6 +136,14 @@
background-color: #FFFFAE;
}
+.MagmaFormAdditionalErrors {
+ background-color: #FFFFAE;
+ font-size: 80%;
+ font-style: oblique;
+ color: #C7000A;
+ padding-bottom: 8px;
+}
+
table.LayoutTable td.ForBean{
text-align: left;
font-style: oblique;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
