[jboss-cvs] jboss-seam/src/main/org/jboss/seam/jsf ...
Shane Bryzak
Shane_Bryzak at symantec.com
Wed Dec 20 21:38:27 EST 2006
User: sbryzak2
Date: 06/12/20 21:38:27
Modified: src/main/org/jboss/seam/jsf ArrayDataModel.java
ListDataModel.java MapDataModel.java
SeamExtendedManagedPersistencePhaseListener.java
SeamExtendedManagedPersistencePortletPhaseListener.java
SeamPhaseListener.java
SeamPortletPhaseListener.java SetDataModel.java
TransactionalSeamPhaseListener.java
TransactionalSeamPortletPhaseListener.java
Log:
fixed compiler warnings
Revision Changes Path
1.2 +30 -33 jboss-seam/src/main/org/jboss/seam/jsf/ArrayDataModel.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ArrayDataModel.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/ArrayDataModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ArrayDataModel.java 27 Dec 2005 00:42:54 -0000 1.1
+++ ArrayDataModel.java 21 Dec 2006 02:38:27 -0000 1.2
@@ -1,33 +1,30 @@
-//$Id: ArrayDataModel.java,v 1.1 2005/12/27 00:42:54 gavin Exp $
+//$Id: ArrayDataModel.java,v 1.2 2006/12/21 02:38:27 sbryzak2 Exp $
package org.jboss.seam.jsf;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-
-public class ArrayDataModel extends javax.faces.model.ArrayDataModel implements Serializable
+public class ArrayDataModel extends javax.faces.model.ArrayDataModel implements
+ Serializable
{
+ private static final long serialVersionUID = -1369792328129853864L;
private void writeObject(ObjectOutputStream oos) throws IOException
{
- oos.writeObject( getWrappedData() );
- oos.writeInt( getRowIndex() );
+ oos.writeObject(getWrappedData());
+ oos.writeInt(getRowIndex());
}
-
- private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException
+ private void readObject(ObjectInputStream ois) throws IOException,
+ ClassNotFoundException
{
- this.setWrappedData( ois.readObject() );
- this.setRowIndex( ois.readInt() );
+ this.setWrappedData(ois.readObject());
+ this.setRowIndex(ois.readInt());
}
-
public ArrayDataModel()
{
super();
}
-
public ArrayDataModel(Object[] array)
{
super(array);
}
-
}
1.2 +30 -34 jboss-seam/src/main/org/jboss/seam/jsf/ListDataModel.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ListDataModel.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/ListDataModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ListDataModel.java 17 Sep 2005 20:19:53 -0000 1.1
+++ ListDataModel.java 21 Dec 2006 02:38:27 -0000 1.2
@@ -1,31 +1,27 @@
-//$Id: ListDataModel.java,v 1.1 2005/09/17 20:19:53 gavin Exp $
+//$Id: ListDataModel.java,v 1.2 2006/12/21 02:38:27 sbryzak2 Exp $
package org.jboss.seam.jsf;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.List;
-
public class ListDataModel extends javax.faces.model.ListDataModel implements Serializable
{
+ private static final long serialVersionUID = 5156131434571541698L;
private void writeObject(ObjectOutputStream oos) throws IOException
{
oos.writeObject( getWrappedData() );
oos.writeInt( getRowIndex() );
}
-
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException
{
this.setWrappedData( ois.readObject() );
this.setRowIndex( ois.readInt() );
}
-
public ListDataModel()
{
super();
}
-
public ListDataModel(List list)
{
super(list);
1.3 +113 -126 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- MapDataModel.java 25 Oct 2006 15:14:36 -0000 1.2
+++ MapDataModel.java 21 Dec 2006 02:38:27 -0000 1.3
@@ -1,6 +1,5 @@
-//$Id: MapDataModel.java,v 1.2 2006/10/25 15:14:36 gavin Exp $
+//$Id: MapDataModel.java,v 1.3 2006/12/21 02:38:27 sbryzak2 Exp $
package org.jboss.seam.jsf;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -8,22 +7,20 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
import javax.faces.model.DataModelEvent;
import javax.faces.model.DataModelListener;
-
public class MapDataModel extends javax.faces.model.DataModel implements
Serializable
{
+ private static final long serialVersionUID = -4888962547222002402L;
+
private int rowIndex = -1;
private Map map;
private List<Map.Entry> entries;
-
public MapDataModel()
{
super();
}
-
public MapDataModel(Map map)
{
if (map == null)
@@ -32,7 +29,6 @@
}
setWrappedData(map);
}
-
@Override
public int getRowCount()
{
@@ -42,7 +38,6 @@
}
return map.size();
}
-
/**
* Returns a Map.Entry
*/
@@ -59,25 +54,21 @@
}
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)
{
@@ -98,7 +89,6 @@
}
}
}
-
@Override
public void setWrappedData(Object data)
{
@@ -107,14 +97,12 @@
int rowIndex = data != null ? 0 : -1;
setRowIndex(rowIndex);
}
-
private void writeObject(ObjectOutputStream oos) throws IOException
{
oos.writeObject(map);
oos.writeInt(rowIndex);
oos.writeObject(entries);
}
-
private void readObject(ObjectInputStream ois) throws IOException,
ClassNotFoundException
{
@@ -122,5 +110,4 @@
rowIndex = ois.readInt();
entries = (List<Map.Entry>) ois.readObject();
}
-
}
1.24 +12 -9 jboss-seam/src/main/org/jboss/seam/jsf/SeamExtendedManagedPersistencePhaseListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamExtendedManagedPersistencePhaseListener.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamExtendedManagedPersistencePhaseListener.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- SeamExtendedManagedPersistencePhaseListener.java 4 Nov 2006 01:27:43 -0000 1.23
+++ SeamExtendedManagedPersistencePhaseListener.java 21 Dec 2006 02:38:27 -0000 1.24
@@ -1,9 +1,12 @@
package org.jboss.seam.jsf;
-
/**
* @deprecated use TransactionalSeamPhaseListener
* @author Gavin King
*
*/
public class SeamExtendedManagedPersistencePhaseListener extends
- TransactionalSeamPhaseListener {}
+ TransactionalSeamPhaseListener
+{
+ private static final long serialVersionUID = -3050332015324532147L;
+
+}
1.8 +11 -12 jboss-seam/src/main/org/jboss/seam/jsf/SeamExtendedManagedPersistencePortletPhaseListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamExtendedManagedPersistencePortletPhaseListener.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamExtendedManagedPersistencePortletPhaseListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- SeamExtendedManagedPersistencePortletPhaseListener.java 4 Nov 2006 01:27:43 -0000 1.7
+++ SeamExtendedManagedPersistencePortletPhaseListener.java 21 Dec 2006 02:38:27 -0000 1.8
@@ -1,5 +1,4 @@
package org.jboss.seam.jsf;
-
/**
* @deprecated use TransactionalSeamPortletPhaseListener
* @author Gavin King
@@ -8,5 +7,5 @@
public class SeamExtendedManagedPersistencePortletPhaseListener extends
TransactionalSeamPortletPhaseListener
{
-
+ private static final long serialVersionUID = 934882938114880667L;
}
1.96 +2 -1 jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamPhaseListener.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- SeamPhaseListener.java 18 Dec 2006 01:46:24 -0000 1.95
+++ SeamPhaseListener.java 21 Dec 2006 02:38:27 -0000 1.96
@@ -30,6 +30,7 @@
*/
public class SeamPhaseListener extends AbstractSeamPhaseListener
{
+ private static final long serialVersionUID = -9127555729455066493L;
private static final LogProvider log = Logging.getLogProvider(SeamPhaseListener.class);
1.19 +2 -1 jboss-seam/src/main/org/jboss/seam/jsf/SeamPortletPhaseListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamPortletPhaseListener.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamPortletPhaseListener.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- SeamPortletPhaseListener.java 18 Dec 2006 01:46:24 -0000 1.18
+++ SeamPortletPhaseListener.java 21 Dec 2006 02:38:27 -0000 1.19
@@ -33,6 +33,7 @@
*/
public class SeamPortletPhaseListener extends AbstractSeamPhaseListener
{
+ private static final long serialVersionUID = 262187729483387144L;
private static final LogProvider log = Logging.getLogProvider( SeamPortletPhaseListener.class );
1.3 +124 -123 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SetDataModel.java 25 Oct 2006 15:14:36 -0000 1.2
+++ SetDataModel.java 21 Dec 2006 02:38:27 -0000 1.3
@@ -1,4 +1,4 @@
-//$Id: SetDataModel.java,v 1.2 2006/10/25 15:14:36 gavin Exp $
+//$Id: SetDataModel.java,v 1.3 2006/12/21 02:38:27 sbryzak2 Exp $
package org.jboss.seam.jsf;
import java.io.IOException;
@@ -15,6 +15,7 @@
public class SetDataModel extends javax.faces.model.DataModel implements
Serializable
{
+ private static final long serialVersionUID = -616367764778689337L;
private int rowIndex = -1;
private Set set;
private List entries;
1.3 +58 -64 jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPhaseListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TransactionalSeamPhaseListener.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPhaseListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TransactionalSeamPhaseListener.java 8 Nov 2006 17:32:43 -0000 1.2
+++ TransactionalSeamPhaseListener.java 21 Dec 2006 02:38:27 -0000 1.3
@@ -1,11 +1,8 @@
-//$Id: TransactionalSeamPhaseListener.java,v 1.2 2006/11/08 17:32:43 gavin Exp $
+//$Id: TransactionalSeamPhaseListener.java,v 1.3 2006/12/21 02:38:27 sbryzak2 Exp $
package org.jboss.seam.jsf;
-
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
-
import org.jboss.seam.core.Init;
-
/**
* Transaction management for extended persistence contexts.
* A transaction spans the restore view, apply request values, process validations,
@@ -17,7 +14,7 @@
*/
public class TransactionalSeamPhaseListener extends SeamPhaseListener
{
-
+ private static final long serialVersionUID = -1069952157355781194L;
@Override
public void handleTransactionsBeforePhase(PhaseEvent event)
{
@@ -30,7 +27,6 @@
begin(phaseId);
}
}
-
@Override
public void handleTransactionsAfterPhase(PhaseEvent event)
{
@@ -45,7 +41,6 @@
commitOrRollback(phaseId); //we commit before destroying contexts, cos the contexts have the PC in them
}
}
-
@Override
protected void handleTransactionsAfterPageActions(PhaseEvent event)
{
@@ -60,5 +55,4 @@
protected void afterInvokeApplication() {
addTransactionFailedMessage();
}
-
}
1.3 +57 -63 jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPortletPhaseListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TransactionalSeamPortletPhaseListener.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPortletPhaseListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TransactionalSeamPortletPhaseListener.java 8 Nov 2006 17:32:43 -0000 1.2
+++ TransactionalSeamPortletPhaseListener.java 21 Dec 2006 02:38:27 -0000 1.3
@@ -1,9 +1,7 @@
-//$Id: TransactionalSeamPortletPhaseListener.java,v 1.2 2006/11/08 17:32:43 gavin Exp $
+//$Id: TransactionalSeamPortletPhaseListener.java,v 1.3 2006/12/21 02:38:27 sbryzak2 Exp $
package org.jboss.seam.jsf;
-
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
-
/**
* Transaction management for extended persistence contexts.
* A transaction spans the restore view, apply request values, process validations,
@@ -15,7 +13,7 @@
*/
public class TransactionalSeamPortletPhaseListener extends SeamPortletPhaseListener
{
-
+ private static final long serialVersionUID = -7594991008561871577L;
@Override
public void handleTransactionsBeforePhase(PhaseEvent event)
{
@@ -29,7 +27,6 @@
begin(phaseId);
}
}
-
@Override
public void handleTransactionsAfterPhase(PhaseEvent event)
{
@@ -44,7 +41,6 @@
commitOrRollback(phaseId); //we commit before destroying contexts, cos the contexts have the PC in them
}
}
-
@Override
protected void handleTransactionsAfterPageActions(PhaseEvent event)
{
@@ -54,10 +50,8 @@
begin(PhaseId.INVOKE_APPLICATION);
}
}
-
@Override
protected void afterInvokeApplication() {
addTransactionFailedMessage();
}
-
}
More information about the jboss-cvs-commits
mailing list