[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...
Peter Muir
peter at bleepbleep.org.uk
Sat Mar 17 15:22:54 EDT 2007
User: pmuir
Date: 07/03/17 15:22:54
Modified: src/ui/org/jboss/seam/ui EntityConverterStore.java
HtmlLayoutForm.java
Log:
use Page scope for EntityConverterStore, minor fix for layoutForm
Revision Changes Path
1.5 +5 -4 jboss-seam/src/ui/org/jboss/seam/ui/EntityConverterStore.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EntityConverterStore.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/EntityConverterStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- EntityConverterStore.java 16 Mar 2007 01:11:00 -0000 1.4
+++ EntityConverterStore.java 17 Mar 2007 19:22:54 -0000 1.5
@@ -1,5 +1,6 @@
package org.jboss.seam.ui;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -14,12 +15,12 @@
import org.jboss.seam.util.Proxy;
@Name("org.jboss.seam.ui.entityConverterStore")
- at Scope(ScopeType.SESSION)
+ at Scope(ScopeType.PAGE)
@Intercept(InterceptionType.NEVER)
public class EntityConverterStore extends AbstractMutable
{
- private class Key
+ private class Key implements Serializable
{
private Class clazz;
private Object id;
@@ -87,9 +88,9 @@
public static EntityConverterStore instance()
{
- if (!Contexts.isSessionContextActive())
+ if (!Contexts.isPageContextActive())
{
- throw new IllegalArgumentException("Session scope not active");
+ throw new IllegalArgumentException("Page scope not active");
}
return (EntityConverterStore) Component.getInstance(EntityConverterStore.class);
}
1.6 +1 -1 jboss-seam/src/ui/org/jboss/seam/ui/HtmlLayoutForm.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HtmlLayoutForm.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlLayoutForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- HtmlLayoutForm.java 17 Mar 2007 18:20:07 -0000 1.5
+++ HtmlLayoutForm.java 17 Mar 2007 19:22:54 -0000 1.6
@@ -211,7 +211,7 @@
Object[] array = (Object[]) state;
super.restoreState(context, array[0]);
labelColumnWidth = (String) array[1];
- fieldColumnWidth = (String) array[3];
+ fieldColumnWidth = (String) array[2];
}
@Override
More information about the jboss-cvs-commits
mailing list