SECTION: Modified Files
----------------------------
M jsf-ri/src/com/sun/faces/renderkit/ByteArrayGuard.java
M jsf-ri/src/com/sun/faces/renderkit/ResponseStateManagerImpl.java
M jsf-ri/src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java
M jsf-ri/src/com/sun/faces/taglib/html_basic/ColumnTag.java
M jsf-ri/src/com/sun/faces/taglib/jsf_core/ActionListenerTag.java
M jsf-ri/src/com/sun/faces/taglib/jsf_core/ConvertDateTimeTag.java
M jsf-ri/src/com/sun/faces/taglib/jsf_core/ValueChangeListenerTag.java
M jsf-ri/src/com/sun/faces/taglib/jsf_core/ViewTag.java
M jsf-ri/src/com/sun/faces/util/DebugUtil.java
- made loggers final
M jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java
M jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java
M jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java
M jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java
M jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java
M jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java
M jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java
M jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java
M jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java
M jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java
M jsf-tools/src/com/sun/faces/config/rules/RendererRule.java
M jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java
- changed try/cast/catch stack state validation to use assertion facility
SECTION: Diffs
----------------------------
Index: jsf-ri/src/com/sun/faces/renderkit/ByteArrayGuard.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/ByteArrayGuard.java,v
retrieving revision 1.4
diff -u -r1.4 ByteArrayGuard.java
--- jsf-ri/src/com/sun/faces/renderkit/ByteArrayGuard.java 20 Jun
2005 23:56:34 -0000 1.4
+++ jsf-ri/src/com/sun/faces/renderkit/ByteArrayGuard.java 23 Jun
2005 14:55:58 -0000
@@ -45,7 +45,7 @@
public static final int DEFAULT_PASSWORD_LENGTH = 24;
// Log instance for this class
- protected static Logger logger =
+ private static final Logger logger =
Util.getLogger(Util.FACES_LOGGER + Util.RENDERKIT_LOGGER);
/**
Index: jsf-ri/src/com/sun/faces/renderkit/ResponseStateManagerImpl.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/ResponseStateManagerImpl.java,v
retrieving revision 1.21
diff -u -r1.21 ResponseStateManagerImpl.java
--- jsf-ri/src/com/sun/faces/renderkit/ResponseStateManagerImpl.java
9 Jun 2005 22:37:46 -0000 1.21
+++ jsf-ri/src/com/sun/faces/renderkit/ResponseStateManagerImpl.java
23 Jun 2005 14:55:59 -0000
@@ -43,7 +43,7 @@
// Protected Constants
//
// Log instance for this class
- protected static Logger logger =
+ private static final Logger logger =
Util.getLogger(Util.FACES_LOGGER + Util.RENDERKIT_LOGGER);
private static final String FACES_VIEW_STATE =
"com.sun.faces.FACES_VIEW_STATE";
Index: jsf-ri/src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java,v
retrieving revision 1.94
diff -u -r1.94 HtmlBasicRenderer.java
---
jsf-ri/src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java
9 Jun 2005 22:37:47 -0000 1.94
+++
jsf-ri/src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java
23 Jun 2005 14:55:59 -0000
@@ -52,7 +52,7 @@
// Class Variables
//
// Log instance for this class
- protected static Logger logger =
+ protected static final Logger logger =
Util.getLogger(Util.FACES_LOGGER + Util.RENDERKIT_LOGGER);
//
Index: jsf-ri/src/com/sun/faces/taglib/html_basic/ColumnTag.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/html_basic/ColumnTag.java,v
retrieving revision 1.11
diff -u -r1.11 ColumnTag.java
--- jsf-ri/src/com/sun/faces/taglib/html_basic/ColumnTag.java 9 Jun
2005 22:37:49 -0000 1.11
+++ jsf-ri/src/com/sun/faces/taglib/html_basic/ColumnTag.java 23 Jun
2005 14:56:00 -0000
@@ -24,7 +24,7 @@
public class ColumnTag extends UIComponentTag {
// Log instance for this class
- protected static Logger logger =
+ private static final Logger logger =
Util.getLogger(Util.FACES_LOGGER + Util.TAGLIB_LOGGER);
//
Index: jsf-ri/src/com/sun/faces/taglib/jsf_core/ActionListenerTag.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/jsf_core/ActionListenerTag.java,v
retrieving revision 1.22
diff -u -r1.22 ActionListenerTag.java
--- jsf-ri/src/com/sun/faces/taglib/jsf_core/ActionListenerTag.java 9
Jun 2005 22:37:49 -0000 1.22
+++ jsf-ri/src/com/sun/faces/taglib/jsf_core/ActionListenerTag.java
23 Jun 2005 14:56:00 -0000
@@ -58,7 +58,7 @@
// -------------------------------------------------------------
Attributes
private static final long serialVersionUID = -5222351612904952740L;
- protected static Logger logger =
+ private static final Logger logger =
Util.getLogger(Util.FACES_LOGGER + Util.TAGLIB_LOGGER);
/**
* <p>The fully qualified class name of the {_at_link ActionListener}
Index: jsf-ri/src/com/sun/faces/taglib/jsf_core/ConvertDateTimeTag.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/jsf_core/ConvertDateTimeTag.java,v
retrieving revision 1.18
diff -u -r1.18 ConvertDateTimeTag.java
--- jsf-ri/src/com/sun/faces/taglib/jsf_core/ConvertDateTimeTag.java
9 Jun 2005 22:37:49 -0000 1.18
+++ jsf-ri/src/com/sun/faces/taglib/jsf_core/ConvertDateTimeTag.java
23 Jun 2005 14:56:01 -0000
@@ -39,7 +39,7 @@
private static ValueExpression CONVERTER_ID_EXPR = null;
// Log instance for this class
- protected static Logger logger =
+ private static final Logger logger =
Util.getLogger(Util.FACES_LOGGER + Util.TAGLIB_LOGGER);
//
Index: jsf-ri/src/com/sun/faces/taglib/jsf_core/ValueChangeListenerTag.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/jsf_core/ValueChangeListenerTag.java,v
retrieving revision 1.16
diff -u -r1.16 ValueChangeListenerTag.java
---
jsf-ri/src/com/sun/faces/taglib/jsf_core/ValueChangeListenerTag.java
9 Jun 2005 22:37:49 -0000 1.16
+++
jsf-ri/src/com/sun/faces/taglib/jsf_core/ValueChangeListenerTag.java
23 Jun 2005 14:56:01 -0000
@@ -57,7 +57,7 @@
// -------------------------------------------------------------
Attributes
private static final long serialVersionUID = -212845116876281363L;
- protected static Logger logger =
+ private static final Logger logger =
Util.getLogger(Util.FACES_LOGGER + Util.TAGLIB_LOGGER);
Index: jsf-ri/src/com/sun/faces/taglib/jsf_core/ViewTag.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/jsf_core/ViewTag.java,v
retrieving revision 1.37
diff -u -r1.37 ViewTag.java
--- jsf-ri/src/com/sun/faces/taglib/jsf_core/ViewTag.java 9 Jun 2005
22:37:49 -0000 1.37
+++ jsf-ri/src/com/sun/faces/taglib/jsf_core/ViewTag.java 23 Jun 2005
14:56:01 -0000
@@ -59,7 +59,7 @@
// Class Variables
//
- protected static Logger logger =
+ private static final Logger logger =
Util.getLogger(Util.FACES_LOGGER + Util.TAGLIB_LOGGER);
//
Index: jsf-ri/src/com/sun/faces/util/DebugUtil.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/util/DebugUtil.java,v
retrieving revision 1.28
diff -u -r1.28 DebugUtil.java
--- jsf-ri/src/com/sun/faces/util/DebugUtil.java 1 Jun 2005 14:03:38
-0000 1.28
+++ jsf-ri/src/com/sun/faces/util/DebugUtil.java 23 Jun 2005 14:56:02
-0000
@@ -28,7 +28,7 @@
* <B>Lifetime And Scope</B> <P>
*/
-public class DebugUtil extends Object {
+public class DebugUtil {
//
// Protected Constants
@@ -38,7 +38,7 @@
// Class Variables
//
- public static boolean keepWaiting = true;
+ private static boolean keepWaiting = true;
private static int curDepth = 0;
@@ -68,6 +68,12 @@
//
// Class methods
//
+
+ public static void setKeepWaiting(boolean keepWaiting) {
+
+ DebugUtil.keepWaiting = keepWaiting;
+
+ }
/**
* Usage: <P>
Index: jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java,v
retrieving revision 1.4
diff -u -r1.4 AttributeRule.java
--- jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java 10
Mar 2005 21:39:17 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/AttributeRule.java 23
Jun 2005 14:56:05 -0000
@@ -47,13 +47,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- AttributeHolder ah = null;
- try {
- ah = (AttributeHolder) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent AttributeHolder on object stack");
- }
+ assert (digester.peek() instanceof AttributeHolder);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[AttributeRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java,v
retrieving revision 1.4
diff -u -r1.4 ComponentRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java 10
Mar 2005 21:39:18 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/ComponentRule.java 23
Jun 2005 14:56:05 -0000
@@ -47,13 +47,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- FacesConfigBean fcb = null;
- try {
- fcb = (FacesConfigBean) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent FacesConfigBean on object stack");
- }
+ assert (digester.peek() instanceof FacesConfigBean);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[ComponentRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java,v
retrieving revision 1.4
diff -u -r1.4 ConverterRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java 10
Mar 2005 21:39:18 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/ConverterRule.java 23
Jun 2005 14:56:05 -0000
@@ -47,13 +47,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- FacesConfigBean fcb = null;
- try {
- fcb = (FacesConfigBean) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent FacesConfigBean on object stack");
- }
+ assert (digester.peek() instanceof FacesConfigBean);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[ConverterRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java,v
retrieving revision 1.3
diff -u -r1.3 DescriptionTextRule.java
--- jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java
4 Feb 2004 23:46:21 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/DescriptionTextRule.java
23 Jun 2005 14:56:05 -0000
@@ -65,14 +65,7 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- // Ensure that the current top-of-stack object is a DescriptionBean
- DescriptionBean db = null;
- try {
- db = (DescriptionBean) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent DescriptionBean on object stack");
- }
+ assert (digester.peek() instanceof DescriptionBean);
// Perform our standard superclass processing
if (digester.getLogger().isDebugEnabled()) {
Index: jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java,v
retrieving revision 1.4
diff -u -r1.4 ListEntriesRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java 10
Mar 2005 21:39:18 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/ListEntriesRule.java 23
Jun 2005 14:56:05 -0000
@@ -47,13 +47,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- ListEntriesHolder leh = null;
- try {
- leh = (ListEntriesHolder) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent ListEntriesHolder on object stack");
- }
+ assert (digester.peek() instanceof ListEntriesHolder);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[ListEntriesRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java,v
retrieving revision 1.4
diff -u -r1.4 MapEntriesRule.java
--- jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java 10
Mar 2005 21:39:18 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/MapEntriesRule.java 23
Jun 2005 14:56:05 -0000
@@ -48,13 +48,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- MapEntriesHolder meh = null;
- try {
- meh = (MapEntriesHolder) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent MapEntriesHolder on object stack");
- }
+ assert (digester.peek() instanceof MapEntriesHolder);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[MapEntriesRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java,v
retrieving revision 1.3
diff -u -r1.3 NavigationCaseRule.java
--- jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java
4 Feb 2004 23:46:23 -0000 1.3
+++ jsf-tools/src/com/sun/faces/config/rules/NavigationCaseRule.java
23 Jun 2005 14:56:05 -0000
@@ -48,13 +48,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- NavigationRuleBean nrb = null;
- try {
- nrb = (NavigationRuleBean) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent NavigationRuleBean on object stack");
- }
+ assert (digester.peek() instanceof NavigationRuleBean);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[NavigationCaseRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java,v
retrieving revision 1.4
diff -u -r1.4 NavigationRuleRule.java
--- jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java
10 Mar 2005 21:39:18 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/NavigationRuleRule.java
23 Jun 2005 14:56:06 -0000
@@ -48,13 +48,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- FacesConfigBean fcb = null;
- try {
- fcb = (FacesConfigBean) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent FacesConfigBean on object stack");
- }
+ assert (digester.peek() instanceof FacesConfigBean);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[NavigationRuleRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java,v
retrieving revision 1.4
diff -u -r1.4 PropertyRule.java
--- jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java 10 Mar
2005 21:39:19 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/PropertyRule.java 23 Jun
2005 14:56:06 -0000
@@ -47,13 +47,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- PropertyHolder ph = null;
- try {
- ph = (PropertyHolder) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent PropertyHolder on object stack");
- }
+ assert (digester.peek() instanceof PropertyHolder);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[PropertyRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java,v
retrieving revision 1.4
diff -u -r1.4 ReferencedBeanRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java
10 Mar 2005 21:39:19 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/ReferencedBeanRule.java
23 Jun 2005 14:56:06 -0000
@@ -47,13 +47,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- FacesConfigBean fcb = null;
- try {
- fcb = (FacesConfigBean) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent FacesConfigBean on object stack");
- }
+ assert(digester.peek() instanceof FacesConfigBean);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[ReferencedBeanRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/RendererRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/RendererRule.java,v
retrieving revision 1.5
diff -u -r1.5 RendererRule.java
--- jsf-tools/src/com/sun/faces/config/rules/RendererRule.java 10 Mar
2005 21:39:19 -0000 1.5
+++ jsf-tools/src/com/sun/faces/config/rules/RendererRule.java 23 Jun
2005 14:56:06 -0000
@@ -47,13 +47,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- RenderKitBean rkb = null;
- try {
- rkb = (RenderKitBean) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent RenderKitBean on object stack");
- }
+ assert (digester.peek() instanceof RenderKitBean);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[RendererRule]{" +
digester.getMatch() +
Index: jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java,v
retrieving revision 1.4
diff -u -r1.4 ValidatorRule.java
--- jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java 10
Mar 2005 21:39:19 -0000 1.4
+++ jsf-tools/src/com/sun/faces/config/rules/ValidatorRule.java 23
Jun 2005 14:56:06 -0000
@@ -47,13 +47,8 @@
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
- FacesConfigBean fcb = null;
- try {
- fcb = (FacesConfigBean) digester.peek();
- } catch (Exception e) {
- throw new IllegalStateException
- ("No parent FacesConfigBean on object stack");
- }
+ assert (digester.peek() instanceof FacesConfigBean);
+
if (digester.getLogger().isDebugEnabled()) {
digester.getLogger().debug("[ValidatorRule]{" +
digester.getMatch() +