[jboss-cvs] jboss-seam/src/main/org/jboss/seam/jsf ...
Gavin King
gavin.king at jboss.com
Wed Oct 25 11:14:36 EDT 2006
User: gavin
Date: 06/10/25 11:14:36
Modified: src/main/org/jboss/seam/jsf MapDataModel.java
SeamStateManager.java SeamVariableResolver.java
SetDataModel.java
Log:
many minor
Revision Changes Path
1.2 +8 -1 jboss-seam/src/main/org/jboss/seam/jsf/MapDataModel.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MapDataModel.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/MapDataModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MapDataModel.java 12 Jun 2006 19:47:00 -0000 1.1
+++ MapDataModel.java 25 Oct 2006 15:14:36 -0000 1.2
@@ -1,4 +1,4 @@
-//$Id: MapDataModel.java,v 1.1 2006/06/12 19:47:00 gavin Exp $
+//$Id: MapDataModel.java,v 1.2 2006/10/25 15:14:36 gavin Exp $
package org.jboss.seam.jsf;
import java.io.IOException;
@@ -33,6 +33,7 @@
setWrappedData(map);
}
+ @Override
public int getRowCount()
{
if (map == null)
@@ -45,6 +46,7 @@
/**
* Returns a Map.Entry
*/
+ @Override
public Object getRowData()
{
if (map == null)
@@ -58,21 +60,25 @@
return entries.get(rowIndex);
}
+ @Override
public int getRowIndex()
{
return rowIndex;
}
+ @Override
public Object getWrappedData()
{
return map;
}
+ @Override
public boolean isRowAvailable()
{
return entries!=null && rowIndex >= 0 && rowIndex < entries.size();
}
+ @Override
public void setRowIndex(int newRowIndex)
{
if (newRowIndex < -1)
@@ -93,6 +99,7 @@
}
}
+ @Override
public void setWrappedData(Object data)
{
map = (Map) data;
1.6 +8 -0 jboss-seam/src/main/org/jboss/seam/jsf/SeamStateManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamStateManager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamStateManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SeamStateManager.java 8 Oct 2006 23:12:24 -0000 1.5
+++ SeamStateManager.java 25 Oct 2006 15:14:36 -0000 1.6
@@ -23,36 +23,44 @@
this.stateManager = sm;
}
+ @Override
protected Object getComponentStateToSave(FacesContext ctx) {
throw new UnsupportedOperationException();
}
+ @Override
protected Object getTreeStructureToSave(FacesContext ctx) {
throw new UnsupportedOperationException();
}
+ @Override
protected void restoreComponentState(FacesContext ctx, UIViewRoot viewRoot, String str) {
throw new UnsupportedOperationException();
}
+ @Override
protected UIViewRoot restoreTreeStructure(FacesContext ctx, String str1, String str2) {
throw new UnsupportedOperationException();
}
+ @Override
public UIViewRoot restoreView(FacesContext ctx, String str1, String str2) {
return stateManager.restoreView(ctx, str1, str2);
}
+ @Override
public SerializedView saveSerializedView(FacesContext facesContext) {
Pages.instance().storePageParameters(facesContext);
AbstractSeamPhaseListener.storeAnyConversationContext(facesContext);
return stateManager.saveSerializedView(facesContext);
}
+ @Override
public void writeState(FacesContext ctx, SerializedView sv) throws IOException {
stateManager.writeState(ctx, sv);
}
+ @Override
public boolean isSavingStateInClient(FacesContext ctx) {
return stateManager.isSavingStateInClient(ctx);
}
1.16 +2 -1 jboss-seam/src/main/org/jboss/seam/jsf/SeamVariableResolver.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamVariableResolver.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamVariableResolver.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- SeamVariableResolver.java 30 Jun 2006 09:26:57 -0000 1.15
+++ SeamVariableResolver.java 25 Oct 2006 15:14:36 -0000 1.16
@@ -22,7 +22,7 @@
*
* @author Gavin King
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class SeamVariableResolver extends VariableResolver
{
@@ -36,6 +36,7 @@
this.jsfVariableResolver = jsfVariableResolver;
}
+ @Override
public Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException
{
name = name.replace('$', '.');
1.2 +8 -1 jboss-seam/src/main/org/jboss/seam/jsf/SetDataModel.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SetDataModel.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SetDataModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SetDataModel.java 12 Jun 2006 19:47:00 -0000 1.1
+++ SetDataModel.java 25 Oct 2006 15:14:36 -0000 1.2
@@ -1,4 +1,4 @@
-//$Id: SetDataModel.java,v 1.1 2006/06/12 19:47:00 gavin Exp $
+//$Id: SetDataModel.java,v 1.2 2006/10/25 15:14:36 gavin Exp $
package org.jboss.seam.jsf;
import java.io.IOException;
@@ -33,6 +33,7 @@
setWrappedData(set);
}
+ @Override
public int getRowCount()
{
if (set==null)
@@ -42,6 +43,7 @@
return set.size();
}
+ @Override
public Object getRowData()
{
if (set == null)
@@ -55,21 +57,25 @@
return entries.get(rowIndex);
}
+ @Override
public int getRowIndex()
{
return rowIndex;
}
+ @Override
public Object getWrappedData()
{
return set;
}
+ @Override
public boolean isRowAvailable()
{
return entries!=null && rowIndex >= 0 && rowIndex < entries.size();
}
+ @Override
public void setRowIndex(int newRowIndex)
{
if (newRowIndex < -1)
@@ -90,6 +96,7 @@
}
}
+ @Override
public void setWrappedData(Object data)
{
set = (Set) data;
More information about the jboss-cvs-commits
mailing list