[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...
Shane Bryzak
Shane_Bryzak at symantec.com
Wed Dec 20 21:38:26 EST 2006
User: sbryzak2
Date: 06/12/20 21:38:26
Modified: src/main/org/jboss/seam/core Actor.java
BusinessProcess.java Conversation.java
ConversationEntries.java ConversationEntry.java
ConversationList.java ConversationStack.java
Dispatcher.java Expressions.java FacesMessages.java
FacesPage.java LocaleSelector.java
ManagedPersistenceContext.java Messages.java
Pageflow.java PersistenceContexts.java
Redirect.java ResourceBundle.java Switcher.java
TimeZoneSelector.java Transition.java
Log:
fixed compiler warnings
Revision Changes Path
1.13 +58 -67 jboss-seam/src/main/org/jboss/seam/core/Actor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Actor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Actor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Actor.java 24 Nov 2006 23:15:17 -0000 1.12
+++ Actor.java 21 Dec 2006 02:38:26 -0000 1.13
@@ -1,12 +1,9 @@
package org.jboss.seam.core;
-
import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
-
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
-
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
@@ -14,7 +11,6 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.contexts.Contexts;
-
/**
* Allows the application to specify the jBPM actorId
* during the login cycle.
@@ -27,17 +23,14 @@
@Install(dependencies="org.jboss.seam.core.jbpm", precedence=BUILT_IN)
public class Actor extends AbstractMutable implements Serializable
{
-
+ private static final long serialVersionUID = -6515302276074415520L;
private String id;
private Set<String> groupActorIds = new HashSet<String>();
-
//TODO: dirtyness for groupActorIds
-
public String getId()
{
return id;
}
-
public void setId(String id)
{
setDirty(this.id, id);
@@ -48,7 +41,6 @@
{
return groupActorIds;
}
-
public static Actor instance()
{
if ( !Contexts.isSessionContextActive() )
@@ -63,5 +55,4 @@
{
return "Actor(" + id + ")";
}
-
}
1.17 +307 -328 jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BusinessProcess.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- BusinessProcess.java 18 Dec 2006 20:23:08 -0000 1.16
+++ BusinessProcess.java 21 Dec 2006 02:38:26 -0000 1.17
@@ -1,12 +1,8 @@
package org.jboss.seam.core;
-
import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
-
import java.io.Serializable;
-
import javax.faces.application.FacesMessage;
-
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
@@ -16,7 +12,6 @@
import org.jboss.seam.contexts.Contexts;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.taskmgmt.exe.TaskInstance;
-
/**
* Holds the task and process ids for the current conversation,
* and provides programmatic control over the business process.
@@ -29,7 +24,7 @@
@Intercept(NEVER)
@Install(dependencies="org.jboss.seam.core.jbpm", precedence=BUILT_IN)
public class BusinessProcess extends AbstractMutable implements Serializable {
-
+ private static final long serialVersionUID = 4722350870845851070L;
private Long processId;
private Long taskId;
@@ -60,7 +55,6 @@
return hasCurrentProcess() &&
!org.jboss.seam.core.ProcessInstance.instance().hasEnded();
}
-
/**
* Is there a task instance associated with
* the current conversation?
@@ -69,7 +63,6 @@
{
return taskId!=null;
}
-
/**
* The jBPM process instance id associated with
* the current conversation.
@@ -77,7 +70,6 @@
public Long getProcessId() {
return processId;
}
-
/**
* Set the process instance id, without validating
* that the process instance actually exists.
@@ -86,7 +78,6 @@
setDirty(this.processId, processId);
this.processId = processId;
}
-
/**
* The jBPM task instance id associated with
* the current conversation.
@@ -94,7 +85,6 @@
public Long getTaskId() {
return taskId;
}
-
/**
* Set the task instance id, without validating
* that the task instance actually exists.
@@ -103,7 +93,6 @@
setDirty(this.taskId, taskId);
this.taskId = taskId;
}
-
/**
* Create a process instance and associate it with the
* current conversation.
@@ -120,7 +109,6 @@
Events.instance().raiseEvent("org.jboss.seam.createProcess." + processDefinitionName);
}
-
/**
* Start the current task, using the current actor id
*
@@ -141,7 +129,6 @@
Events.instance().raiseEvent("org.jboss.seam.startTask." + task.getTask().getName());
}
-
/**
* End the current task, via the given transition. If no transition name
* is given, check the Transition component for a transition, or use the
@@ -174,7 +161,6 @@
setTaskId(null); //TODO: do I really need this???!
Events.instance().raiseEvent("org.jboss.seam.endTask." + task.getTask().getName());
-
ProcessInstance process = org.jboss.seam.core.ProcessInstance.instance();
if ( process.hasEnded() )
{
@@ -254,7 +240,6 @@
return true;
}
}
-
/**
* Check that the task currently associated with the conversation
* exists and has not ended.
@@ -278,7 +263,6 @@
return true;
}
}
-
protected void taskNotFound(Long taskId)
{
FacesMessages.instance().addFromResourceBundle(
@@ -288,7 +272,6 @@
taskId
);
}
-
protected void taskEnded(Long taskId)
{
FacesMessages.instance().addFromResourceBundle(
@@ -298,7 +281,6 @@
taskId
);
}
-
protected void processEnded(Long processId)
{
FacesMessages.instance().addFromResourceBundle(
@@ -308,7 +290,6 @@
processId
);
}
-
protected void processNotFound(Long processId)
{
FacesMessages.instance().addFromResourceBundle(
@@ -318,11 +299,9 @@
processId
);
}
-
@Override
public String toString()
{
return "BusinessProcess(processId=" + processId + ",taskId=" + taskId + ")";
}
-
}
1.33 +372 -372 jboss-seam/src/main/org/jboss/seam/core/Conversation.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Conversation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Conversation.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- Conversation.java 17 Dec 2006 15:03:29 -0000 1.32
+++ Conversation.java 21 Dec 2006 02:38:26 -0000 1.33
@@ -29,7 +29,7 @@
@Install(precedence=BUILT_IN)
@Intercept(NEVER)
public class Conversation implements Serializable {
-
+ private static final long serialVersionUID = -6131304128727444876L;
private Integer timeout;
String description;
String viewId;
1.6 +82 -85 jboss-seam/src/main/org/jboss/seam/core/ConversationEntries.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationEntries.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationEntries.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ConversationEntries.java 19 Dec 2006 16:57:05 -0000 1.5
+++ ConversationEntries.java 21 Dec 2006 02:38:26 -0000 1.6
@@ -1,8 +1,6 @@
package org.jboss.seam.core;
-
import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
-
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
@@ -10,7 +8,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
@@ -18,7 +15,6 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.contexts.Contexts;
-
/**
* Manages a map of conversation id to ConversationEntry
* in the session context.
@@ -31,6 +27,7 @@
@Intercept(NEVER)
public class ConversationEntries extends AbstractMutable implements Serializable
{
+ private static final long serialVersionUID = 7996835952419813634L;
private Map<String, ConversationEntry> conversationIdEntryMap = new HashMap<String, ConversationEntry>();
public synchronized Collection<ConversationEntry> getConversationEntries()
1.33 +241 -267 jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationEntry.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- ConversationEntry.java 15 Dec 2006 12:52:45 -0000 1.32
+++ ConversationEntry.java 21 Dec 2006 02:38:26 -0000 1.33
@@ -2,14 +2,12 @@
*
*/
package org.jboss.seam.core;
-
import java.io.Serializable;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
-
/**
* Metadata about an active conversation. Also used
* by the conversation list and breadcrumbs.
@@ -19,6 +17,7 @@
*/
public final class ConversationEntry implements Serializable, Comparable<ConversationEntry>
{
+ private static final long serialVersionUID = 3624635335271963568L;
private long lastRequestTime;
private String description;
private String id;
@@ -34,7 +33,6 @@
private ConversationEntries entries;
private ReentrantLock lock;
-
public ConversationEntry(String id, List<String> stack, ConversationEntries entries)
{
this.id = id;
@@ -53,49 +51,40 @@
{
lock = new ReentrantLock(true);
}
-
touch();
}
-
public String getDescription()
{
return description;
}
-
void setDescription(String description)
{
entries.setDirty(this.description, description);
this.description = description;
}
-
public synchronized long getLastRequestTime()
{
return lastRequestTime;
}
-
synchronized void touch()
{
entries.setDirty();
lastRequestTime = System.currentTimeMillis();
lastDatetime = new Date();
}
-
public String getId()
{
return id;
}
-
public Date getStartDatetime()
{
return startDatetime;
}
-
public void destroy()
{
boolean success = Manager.instance().switchConversation( getId() );
if (success) Manager.instance().endConversation(false);
}
-
public void select()
{
switchConversation();
@@ -122,28 +111,23 @@
return false;
}
}
-
void setViewId(String viewId)
{
entries.setDirty(this.viewId, viewId);
this.viewId = viewId;
}
-
public String getViewId()
{
return viewId;
}
-
public synchronized Date getLastDatetime()
{
return lastDatetime;
}
-
public List<String> getConversationIdStack()
{
return conversationIdStack;
}
-
/**
* @deprecated
* @return a component name
@@ -152,7 +136,6 @@
{
return initiatorComponentName;
}
-
/**
* @deprecated
*/
@@ -160,7 +143,6 @@
entries.setDirty(this.initiatorComponentName, ownerComponentName);
this.initiatorComponentName = ownerComponentName;
}
-
public boolean isDisplayable()
{
return !isEnded() && getDescription()!=null;
@@ -182,30 +164,25 @@
return false;
}
}
-
public int compareTo(ConversationEntry entry)
{
int result = new Long ( getLastRequestTime() ).compareTo( entry.getLastRequestTime() );
return - ( result==0 ? getId().compareTo( entry.getId() ) : result );
}
-
public int getTimeout()
{
return timeout==null ?
Manager.instance().getConversationTimeout() : timeout;
}
-
void setTimeout(int conversationTimeout)
{
entries.setDirty(this.timeout, timeout);
this.timeout = conversationTimeout;
}
-
public boolean isRemoveAfterRedirect()
{
return removeAfterRedirect;
}
-
public void setRemoveAfterRedirect(boolean removeAfterRedirect)
{
entries.setDirty();
@@ -221,7 +198,6 @@
{
return lock.tryLock();
}
-
public boolean lock() //not synchronized!
{
try
@@ -258,11 +234,9 @@
{
return conversationIdStack.size()>1;
}
-
@Override
public String toString()
{
return "ConversationEntry(" + id + ")";
}
-
}
\ No newline at end of file
1.11 +51 -54 jboss-seam/src/main/org/jboss/seam/core/ConversationList.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationList.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationList.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ConversationList.java 24 Nov 2006 23:15:17 -0000 1.10
+++ ConversationList.java 21 Dec 2006 02:38:26 -0000 1.11
@@ -1,14 +1,11 @@
package org.jboss.seam.core;
-
import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-
import org.jboss.seam.ScopeType;
import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Create;
@@ -17,10 +14,9 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
-
/**
* @author Gavin King
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.conversationList")
@@ -28,6 +24,7 @@
@Intercept(NEVER)
public class ConversationList implements Serializable {
+ private static final long serialVersionUID = -1515889862229134356L;
private List<ConversationEntry> conversationEntryList;
@Create
1.8 +57 -61 jboss-seam/src/main/org/jboss/seam/core/ConversationStack.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationStack.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationStack.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ConversationStack.java 24 Nov 2006 23:15:17 -0000 1.7
+++ ConversationStack.java 21 Dec 2006 02:38:26 -0000 1.8
@@ -1,13 +1,10 @@
package org.jboss.seam.core;
-
import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
-
import org.jboss.seam.ScopeType;
import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Create;
@@ -16,19 +13,18 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
-
/**
* Support for "breadcrumbs".
*
* @author Gavin King
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.conversationStack")
@Install(precedence=BUILT_IN)
@Intercept(NEVER)
public class ConversationStack implements Serializable {
-
+ private static final long serialVersionUID = 7941458529299691801L;
private List<ConversationEntry> conversationEntryStack;
@Create
1.15 +370 -368 jboss-seam/src/main/org/jboss/seam/core/Dispatcher.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Dispatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Dispatcher.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Dispatcher.java 16 Dec 2006 16:05:20 -0000 1.14
+++ Dispatcher.java 21 Dec 2006 02:38:26 -0000 1.15
@@ -342,6 +342,8 @@
implements TimerHandle,
Serializable
{
+ private static final long serialVersionUID = 6913362944260154627L;
+
TimerHandle handle;
public TimerHandleProxy(TimerHandle handle) {
1.13 +157 -153 jboss-seam/src/main/org/jboss/seam/core/Expressions.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Expressions.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Expressions.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Expressions.java 24 Nov 2006 23:15:17 -0000 1.12
+++ Expressions.java 21 Dec 2006 02:38:26 -0000 1.13
@@ -1,4 +1,4 @@
-//$Id: Expressions.java,v 1.12 2006/11/24 23:15:17 gavin Exp $
+//$Id: Expressions.java,v 1.13 2006/12/21 02:38:26 sbryzak2 Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -34,6 +34,8 @@
return new ValueBinding()
{
+ private static final long serialVersionUID = -8655967672318993009L;
+
private transient javax.faces.el.ValueBinding cachedValueBinding;
public String getExpressionString()
@@ -86,6 +88,8 @@
{
return new MethodBinding()
{
+ private static final long serialVersionUID = 7314202661786534543L;
+
private transient javax.faces.el.MethodBinding cachedMethodBinding;
public String getExpressionString()
1.26 +323 -323 jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesMessages.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- FacesMessages.java 17 Dec 2006 20:33:19 -0000 1.25
+++ FacesMessages.java 21 Dec 2006 02:38:26 -0000 1.26
@@ -36,7 +36,7 @@
@Intercept(NEVER)
public class FacesMessages implements Serializable
{
-
+ private static final long serialVersionUID = -5395975397632138270L;
private transient List<Runnable> tasks;
private List<FacesMessage> facesMessages = new ArrayList<FacesMessage>();
1.6 +170 -169 jboss-seam/src/main/org/jboss/seam/core/FacesPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesPage.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesPage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- FacesPage.java 24 Nov 2006 23:15:17 -0000 1.5
+++ FacesPage.java 21 Dec 2006 02:38:26 -0000 1.6
@@ -28,6 +28,7 @@
@Scope(ScopeType.PAGE)
public class FacesPage implements Serializable
{
+ private static final long serialVersionUID = 4807114041808347239L;
private String pageflowName;
private Integer pageflowCounter;
private String pageflowNodeName;
1.18 +2 -1 jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LocaleSelector.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- LocaleSelector.java 18 Dec 2006 11:52:49 -0000 1.17
+++ LocaleSelector.java 21 Dec 2006 02:38:26 -0000 1.18
@@ -37,6 +37,7 @@
@Install(precedence=BUILT_IN)
public class LocaleSelector extends Selector
{
+ private static final long serialVersionUID = -6087667065688208261L;
private String language;
private String country;
1.30 +206 -221 jboss-seam/src/main/org/jboss/seam/core/ManagedPersistenceContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ManagedPersistenceContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedPersistenceContext.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- ManagedPersistenceContext.java 16 Dec 2006 02:58:10 -0000 1.29
+++ ManagedPersistenceContext.java 21 Dec 2006 02:38:26 -0000 1.30
@@ -1,19 +1,15 @@
-//$Id: ManagedPersistenceContext.java,v 1.29 2006/12/16 02:58:10 nrichards Exp $
+//$Id: ManagedPersistenceContext.java,v 1.30 2006/12/21 02:38:26 sbryzak2 Exp $
package org.jboss.seam.core;
-
import static org.jboss.seam.InterceptionType.NEVER;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-
import javax.naming.NamingException;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.servlet.http.HttpSessionActivationListener;
import javax.servlet.http.HttpSessionEvent;
import javax.transaction.SystemException;
-
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.Component;
@@ -29,7 +25,6 @@
import org.jboss.seam.persistence.PersistenceProvider;
import org.jboss.seam.util.Naming;
import org.jboss.seam.util.Transactions;
-
/**
* A Seam component that manages a conversation-scoped extended
* persistence context that can be shared by arbitrary other
@@ -43,7 +38,7 @@
public class ManagedPersistenceContext
implements Serializable, HttpSessionActivationListener, Mutable, PersistenceContextManager
{
-
+ private static final long serialVersionUID = -4972387440275848126L;
private static final LogProvider log = Logging.getLogProvider(ManagedPersistenceContext.class);
private EntityManager entityManager;
@@ -56,7 +51,6 @@
{
return true;
}
-
@Create
public void create(Component component)
{
@@ -82,7 +76,6 @@
}
}
}
-
private void createEntityManager()
{
entityManager = getEntityManagerFactoryFromJndiOrValueBinding().createEntityManager();
@@ -92,7 +85,6 @@
PersistenceProvider.instance().enableFilter(f, entityManager);
}
}
-
@Unwrap
public EntityManager getEntityManager() throws NamingException, SystemException
{
@@ -159,7 +151,6 @@
{
return entityManagerFactory;
}
-
public void setEntityManagerFactory(ValueBinding<EntityManagerFactory> entityManagerFactory)
{
this.entityManagerFactory = entityManagerFactory;
@@ -173,16 +164,13 @@
{
return persistenceUnitJndiName;
}
-
public void setPersistenceUnitJndiName(String persistenceUnitName)
{
this.persistenceUnitJndiName = persistenceUnitName;
}
-
public String getComponentName() {
return componentName;
}
-
/**
* Hibernate filters to enable automatically
*/
@@ -190,12 +178,10 @@
{
return filters;
}
-
protected void setFilters(List<Filter> filters)
{
this.filters = filters;
}
-
public void setFlushMode(org.jboss.seam.annotations.FlushModeType flushMode)
{
switch (flushMode)
@@ -217,5 +203,4 @@
{
return "ManagedPersistenceContext(" + persistenceUnitJndiName + ")";
}
-
}
1.10 +110 -109 jboss-seam/src/main/org/jboss/seam/core/Messages.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Messages.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Messages.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Messages.java 24 Nov 2006 23:15:17 -0000 1.9
+++ Messages.java 21 Dec 2006 02:38:26 -0000 1.10
@@ -29,6 +29,7 @@
@Name("org.jboss.seam.core.messages")
@Install(precedence=BUILT_IN)
public class Messages implements Serializable {
+ private static final long serialVersionUID = 1292464253307553295L;
private transient Map<String, String> messages;
1.49 +2 -0 jboss-seam/src/main/org/jboss/seam/core/Pageflow.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Pageflow.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pageflow.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- Pageflow.java 18 Dec 2006 15:38:49 -0000 1.48
+++ Pageflow.java 21 Dec 2006 02:38:26 -0000 1.49
@@ -45,6 +45,8 @@
@Install(dependencies="org.jboss.seam.core.jbpm", precedence=BUILT_IN)
public class Pageflow extends AbstractMutable implements Serializable
{
+ private static final long serialVersionUID = -2337682140346213333L;
+
private static final LogProvider log = Logging.getLogProvider(Pageflow.class);
private int counter;
1.3 +66 -70 jboss-seam/src/main/org/jboss/seam/core/PersistenceContexts.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PersistenceContexts.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PersistenceContexts.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PersistenceContexts.java 24 Nov 2006 23:15:17 -0000 1.2
+++ PersistenceContexts.java 21 Dec 2006 02:38:26 -0000 1.3
@@ -1,13 +1,10 @@
package org.jboss.seam.core;
-
import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
-
import java.io.Serializable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.FlushModeType;
@@ -16,13 +13,13 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.contexts.Contexts;
-
@Name("org.jboss.seam.core.persistenceContexts")
@Scope(ScopeType.CONVERSATION)
@Intercept(NEVER)
@Install(precedence=BUILT_IN)
public class PersistenceContexts extends AbstractMutable implements Serializable
{
+ private static final long serialVersionUID = -4897350516435283182L;
private Set<String> set = new HashSet<String>();
private FlushModeType flushMode = FlushModeType.AUTO;
@@ -52,7 +49,6 @@
return null;
}
}
-
public void changeFlushMode(FlushModeType flushMode)
{
this.flushMode = flushMode;
1.10 +117 -122 jboss-seam/src/main/org/jboss/seam/core/Redirect.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Redirect.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Redirect.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Redirect.java 24 Nov 2006 23:15:17 -0000 1.9
+++ Redirect.java 21 Dec 2006 02:38:26 -0000 1.10
@@ -1,13 +1,9 @@
package org.jboss.seam.core;
-
import static org.jboss.seam.annotations.Install.BUILT_IN;
-
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-
import javax.faces.context.FacesContext;
-
import org.jboss.seam.Component;
import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
@@ -16,7 +12,6 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.contexts.Contexts;
-
/**
* Convenient API for performing browser redirects with
* parameters.
@@ -29,6 +24,7 @@
@Install(precedence=BUILT_IN)
public class Redirect extends AbstractMutable implements Serializable
{
+ private static final long serialVersionUID = 6947384474861235210L;
private String viewId;
private Map<String, Object> parameters = new HashMap<String, Object>();
private boolean conversationPropagationEnabled = true;
@@ -118,5 +114,4 @@
}
return (Redirect) Component.getInstance(Redirect.class, ScopeType.CONVERSATION);
}
-
}
1.25 +199 -199 jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ResourceBundle.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- ResourceBundle.java 16 Dec 2006 02:58:10 -0000 1.24
+++ ResourceBundle.java 21 Dec 2006 02:38:26 -0000 1.25
@@ -35,7 +35,7 @@
@Name("org.jboss.seam.core.resourceBundle")
@Install(precedence=BUILT_IN)
public class ResourceBundle implements Serializable {
-
+ private static final long serialVersionUID = -3236251335438092538L;
private static final LogProvider log = Logging.getLogProvider(ResourceBundle.class);
private String[] bundleNames = {"messages"};
1.17 +119 -119 jboss-seam/src/main/org/jboss/seam/core/Switcher.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Switcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Switcher.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Switcher.java 24 Nov 2006 23:15:17 -0000 1.16
+++ Switcher.java 21 Dec 2006 02:38:26 -0000 1.17
@@ -25,14 +25,14 @@
* Support for the conversation switcher drop-down menu.
*
* @author Gavin King
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.switcher")
@Install(precedence=BUILT_IN)
@Intercept(NEVER)
public class Switcher implements Serializable {
-
+ private static final long serialVersionUID = -6403911073853051938L;
private List<SelectItem> selectItems;
private String conversationIdOrOutcome;
private String resultingConversationIdOrOutcome;
1.8 +2 -1 jboss-seam/src/main/org/jboss/seam/core/TimeZoneSelector.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TimeZoneSelector.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TimeZoneSelector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- TimeZoneSelector.java 18 Dec 2006 11:52:49 -0000 1.7
+++ TimeZoneSelector.java 21 Dec 2006 02:38:26 -0000 1.8
@@ -24,6 +24,7 @@
@Install(value=false, precedence=BUILT_IN)
public class TimeZoneSelector extends Selector
{
+ private static final long serialVersionUID = -5013819375360015369L;
private String id;
1.11 +53 -58 jboss-seam/src/main/org/jboss/seam/core/Transition.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Transition.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Transition.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Transition.java 24 Nov 2006 23:15:17 -0000 1.10
+++ Transition.java 21 Dec 2006 02:38:26 -0000 1.11
@@ -1,10 +1,7 @@
package org.jboss.seam.core;
-
import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
-
import java.io.Serializable;
-
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
@@ -12,7 +9,6 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.contexts.Contexts;
-
/**
* Allows the application to set the jBPM transition to be used when
* @EndTask is encountered.
@@ -24,9 +20,9 @@
@Intercept(NEVER)
@Install(precedence=BUILT_IN, dependencies="org.jboss.seam.core.jbpm")
public class Transition extends AbstractMutable implements Serializable {
+ private static final long serialVersionUID = -3054558654376670239L;
private String name;
-
public String getName()
{
return name;
@@ -49,7 +45,6 @@
}
return (Transition) Component.getInstance(Transition.class, ScopeType.CONVERSATION);
}
-
@Override
public String toString()
{
More information about the jboss-cvs-commits
mailing list