[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...
Gavin King
gavin.king at jboss.com
Wed Oct 25 11:14:35 EDT 2006
User: gavin
Date: 06/10/25 11:14:35
Modified: src/main/org/jboss/seam/core Actor.java
BusinessProcess.java ConversationEntries.java
ConversationEntry.java Expressions.java Filter.java
HibernateSessionFactory.java Interpolator.java
LocalDispatcher.java ManagedHibernateSession.java
ManagedPersistenceContext.java Manager.java
Pageflow.java Pages.java PooledTask.java
ResourceBundle.java Switcher.java
TaskInstanceListForType.java Transition.java
Removed: src/main/org/jboss/seam/core
RenderParameters.java
Log:
many minor
Revision Changes Path
1.8 +1 -0 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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Actor.java 10 Oct 2006 19:37:37 -0000 1.7
+++ Actor.java 25 Oct 2006 15:14:35 -0000 1.8
@@ -55,6 +55,7 @@
return (Actor) Component.getInstance(Actor.class, true);
}
+ @Override
public String toString()
{
return "Actor(" + id + ")";
1.7 +7 -1 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- BusinessProcess.java 16 Oct 2006 11:36:38 -0000 1.6
+++ BusinessProcess.java 25 Oct 2006 15:14:35 -0000 1.7
@@ -312,4 +312,10 @@
);
}
+ @Override
+ public String toString()
+ {
+ return "BusinessProcess(processId=" + processId + ",taskId=" + taskId + ")";
+ }
+
}
1.2 +5 -0 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ConversationEntries.java 10 Oct 2006 21:00:53 -0000 1.1
+++ ConversationEntries.java 25 Oct 2006 15:14:35 -0000 1.2
@@ -87,4 +87,9 @@
return (ConversationEntries) Component.getInstance(ConversationEntries.class, ScopeType.SESSION, true);
}
+ @Override
+ public String toString()
+ {
+ return "ConversationEntries(" + conversationIdEntryMap.values() + ")";
+ }
}
1.24 +5 -0 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.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- ConversationEntry.java 13 Oct 2006 02:24:30 -0000 1.23
+++ ConversationEntry.java 25 Oct 2006 15:14:35 -0000 1.24
@@ -198,4 +198,9 @@
lock.unlock();
}
+ @Override
+ public String toString()
+ {
+ return "ConversationEntry(" + id + ")";
+ }
}
\ No newline at end of file
1.5 +3 -1 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Expressions.java 19 Oct 2006 22:12:37 -0000 1.4
+++ Expressions.java 25 Oct 2006 15:14:35 -0000 1.5
@@ -1,4 +1,4 @@
-//$Id: Expressions.java,v 1.4 2006/10/19 22:12:37 gavin Exp $
+//$Id: Expressions.java,v 1.5 2006/10/25 15:14:35 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -68,6 +68,7 @@
return cachedValueBinding;
}
+ @Override
public String toString()
{
return getExpressionString();
@@ -107,6 +108,7 @@
return cachedMethodBinding;
}
+ @Override
public String toString()
{
return getExpressionString();
1.2 +6 -0 jboss-seam/src/main/org/jboss/seam/core/Filter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Filter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Filter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Filter.java 17 Oct 2006 13:00:42 -0000 1.1
+++ Filter.java 25 Oct 2006 15:14:35 -0000 1.2
@@ -51,4 +51,10 @@
{
this.name = name;
}
+
+ @Override
+ public String toString()
+ {
+ return "Filter(" + name + ")";
+ }
}
1.3 +2 -1 jboss-seam/src/main/org/jboss/seam/core/HibernateSessionFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HibernateSessionFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/HibernateSessionFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- HibernateSessionFactory.java 14 Oct 2006 22:50:10 -0000 1.2
+++ HibernateSessionFactory.java 25 Oct 2006 15:14:35 -0000 1.3
@@ -1,4 +1,4 @@
-//$Id: HibernateSessionFactory.java,v 1.2 2006/10/14 22:50:10 gavin Exp $
+//$Id: HibernateSessionFactory.java,v 1.3 2006/10/25 15:14:35 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -27,6 +27,7 @@
private SessionFactory sessionFactory;
@Unwrap
+ @Override
public SessionFactory getSessionFactory()
{
return sessionFactory;
1.10 +0 -3 jboss-seam/src/main/org/jboss/seam/core/Interpolator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Interpolator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Interpolator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Interpolator.java 3 Oct 2006 17:16:44 -0000 1.9
+++ Interpolator.java 25 Oct 2006 15:14:35 -0000 1.10
@@ -6,8 +6,6 @@
import java.text.MessageFormat;
import java.util.StringTokenizer;
-import javax.faces.context.FacesContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.seam.Component;
@@ -66,7 +64,6 @@
private String interpolateExpressions(String string, Object... params)
{
- FacesContext context = FacesContext.getCurrentInstance();
StringTokenizer tokens = new StringTokenizer(string, "#{}", true);
StringBuilder builder = new StringBuilder(string.length());
while ( tokens.hasMoreTokens() )
1.6 +0 -1 jboss-seam/src/main/org/jboss/seam/core/LocalDispatcher.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LocalDispatcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/LocalDispatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LocalDispatcher.java 23 Oct 2006 18:58:48 -0000 1.5
+++ LocalDispatcher.java 25 Oct 2006 15:14:35 -0000 1.6
@@ -5,7 +5,6 @@
import javax.ejb.Local;
import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
import javax.interceptor.InvocationContext;
import org.jboss.seam.Component;
1.26 +2 -1 jboss-seam/src/main/org/jboss/seam/core/ManagedHibernateSession.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ManagedHibernateSession.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedHibernateSession.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- ManagedHibernateSession.java 22 Oct 2006 01:47:11 -0000 1.25
+++ ManagedHibernateSession.java 25 Oct 2006 15:14:35 -0000 1.26
@@ -1,4 +1,4 @@
-//$Id: ManagedHibernateSession.java,v 1.25 2006/10/22 01:47:11 gavin Exp $
+//$Id: ManagedHibernateSession.java,v 1.26 2006/10/25 15:14:35 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -220,6 +220,7 @@
this.filters = filters;
}
+ @Override
public String toString()
{
return "ManagedHibernateSession(" + sessionFactoryJndiName + ")";
1.27 +2 -2 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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- ManagedPersistenceContext.java 22 Oct 2006 01:47:11 -0000 1.26
+++ ManagedPersistenceContext.java 25 Oct 2006 15:14:35 -0000 1.27
@@ -1,4 +1,4 @@
-//$Id: ManagedPersistenceContext.java,v 1.26 2006/10/22 01:47:11 gavin Exp $
+//$Id: ManagedPersistenceContext.java,v 1.27 2006/10/25 15:14:35 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -23,7 +23,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
-import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.Expressions.ValueBinding;
import org.jboss.seam.persistence.PersistenceProvider;
@@ -211,6 +210,7 @@
}
}
+ @Override
public String toString()
{
return "ManagedPersistenceContext(" + persistenceUnitJndiName + ")";
1.100 +8 -1 jboss-seam/src/main/org/jboss/seam/core/Manager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Manager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- Manager.java 24 Oct 2006 22:56:55 -0000 1.99
+++ Manager.java 25 Oct 2006 15:14:35 -0000 1.100
@@ -41,7 +41,7 @@
*
* @author Gavin King
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version $Revision: 1.99 $
+ * @version $Revision: 1.100 $
*/
@Scope(ScopeType.EVENT)
@Name("org.jboss.seam.core.manager")
@@ -1031,4 +1031,11 @@
this.concurrentRequestTimeout = requestWait;
}
+ @Override
+ public String toString()
+ {
+ return "Manager(" + currentConversationIdStack + ")";
+ }
+
+
}
1.34 +3 -2 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.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- Pageflow.java 23 Oct 2006 20:35:28 -0000 1.33
+++ Pageflow.java 25 Oct 2006 15:14:35 -0000 1.34
@@ -92,8 +92,8 @@
{
//check the counter to detect illegal use of backbutton
//Integer counter = (Integer) attributes.get(Manager.PAGEFLOW_COUNTER);
- Integer counter = (Integer) Contexts.getPageContext().get(Manager.PAGEFLOW_COUNTER);
- if ( counter!=null && getPageflowCounter()!=counter )
+ Integer pageCounter = (Integer) Contexts.getPageContext().get(Manager.PAGEFLOW_COUNTER);
+ if ( pageCounter!=null && getPageflowCounter()!=pageCounter )
{
illegalNavigationError();
}
@@ -265,6 +265,7 @@
return pageflowProcessDefinition;
}
+ @Override
public String toString()
{
String name = processInstance==null ?
1.36 +12 -0 jboss-seam/src/main/org/jboss/seam/core/Pages.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Pages.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Pages.java 23 Oct 2006 20:30:24 -0000 1.35
+++ Pages.java 25 Oct 2006 15:14:35 -0000 1.36
@@ -68,6 +68,12 @@
String outcome;
String noConversationViewId;
List<PageParameter> pageParameters = new ArrayList<PageParameter>();
+
+ @Override
+ public String toString()
+ {
+ return "Page(" + viewId + ")";
+ }
}
static final class PageParameter
@@ -98,6 +104,12 @@
return FacesContext.getCurrentInstance().getApplication().createConverter(type);
}
}
+
+ @Override
+ public String toString()
+ {
+ return "PageParameter(" + name + ")";
+ }
}
private SortedSet<String> wildcardViewIds = new TreeSet<String>(
1.9 +1 -1 jboss-seam/src/main/org/jboss/seam/core/PooledTask.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PooledTask.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PooledTask.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PooledTask.java 24 Apr 2006 00:16:12 -0000 1.8
+++ PooledTask.java 25 Oct 2006 15:14:35 -0000 1.9
@@ -38,7 +38,7 @@
private TaskInstance getTaskInstance()
{
String taskId = (String) FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("taskId");
- return (TaskInstance) ManagedJbpmContext.instance().getTaskMgmtSession().loadTaskInstance( Long.parseLong(taskId) );
+ return ManagedJbpmContext.instance().getTaskMgmtSession().loadTaskInstance( Long.parseLong(taskId) );
}
}
1.15 +8 -0 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ResourceBundle.java 15 Oct 2006 16:05:26 -0000 1.14
+++ ResourceBundle.java 25 Oct 2006 15:14:35 -0000 1.15
@@ -18,6 +18,7 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.util.EnumerationEnumeration;
+import org.jboss.seam.util.Strings;
/**
* Support for an application-global resource bundle
@@ -139,6 +140,13 @@
return bundle;
}
+ @Override
+ public String toString()
+ {
+ String concat = bundleNames==null ? "" : Strings.toString( ", ", (Object[]) bundleNames );
+ return "ResourceBundle(" + concat + ")";
+ }
+
public static java.util.ResourceBundle instance()
{
return (java.util.ResourceBundle) Component.getInstance( Seam.getComponentName(ResourceBundle.class), true );
1.11 +1 -2 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Switcher.java 10 Oct 2006 21:00:53 -0000 1.10
+++ Switcher.java 25 Oct 2006 15:14:35 -0000 1.11
@@ -5,7 +5,6 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -24,7 +23,7 @@
* Support for the conversation switcher drop-down menu.
*
* @author Gavin King
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
@Scope(ScopeType.PAGE)
@Name("switcher")
1.8 +1 -1 jboss-seam/src/main/org/jboss/seam/core/TaskInstanceListForType.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TaskInstanceListForType.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TaskInstanceListForType.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- TaskInstanceListForType.java 24 Apr 2006 00:16:12 -0000 1.7
+++ TaskInstanceListForType.java 25 Oct 2006 15:14:35 -0000 1.8
@@ -37,7 +37,7 @@
if ( actorId == null ) return null;
Map<String, List<TaskInstance>> map = new HashMap<String, List<TaskInstance>>();
- List<TaskInstance> taskInstances = (List<TaskInstance>) ManagedJbpmContext.instance().getTaskMgmtSession().findTaskInstances(actorId);
+ List<TaskInstance> taskInstances = ManagedJbpmContext.instance().getTaskMgmtSession().findTaskInstances(actorId);
for ( TaskInstance task: taskInstances )
{
String name = task.getName();
1.5 +6 -0 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Transition.java 10 Oct 2006 19:37:38 -0000 1.4
+++ Transition.java 25 Oct 2006 15:14:35 -0000 1.5
@@ -46,4 +46,10 @@
}
return (Transition) Component.getInstance(Transition.class, ScopeType.CONVERSATION, true);
}
+
+ @Override
+ public String toString()
+ {
+ return "Transition(" + name + ")";
+ }
}
More information about the jboss-cvs-commits
mailing list