SECTION: Modified Files
----------------------------------
M src/com/sun/faces/application/ApplicationAssociate.java
M src/com/sun/faces/application/ApplicationImpl.java
M src/com/sun/faces/application/NavigationHandlerImpl.java
M src/com/sun/faces/config/ManagedBeanFactory.java
M src/com/sun/faces/context/FacesContextImpl.java
M src/com/sun/faces/el/ValueBindingImpl.java
M src/com/sun/faces/lifecycle/ApplyRequestValuesPhase.java
M src/com/sun/faces/lifecycle/InvokeApplicationPhase.java
M src/com/sun/faces/lifecycle/LifecycleFactoryImpl.java
M src/com/sun/faces/lifecycle/ProcessValidationsPhase.java
M src/com/sun/faces/lifecycle/RestoreViewPhase.java
M src/com/sun/faces/lifecycle/UpdateModelValuesPhase.java
M src/com/sun/faces/renderkit/RenderKitImpl.java
M src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java
M src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java
M src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java
M src/com/sun/faces/renderkit/html_basic/FormRenderer.java
M src/com/sun/faces/renderkit/html_basic/HiddenRenderer.java
M src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java
M src/com/sun/faces/renderkit/html_basic/ImageRenderer.java
M src/com/sun/faces/renderkit/html_basic/LabelRenderer.java
M src/com/sun/faces/renderkit/html_basic/MenuRenderer.java
M src/com/sun/faces/renderkit/html_basic/MessageRenderer.java
M src/com/sun/faces/renderkit/html_basic/MessagesRenderer.java
M src/com/sun/faces/renderkit/html_basic/OutputLinkRenderer.java
M src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java
M src/com/sun/faces/renderkit/html_basic/RadioRenderer.java
M src/com/sun/faces/renderkit/html_basic/SecretRenderer.java
M src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java
M src/com/sun/faces/renderkit/html_basic/TextRenderer.java
M src/com/sun/faces/renderkit/html_basic/TextareaRenderer.java
M src/com/sun/faces/taglib/html_basic/HtmlBasicValidator.java
M src/com/sun/faces/taglib/jsf_core/ConvertDateTimeTag.java
M src/com/sun/faces/taglib/jsf_core/ConvertNumberTag.java
M src/com/sun/faces/taglib/jsf_core/CoreValidator.java
M src/com/sun/faces/taglib/jsf_core/ValidateDoubleRangeTag.java
M src/com/sun/faces/taglib/jsf_core/ValidateLengthTag.java
M src/com/sun/faces/taglib/jsf_core/ValidateLongRangeTag.java
M src/com/sun/faces/taglib/jsf_core/ViewTag.java
M src/com/sun/faces/util/InstancePool.java
M src/com/sun/faces/util/TreeStructure.java
M systest/src/com/sun/faces/systest/render/TextRenderer.java
M test/com/sun/faces/FacesTestCaseService.java
M test/com/sun/faces/FileOutputResponseWriter.java
M test/com/sun/faces/TestBean.java
M test/com/sun/faces/config/ConfigFileTestCase.java
M test/com/sun/faces/util/TestMessageFactoryImpl.java
- replace Util.doAssert with JDK 1.4 assert keyword
M src/com/sun/faces/util/Util.java
- removed doAssert method
- minor cleanup (imports, array style, unused vars etc)
M systest-per-webapp/build.xml
M systest/build.xml
M build-tests.xml
M build.xml
- use the source attribute of the javac task to specify 1.4
as the input source version
SECTION: Diffs
------------------------------------
SEE ATTACHED FILE - patch.txt
Index: build-tests.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build-tests.xml,v
retrieving revision 1.205
diff -u -r1.205 build-tests.xml
--- build-tests.xml 8 Sep 2004 17:55:59 -0000 1.205
+++ build-tests.xml 7 Oct 2004 14:04:18 -0000
@@ -208,6 +208,7 @@
excludes="com/sun/faces/config/TestConfigListener.java"
debug="${compile.debug}"
optimize="${compile.optimize}"
+ source="1.4"
deprecation="${compile.deprecation}">
<classpath refid="compile.classpath"/>
Index: build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/build.xml,v
retrieving revision 1.166
diff -u -r1.166 build.xml
--- build.xml 8 Sep 2004 17:56:00 -0000 1.166
+++ build.xml 7 Oct 2004 14:04:19 -0000
@@ -365,6 +365,7 @@
destdir="${build.classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
+ source="1.4"
optimize="${compile.optimize}">
<compilerarg line="${jcov.javac.args}" />
<classpath refid="compile.classpath"/>
@@ -688,6 +689,7 @@
destdir="${basedir}/build/test"
debug="${compile.debug}"
optimize="${compile.optimize}"
+ source="1.4"
deprecation="${compile.deprecation}">
<classpath refid="test.classpath"/>
Index: src/com/sun/faces/application/ApplicationAssociate.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/application/ApplicationAssociate.java,v
retrieving revision 1.3
diff -u -r1.3 ApplicationAssociate.java
--- src/com/sun/faces/application/ApplicationAssociate.java 17 Jul 2004 01:37:11 -0000 1.3
+++ src/com/sun/faces/application/ApplicationAssociate.java 7 Oct 2004 14:04:19 -0000
@@ -268,7 +268,7 @@
//add bean to appropriate scope
String scope = managedBean.getScope();
//scope cannot be null
- Util.doAssert(null != scope);
+ assert (null != scope);
if (log.isTraceEnabled()) {
log.trace("Storing " + managedBeanName + " in scope " + scope);
}
Index: src/com/sun/faces/application/ApplicationImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/application/ApplicationImpl.java,v
retrieving revision 1.52
diff -u -r1.52 ApplicationImpl.java
--- src/com/sun/faces/application/ApplicationImpl.java 15 Jul 2004 18:08:31 -0000 1.52
+++ src/com/sun/faces/application/ApplicationImpl.java 7 Oct 2004 14:04:20 -0000
@@ -691,9 +691,9 @@
* @return The new object instance.
*/
protected Object newThing(Object key, Map map) {
- Util.doAssert(key != null);
- Util.doAssert(map != null);
- Util.doAssert(key instanceof String || key instanceof Class);
+ assert (key != null);
+ assert (map != null);
+ assert (key instanceof String || key instanceof Class);
Object result = null;
Class clazz = null;
@@ -705,11 +705,11 @@
if (value == null) {
return null;
}
- Util.doAssert(value instanceof String || value instanceof Class);
+ assert (value instanceof String || value instanceof Class);
if (value instanceof String) {
try {
clazz = Util.loadClass((String) value, value);
- Util.doAssert(clazz != null);
+ assert (clazz != null);
map.put(key, clazz);
} catch (Throwable t) {
Object[] params = {t.getMessage()};
Index: src/com/sun/faces/application/NavigationHandlerImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/application/NavigationHandlerImpl.java,v
retrieving revision 1.34
diff -u -r1.34 NavigationHandlerImpl.java
--- src/com/sun/faces/application/NavigationHandlerImpl.java 17 Jul 2004 01:37:12 -0000 1.34
+++ src/com/sun/faces/application/NavigationHandlerImpl.java 7 Oct 2004 14:04:20 -0000
@@ -107,7 +107,7 @@
ExternalContext extContext = context.getExternalContext();
if (caseStruct != null) {
ViewHandler viewHandler = Util.getViewHandler(context);
- Util.doAssert(null != viewHandler);
+ assert (null != viewHandler);
if (caseStruct.navCase.hasRedirect()) {
// perform a 302 redirect.
@@ -200,7 +200,7 @@
Map caseListMap = associate.getNavigationCaseListMappings();
- Util.doAssert(null != caseListMap);
+ assert (null != caseListMap);
List caseList = (List) caseListMap.get(viewId);
@@ -243,9 +243,9 @@
}
Map caseListMap = associate.getNavigationCaseListMappings();
- Util.doAssert(null != caseListMap);
+ assert (null != caseListMap);
TreeSet wildcardMatchList = associate.getNavigationWildCardList();
- Util.doAssert(null != wildcardMatchList);
+ assert (null != wildcardMatchList);
Iterator iter = wildcardMatchList.iterator();
while (iter.hasNext()) {
@@ -307,7 +307,7 @@
}
Map caseListMap = associate.getNavigationCaseListMappings();
- Util.doAssert(null != caseListMap);
+ assert (null != caseListMap);
List caseList = (List) caseListMap.get("*");
Index: src/com/sun/faces/config/ManagedBeanFactory.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/config/ManagedBeanFactory.java,v
retrieving revision 1.25
diff -u -r1.25 ManagedBeanFactory.java
--- src/com/sun/faces/config/ManagedBeanFactory.java 2 Aug 2004 20:21:07 -0000 1.25
+++ src/com/sun/faces/config/ManagedBeanFactory.java 7 Oct 2004 14:04:28 -0000
@@ -234,7 +234,7 @@
break;
default:
// notreached
- Util.doAssert(false);
+ assert (false);
break;
}
} catch (FacesException fe) {
@@ -282,7 +282,7 @@
// is it a Map?
if (null != (mapEntries = managedBean.getMapEntries())) {
- Util.doAssert(-1 == result);
+ assert (-1 == result);
// managed-bean instances that are Maps, must not have
// properties or list-entries. It is a configuration error
@@ -300,7 +300,7 @@
}
if (TYPE_IS_LIST != result && TYPE_IS_MAP != result) {
- Util.doAssert(-1 == result);
+ assert (-1 == result);
// if it's not a List or a Map, it must be a Bean
if (bean instanceof UIComponent) {
@@ -310,7 +310,7 @@
}
}
- Util.doAssert(-1 != result);
+ assert (-1 != result);
return result;
}
@@ -344,7 +344,7 @@
// is it a Map?
if (null != (mapEntries = bean.getMapEntries())) {
- Util.doAssert(-1 == result);
+ assert (-1 == result);
// managed-property instances that have map-entries, must
// not have value or list-entries. It is a configuration
@@ -361,7 +361,7 @@
}
if (TYPE_IS_LIST != result && TYPE_IS_MAP != result) {
- Util.doAssert(-1 == result);
+ assert (-1 == result);
if (null != bean.getValue() || bean.isNullValue()) {
result = TYPE_IS_SIMPLE;
@@ -560,7 +560,7 @@
value);
break;
default:
- Util.doAssert(false);
+ assert (false);
}
} catch (FacesException fe) {
throw fe;
@@ -968,7 +968,7 @@
//the managed bean is required to be in either "request", "session",
//"application", or "none" scopes. One of the previous decision
//statements must be true.
- Util.doAssert(false);
+ assert (false);
return false;
}
Index: src/com/sun/faces/context/FacesContextImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/context/FacesContextImpl.java,v
retrieving revision 1.66
diff -u -r1.66 FacesContextImpl.java
--- src/com/sun/faces/context/FacesContextImpl.java 31 Mar 2004 18:48:27 -0000 1.66
+++ src/com/sun/faces/context/FacesContextImpl.java 7 Oct 2004 14:04:28 -0000
@@ -125,7 +125,7 @@
(ApplicationFactory) FactoryFinder.getFactory(
FactoryFinder.APPLICATION_FACTORY);
application = aFactory.getApplication();
- Util.doAssert(null != application);
+ assert (null != application);
return application;
}
Index: src/com/sun/faces/el/ValueBindingImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/el/ValueBindingImpl.java,v
retrieving revision 1.35
diff -u -r1.35 ValueBindingImpl.java
--- src/com/sun/faces/el/ValueBindingImpl.java 17 Jul 2004 01:37:12 -0000 1.35
+++ src/com/sun/faces/el/ValueBindingImpl.java 7 Oct 2004 14:04:28 -0000
@@ -114,7 +114,7 @@
});
}
}
- Util.doAssert(null != applicationMap);
+ assert (null != applicationMap);
}
//
Index: src/com/sun/faces/lifecycle/ApplyRequestValuesPhase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/lifecycle/ApplyRequestValuesPhase.java,v
retrieving revision 1.17
diff -u -r1.17 ApplyRequestValuesPhase.java
--- src/com/sun/faces/lifecycle/ApplyRequestValuesPhase.java 26 Feb 2004 20:32:46 -0000 1.17
+++ src/com/sun/faces/lifecycle/ApplyRequestValuesPhase.java 7 Oct 2004 14:04:28 -0000
@@ -73,7 +73,7 @@
}
UIComponent component = facesContext.getViewRoot();
- Util.doAssert(null != component);
+ assert (null != component);
try {
component.processDecodes(facesContext);
Index: src/com/sun/faces/lifecycle/InvokeApplicationPhase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/lifecycle/InvokeApplicationPhase.java,v
retrieving revision 1.15
diff -u -r1.15 InvokeApplicationPhase.java
--- src/com/sun/faces/lifecycle/InvokeApplicationPhase.java 26 Feb 2004 20:32:46 -0000 1.15
+++ src/com/sun/faces/lifecycle/InvokeApplicationPhase.java 7 Oct 2004 14:04:28 -0000
@@ -69,7 +69,7 @@
}
UIViewRoot root = facesContext.getViewRoot();
- Util.doAssert(null != root);
+ assert (null != root);
try {
root.processApplication(facesContext);
Index: src/com/sun/faces/lifecycle/LifecycleFactoryImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/lifecycle/LifecycleFactoryImpl.java,v
retrieving revision 1.21
diff -u -r1.21 LifecycleFactoryImpl.java
--- src/com/sun/faces/lifecycle/LifecycleFactoryImpl.java 31 Mar 2004 18:48:30 -0000 1.21
+++ src/com/sun/faces/lifecycle/LifecycleFactoryImpl.java 7 Oct 2004 14:04:28 -0000
@@ -121,7 +121,7 @@
throw new IllegalArgumentException(message);
}
result = wrapper.instance;
- Util.doAssert(null != result);
+ assert (null != result);
if (alreadyCreated(lifecycleId)) {
message = Util.getExceptionMessageString(
Index: src/com/sun/faces/lifecycle/ProcessValidationsPhase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/lifecycle/ProcessValidationsPhase.java,v
retrieving revision 1.21
diff -u -r1.21 ProcessValidationsPhase.java
--- src/com/sun/faces/lifecycle/ProcessValidationsPhase.java 30 Mar 2004 03:51:10 -0000 1.21
+++ src/com/sun/faces/lifecycle/ProcessValidationsPhase.java 7 Oct 2004 14:04:28 -0000
@@ -72,7 +72,7 @@
log.debug("Entering ProcessValidationsPhase");
}
UIComponent component = facesContext.getViewRoot();
- Util.doAssert(null != component);
+ assert (null != component);
try {
component.processValidators(facesContext);
Index: src/com/sun/faces/lifecycle/RestoreViewPhase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/lifecycle/RestoreViewPhase.java,v
retrieving revision 1.16
diff -u -r1.16 RestoreViewPhase.java
--- src/com/sun/faces/lifecycle/RestoreViewPhase.java 31 Mar 2004 18:48:31 -0000 1.16
+++ src/com/sun/faces/lifecycle/RestoreViewPhase.java 7 Oct 2004 14:04:28 -0000
@@ -169,7 +169,7 @@
log.debug("Postback: Restored view for " + viewId);
}
}
- Util.doAssert(null != viewRoot);
+ assert (null != viewRoot);
facesContext.setViewRoot(viewRoot);
doPerComponentActions(facesContext, viewRoot);
Index: src/com/sun/faces/lifecycle/UpdateModelValuesPhase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/lifecycle/UpdateModelValuesPhase.java,v
retrieving revision 1.36
diff -u -r1.36 UpdateModelValuesPhase.java
--- src/com/sun/faces/lifecycle/UpdateModelValuesPhase.java 26 Feb 2004 20:32:48 -0000 1.36
+++ src/com/sun/faces/lifecycle/UpdateModelValuesPhase.java 7 Oct 2004 14:04:48 -0000
@@ -74,7 +74,7 @@
log.debug("Entering UpdateModelValuesPhase");
}
UIComponent component = facesContext.getViewRoot();
- Util.doAssert(null != component);
+ assert (null != component);
String exceptionMessage = null;
try {
Index: src/com/sun/faces/renderkit/RenderKitImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/RenderKitImpl.java,v
retrieving revision 1.22
diff -u -r1.22 RenderKitImpl.java
--- src/com/sun/faces/renderkit/RenderKitImpl.java 30 Jul 2004 16:11:57 -0000 1.22
+++ src/com/sun/faces/renderkit/RenderKitImpl.java 7 Oct 2004 14:04:48 -0000
@@ -118,7 +118,7 @@
throw new NullPointerException(message);
}
- Util.doAssert(rendererFamilies != null);
+ assert (rendererFamilies != null);
HashMap renderers = null;
Renderer renderer = null;
Index: src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java,v
retrieving revision 1.77
diff -u -r1.77 ButtonRenderer.java
--- src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java 26 Apr 2004 16:37:37 -0000 1.77
+++ src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java 7 Oct 2004 14:04:48 -0000
@@ -149,7 +149,7 @@
}
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
String label = "";
Object value = ((UICommand) component).getValue();
Index: src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java,v
retrieving revision 1.68
diff -u -r1.68 CheckboxRenderer.java
--- src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java 4 May 2004 19:55:07 -0000 1.68
+++ src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java 7 Oct 2004 14:04:49 -0000
@@ -96,7 +96,7 @@
}
String clientId = component.getClientId(context);
- Util.doAssert(clientId != null);
+ assert (clientId != null);
// Convert the new value
UIInput uiInput = (UIInput) component;
Map requestParameterMap = context.getExternalContext()
@@ -157,7 +157,7 @@
String currentValue) throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
String styleClass = null;
writer.startElement("input", component);
Index: src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java,v
retrieving revision 1.22
diff -u -r1.22 CommandLinkRenderer.java
--- src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java 8 Jun 2004 13:47:28 -0000 1.22
+++ src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java 7 Oct 2004 14:04:49 -0000
@@ -172,7 +172,7 @@
return;
}
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
clientId = command.getClientId(context);
@@ -305,7 +305,7 @@
return;
}
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
//Write Anchor inline elements
Index: src/com/sun/faces/renderkit/html_basic/FormRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/FormRenderer.java,v
retrieving revision 1.78
diff -u -r1.78 FormRenderer.java
--- src/com/sun/faces/renderkit/html_basic/FormRenderer.java 28 Apr 2004 20:59:41 -0000 1.78
+++ src/com/sun/faces/renderkit/html_basic/FormRenderer.java 7 Oct 2004 14:04:49 -0000
@@ -114,7 +114,7 @@
return;
}
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
// since method and action are rendered here they are not added
// to the pass through attributes in Util class.
writer.startElement("form", component);
@@ -183,7 +183,7 @@
// Render the end tag for form
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
// this hidden field will be checked in the decode method to determine if
// this form has been submitted.
Index: src/com/sun/faces/renderkit/html_basic/HiddenRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/HiddenRenderer.java,v
retrieving revision 1.20
diff -u -r1.20 HiddenRenderer.java
--- src/com/sun/faces/renderkit/html_basic/HiddenRenderer.java 31 Mar 2004 18:48:35 -0000 1.20
+++ src/com/sun/faces/renderkit/html_basic/HiddenRenderer.java 7 Oct 2004 14:04:49 -0000
@@ -84,7 +84,7 @@
throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
writer.startElement("input", component);
writeIdAttributeIfNecessary(context, writer, component);
Index: 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.85
diff -u -r1.85 HtmlBasicRenderer.java
--- src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java 11 Jun 2004 15:00:25 -0000 1.85
+++ src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java 7 Oct 2004 14:04:50 -0000
@@ -120,7 +120,7 @@
}
String clientId = component.getClientId(context);
- Util.doAssert(clientId != null);
+ assert (clientId != null);
Map requestMap = context.getExternalContext().getRequestParameterMap();
// Don't overwrite the value unless you have to!
if (requestMap.containsKey(clientId)) {
@@ -164,7 +164,7 @@
}
writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
currentValue = getCurrentValue(context, component);
if (log.isTraceEnabled()) {
Index: src/com/sun/faces/renderkit/html_basic/ImageRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/ImageRenderer.java,v
retrieving revision 1.34
diff -u -r1.34 ImageRenderer.java
--- src/com/sun/faces/renderkit/html_basic/ImageRenderer.java 1 Sep 2004 21:15:20 -0000 1.34
+++ src/com/sun/faces/renderkit/html_basic/ImageRenderer.java 7 Oct 2004 14:04:50 -0000
@@ -112,7 +112,7 @@
}
writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
writer.startElement("img", component);
writeIdAttributeIfNecessary(context, writer, component);
Index: src/com/sun/faces/renderkit/html_basic/LabelRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/LabelRenderer.java,v
retrieving revision 1.31
diff -u -r1.31 LabelRenderer.java
--- src/com/sun/faces/renderkit/html_basic/LabelRenderer.java 12 May 2004 01:32:57 -0000 1.31
+++ src/com/sun/faces/renderkit/html_basic/LabelRenderer.java 7 Oct 2004 14:04:58 -0000
@@ -92,7 +92,7 @@
return;
}
writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
UIComponent forComponent = null;
String forClientId = null;
@@ -157,7 +157,7 @@
if (render != null && render.equals("yes")) {
component.getAttributes().remove(RENDER_END_ELEMENT);
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
writer.endElement("label");
}
if (log.isTraceEnabled()) {
Index: src/com/sun/faces/renderkit/html_basic/MenuRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/MenuRenderer.java,v
retrieving revision 1.52
diff -u -r1.52 MenuRenderer.java
--- src/com/sun/faces/renderkit/html_basic/MenuRenderer.java 1 Sep 2004 21:45:50 -0000 1.52
+++ src/com/sun/faces/renderkit/html_basic/MenuRenderer.java 7 Oct 2004 14:04:59 -0000
@@ -105,7 +105,7 @@
}
String clientId = component.getClientId(context);
- Util.doAssert(clientId != null);
+ assert (clientId != null);
// currently we assume the model type to be of type string or
// convertible to string and localised by the application.
if (component instanceof UISelectMany) {
@@ -310,7 +310,7 @@
}
}
- Util.doAssert(null != result);
+ assert (null != result);
if (elementType.isPrimitive()) {
for (i = 0; i < len; i++) {
if (elementType.equals(Boolean.TYPE)) {
@@ -440,7 +440,7 @@
UIComponent component) throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
if (log.isTraceEnabled()) {
log.trace("Rendering 'select'");
@@ -507,7 +507,7 @@
throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
Iterator items = Util.getSelectItems(context, component);
SelectItem curItem = null;
@@ -534,7 +534,7 @@
protected void renderOption(FacesContext context, UIComponent component,
SelectItem curItem) throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
writer.writeText("\t", null);
writer.startElement("option", component);
Index: src/com/sun/faces/renderkit/html_basic/MessageRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/MessageRenderer.java,v
retrieving revision 1.47
diff -u -r1.47 MessageRenderer.java
--- src/com/sun/faces/renderkit/html_basic/MessageRenderer.java 31 Mar 2004 18:48:38 -0000 1.47
+++ src/com/sun/faces/renderkit/html_basic/MessageRenderer.java 7 Oct 2004 14:04:59 -0000
@@ -111,7 +111,7 @@
return;
}
writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
String clientId = ((UIMessage) component).getFor();
//"for" attribute required for Message. Should be taken care of
@@ -127,7 +127,7 @@
messageIter = getMessageIter(context, clientId, component);
- Util.doAssert(messageIter != null);
+ assert (messageIter != null);
if (!messageIter.hasNext()) {
//no messages to render
return;
Index: src/com/sun/faces/renderkit/html_basic/MessagesRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/MessagesRenderer.java,v
retrieving revision 1.16
diff -u -r1.16 MessagesRenderer.java
--- src/com/sun/faces/renderkit/html_basic/MessagesRenderer.java 24 Aug 2004 19:52:44 -0000 1.16
+++ src/com/sun/faces/renderkit/html_basic/MessagesRenderer.java 7 Oct 2004 14:04:59 -0000
@@ -83,7 +83,7 @@
return;
}
writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
// String clientId = ((UIMessages) component).getFor();
String clientId = null; // PENDING - "for" is actually gone now
@@ -98,7 +98,7 @@
//"for" attribute optional for Messages
messageIter = getMessageIter(context, clientId, component);
- Util.doAssert(messageIter != null);
+ assert (messageIter != null);
String layout = (String) component.getAttributes().get("layout");
boolean wroteTable = false;
Index: src/com/sun/faces/renderkit/html_basic/OutputLinkRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/OutputLinkRenderer.java,v
retrieving revision 1.15
diff -u -r1.15 OutputLinkRenderer.java
--- src/com/sun/faces/renderkit/html_basic/OutputLinkRenderer.java 31 Mar 2004 18:48:38 -0000 1.15
+++ src/com/sun/faces/renderkit/html_basic/OutputLinkRenderer.java 7 Oct 2004 14:04:59 -0000
@@ -127,7 +127,7 @@
return;
}
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
writer.startElement("a", component);
writeIdAttributeIfNecessary(context, writer, component);
@@ -228,7 +228,7 @@
return;
}
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
//Write Anchor inline elements
Index: src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java,v
retrieving revision 1.15
diff -u -r1.15 OutputMessageRenderer.java
--- src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java 28 Jul 2004 14:52:13 -0000 1.15
+++ src/com/sun/faces/renderkit/html_basic/OutputMessageRenderer.java 7 Oct 2004 14:04:59 -0000
@@ -106,7 +106,7 @@
styleClass = (String) component.getAttributes().get("styleClass");
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
// suppress rendering if "rendered" property on the component is
// false.
Index: src/com/sun/faces/renderkit/html_basic/RadioRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/RadioRenderer.java,v
retrieving revision 1.68
diff -u -r1.68 RadioRenderer.java
--- src/com/sun/faces/renderkit/html_basic/RadioRenderer.java 28 Jul 2004 20:36:16 -0000 1.68
+++ src/com/sun/faces/renderkit/html_basic/RadioRenderer.java 7 Oct 2004 14:04:59 -0000
@@ -70,7 +70,7 @@
throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
UISelectOne selectOne = (UISelectOne) component;
Object curValue = selectOne.getSubmittedValue();
Index: src/com/sun/faces/renderkit/html_basic/SecretRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/SecretRenderer.java,v
retrieving revision 1.55
diff -u -r1.55 SecretRenderer.java
--- src/com/sun/faces/renderkit/html_basic/SecretRenderer.java 31 Mar 2004 18:48:38 -0000 1.55
+++ src/com/sun/faces/renderkit/html_basic/SecretRenderer.java 7 Oct 2004 14:04:59 -0000
@@ -85,7 +85,7 @@
UIComponent component, String currentValue)
throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
String styleClass = null;
Index: src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java,v
retrieving revision 1.37
diff -u -r1.37 SelectManyCheckboxListRenderer.java
--- src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java 27 Jul 2004 19:59:17 -0000 1.37
+++ src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java 7 Oct 2004 14:05:20 -0000
@@ -86,7 +86,7 @@
}
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
String alignStr = null;
Object borderObj = null;
@@ -166,7 +166,7 @@
throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
// disable the check box if the attribute is set.
String labelClass = null;
@@ -257,7 +257,7 @@
throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
writer.startElement("table", component);
if (border != Integer.MIN_VALUE) {
@@ -296,7 +296,7 @@
throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
if (!alignVertical) {
writer.writeText("\t", null);
Index: src/com/sun/faces/renderkit/html_basic/TextRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/TextRenderer.java,v
retrieving revision 1.66
diff -u -r1.66 TextRenderer.java
--- src/com/sun/faces/renderkit/html_basic/TextRenderer.java 31 Mar 2004 18:48:39 -0000 1.66
+++ src/com/sun/faces/renderkit/html_basic/TextRenderer.java 7 Oct 2004 14:05:20 -0000
@@ -87,7 +87,7 @@
throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
boolean
shouldWriteIdAttribute = false,
isOutput = false;
Index: src/com/sun/faces/renderkit/html_basic/TextareaRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/TextareaRenderer.java,v
retrieving revision 1.12
diff -u -r1.12 TextareaRenderer.java
--- src/com/sun/faces/renderkit/html_basic/TextareaRenderer.java 20 Apr 2004 16:37:24 -0000 1.12
+++ src/com/sun/faces/renderkit/html_basic/TextareaRenderer.java 7 Oct 2004 14:05:20 -0000
@@ -85,7 +85,7 @@
String currentValue) throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
String styleClass = (String)component.getAttributes().get("styleClass");
Index: src/com/sun/faces/taglib/html_basic/HtmlBasicValidator.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/html_basic/HtmlBasicValidator.java,v
retrieving revision 1.10
diff -u -r1.10 HtmlBasicValidator.java
--- src/com/sun/faces/taglib/html_basic/HtmlBasicValidator.java 26 Jul 2004 21:12:44 -0000 1.10
+++ src/com/sun/faces/taglib/html_basic/HtmlBasicValidator.java 7 Oct 2004 14:05:20 -0000
@@ -73,7 +73,7 @@
protected String getFailureMessage(String prefix, String uri) {
// we should only get called if this Validator failed
- Util.doAssert(failed);
+ assert (failed);
StringBuffer result = new StringBuffer();
if (commandTagParser.hasFailed()) {
Index: 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.12
diff -u -r1.12 ConvertDateTimeTag.java
--- src/com/sun/faces/taglib/jsf_core/ConvertDateTimeTag.java 6 Apr 2004 14:18:19 -0000 1.12
+++ src/com/sun/faces/taglib/jsf_core/ConvertDateTimeTag.java 7 Oct 2004 14:05:20 -0000
@@ -138,7 +138,7 @@
DateTimeConverter result = null;
result = (DateTimeConverter) super.createConverter();
- Util.doAssert(null != result);
+ assert (null != result);
evaluateExpressions();
result.setDateStyle(dateStyle);
Index: src/com/sun/faces/taglib/jsf_core/ConvertNumberTag.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/jsf_core/ConvertNumberTag.java,v
retrieving revision 1.10
diff -u -r1.10 ConvertNumberTag.java
--- src/com/sun/faces/taglib/jsf_core/ConvertNumberTag.java 6 Apr 2004 14:18:19 -0000 1.10
+++ src/com/sun/faces/taglib/jsf_core/ConvertNumberTag.java 7 Oct 2004 14:05:20 -0000
@@ -194,7 +194,7 @@
NumberConverter result = null;
result = (NumberConverter) super.createConverter();
- Util.doAssert(null != result);
+ assert (null != result);
evaluateExpressions();
result.setCurrencyCode(currencyCode);
@@ -242,7 +242,7 @@
if (Util.isVBExpression(groupingUsed_)) {
Boolean booleanObj = (Boolean) Util.evaluateVBExpression(
groupingUsed_);
- Util.doAssert(null != booleanObj);
+ assert (null != booleanObj);
groupingUsed = booleanObj.booleanValue();
} else {
groupingUsed = new Boolean(groupingUsed_).booleanValue();
@@ -252,7 +252,7 @@
if (Util.isVBExpression(integerOnly_)) {
Boolean booleanObj = (Boolean) Util.evaluateVBExpression(
integerOnly_);
- Util.doAssert(null != booleanObj);
+ assert (null != booleanObj);
integerOnly = booleanObj.booleanValue();
} else {
integerOnly = new Boolean(integerOnly_).booleanValue();
@@ -262,7 +262,7 @@
if (Util.isVBExpression(maxFractionDigits_)) {
intObj =
(Integer) Util.evaluateVBExpression(maxFractionDigits_);
- Util.doAssert(null != intObj);
+ assert (null != intObj);
maxFractionDigits = intObj.intValue();
} else {
maxFractionDigits = new Integer(maxFractionDigits_).intValue();
@@ -271,7 +271,7 @@
if (maxIntegerDigits_ != null) {
if (Util.isVBExpression(maxIntegerDigits_)) {
intObj = (Integer) Util.evaluateVBExpression(maxIntegerDigits_);
- Util.doAssert(null != intObj);
+ assert (null != intObj);
maxIntegerDigits = intObj.intValue();
} else {
maxIntegerDigits = new Integer(maxIntegerDigits_).intValue();
@@ -281,7 +281,7 @@
if (Util.isVBExpression(minFractionDigits_)) {
intObj =
(Integer) Util.evaluateVBExpression(minFractionDigits_);
- Util.doAssert(null != intObj);
+ assert (null != intObj);
minFractionDigits = intObj.intValue();
} else {
minFractionDigits = new Integer(minFractionDigits_).intValue();
@@ -290,7 +290,7 @@
if (minIntegerDigits_ != null) {
if (Util.isVBExpression(minIntegerDigits_)) {
intObj = (Integer) Util.evaluateVBExpression(minIntegerDigits_);
- Util.doAssert(null != intObj);
+ assert (null != intObj);
minIntegerDigits = intObj.intValue();
} else {
minIntegerDigits = new Integer(minIntegerDigits_).intValue();
Index: src/com/sun/faces/taglib/jsf_core/CoreValidator.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/jsf_core/CoreValidator.java,v
retrieving revision 1.11
diff -u -r1.11 CoreValidator.java
--- src/com/sun/faces/taglib/jsf_core/CoreValidator.java 26 Feb 2004 20:33:17 -0000 1.11
+++ src/com/sun/faces/taglib/jsf_core/CoreValidator.java 7 Oct 2004 14:05:20 -0000
@@ -87,7 +87,7 @@
*/
protected String getFailureMessage(String prefix, String uri) {
// we should only get called if this Validator failed
- Util.doAssert(failed);
+ assert (failed);
StringBuffer result = new StringBuffer();
if (idTagParser.hasFailed()) {
Index: src/com/sun/faces/taglib/jsf_core/ValidateDoubleRangeTag.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/jsf_core/ValidateDoubleRangeTag.java,v
retrieving revision 1.10
diff -u -r1.10 ValidateDoubleRangeTag.java
--- src/com/sun/faces/taglib/jsf_core/ValidateDoubleRangeTag.java 6 Apr 2004 15:02:04 -0000 1.10
+++ src/com/sun/faces/taglib/jsf_core/ValidateDoubleRangeTag.java 7 Oct 2004 14:05:21 -0000
@@ -88,7 +88,7 @@
DoubleRangeValidator result = null;
result = (DoubleRangeValidator) super.createValidator();
- Util.doAssert(null != result);
+ assert (null != result);
evaluateExpressions();
if (maximumSet) {
@@ -108,7 +108,7 @@
if (minimum_ != null) {
if (Util.isVBExpression(minimum_)) {
Number numberObj = (Number) Util.evaluateVBExpression(minimum_);
- Util.doAssert(null != numberObj);
+ assert (null != numberObj);
minimum = numberObj.doubleValue();
} else {
minimum = new Double(minimum_).doubleValue();
@@ -117,7 +117,7 @@
if (maximum_ != null) {
if (Util.isVBExpression(maximum_)) {
Number numberObj = (Number) Util.evaluateVBExpression(maximum_);
- Util.doAssert(null != numberObj);
+ assert (null != numberObj);
maximum = numberObj.doubleValue();
} else {
maximum = new Double(maximum_).doubleValue();
Index: src/com/sun/faces/taglib/jsf_core/ValidateLengthTag.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/jsf_core/ValidateLengthTag.java,v
retrieving revision 1.10
diff -u -r1.10 ValidateLengthTag.java
--- src/com/sun/faces/taglib/jsf_core/ValidateLengthTag.java 6 Apr 2004 15:02:04 -0000 1.10
+++ src/com/sun/faces/taglib/jsf_core/ValidateLengthTag.java 7 Oct 2004 14:05:21 -0000
@@ -86,7 +86,7 @@
LengthValidator result = null;
result = (LengthValidator) super.createValidator();
- Util.doAssert(null != result);
+ assert (null != result);
evaluateExpressions();
if (maximumSet) {
@@ -106,7 +106,7 @@
if (minimum_ != null) {
if (Util.isVBExpression(minimum_)) {
Number numberObj = (Number) Util.evaluateVBExpression(minimum_);
- Util.doAssert(null != numberObj);
+ assert (null != numberObj);
minimum = numberObj.intValue();
} else {
minimum = new Integer(minimum_).intValue();
@@ -115,7 +115,7 @@
if (maximum_ != null) {
if (Util.isVBExpression(maximum_)) {
Number numberObj = (Number) Util.evaluateVBExpression(maximum_);
- Util.doAssert(null != numberObj);
+ assert (null != numberObj);
maximum = numberObj.intValue();
} else {
maximum = new Integer(maximum_).intValue();
Index: src/com/sun/faces/taglib/jsf_core/ValidateLongRangeTag.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/taglib/jsf_core/ValidateLongRangeTag.java,v
retrieving revision 1.10
diff -u -r1.10 ValidateLongRangeTag.java
--- src/com/sun/faces/taglib/jsf_core/ValidateLongRangeTag.java 6 Apr 2004 15:02:04 -0000 1.10
+++ src/com/sun/faces/taglib/jsf_core/ValidateLongRangeTag.java 7 Oct 2004 14:05:21 -0000
@@ -86,7 +86,7 @@
LongRangeValidator result = null;
result = (LongRangeValidator) super.createValidator();
- Util.doAssert(null != result);
+ assert (null != result);
evaluateExpressions();
if (maximumSet) {
@@ -106,7 +106,7 @@
if (minimum_ != null) {
if (Util.isVBExpression(minimum_)) {
Number numberObj = (Number) Util.evaluateVBExpression(minimum_);
- Util.doAssert(null != numberObj);
+ assert (null != numberObj);
minimum = numberObj.longValue();
} else {
minimum = new Long(minimum_).longValue();
@@ -115,7 +115,7 @@
if (maximum_ != null) {
if (Util.isVBExpression(maximum_)) {
Number numberObj = (Number) Util.evaluateVBExpression(maximum_);
- Util.doAssert(null != numberObj);
+ assert (null != numberObj);
maximum = numberObj.longValue();
} else {
maximum = new Long(maximum_).longValue();
Index: 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.26
diff -u -r1.26 ViewTag.java
--- src/com/sun/faces/taglib/jsf_core/ViewTag.java 5 Aug 2004 20:02:19 -0000 1.26
+++ src/com/sun/faces/taglib/jsf_core/ViewTag.java 7 Oct 2004 14:05:21 -0000
@@ -118,13 +118,13 @@
}
FacesContext facesContext = FacesContext.getCurrentInstance();
- Util.doAssert(facesContext != null);
+ assert (facesContext != null);
// this must happen after our overriderProperties executes.
pageContext.getResponse().setLocale(facesContext.getViewRoot().getLocale());
ResponseWriter writer = facesContext.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
try {
writer.startDocument();
@@ -216,7 +216,7 @@
// have a facesContext ivar.
FacesContext context = FacesContext.getCurrentInstance();
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
try {
writer.endDocument();
} catch (IOException e) {
@@ -238,7 +238,7 @@
* This should never get called for PageTag.
*/
public String getComponentType() {
- Util.doAssert(false);
+ assert (false);
throw new IllegalStateException();
}
Index: src/com/sun/faces/util/InstancePool.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/util/InstancePool.java,v
retrieving revision 1.3
diff -u -r1.3 InstancePool.java
--- src/com/sun/faces/util/InstancePool.java 1 Jun 2004 16:58:49 -0000 1.3
+++ src/com/sun/faces/util/InstancePool.java 7 Oct 2004 14:05:21 -0000
@@ -154,7 +154,7 @@
if (-1 == (i = instances.indexOf(toCheckin))) {
throw new IllegalStateException("Trying to checkin an instance that is not in the pool: " + toCheckin);
}
- Util.doAssert(checkedOut.get(i));
+ assert (checkedOut.get(i));
checkedOut.clear(i);
}
Index: src/com/sun/faces/util/TreeStructure.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/util/TreeStructure.java,v
retrieving revision 1.7
diff -u -r1.7 TreeStructure.java
--- src/com/sun/faces/util/TreeStructure.java 31 Mar 2004 18:48:51 -0000 1.7
+++ src/com/sun/faces/util/TreeStructure.java 7 Oct 2004 14:05:21 -0000
@@ -131,7 +131,7 @@
Util.MISSING_CLASS_ERROR_MESSAGE_ID,
params));
}
- Util.doAssert(component != null);
+ assert (component != null);
component.setId(id);
return component;
}
Index: src/com/sun/faces/util/Util.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/util/Util.java,v
retrieving revision 1.143
diff -u -r1.143 Util.java
--- src/com/sun/faces/util/Util.java 10 Aug 2004 13:38:25 -0000 1.143
+++ src/com/sun/faces/util/Util.java 7 Oct 2004 14:05:32 -0000
@@ -12,7 +12,6 @@
package com.sun.faces.util;
import com.sun.faces.RIConstants;
-import com.sun.faces.application.ApplicationAssociate;
import com.sun.faces.el.impl.ExpressionEvaluator;
import com.sun.faces.el.impl.ExpressionEvaluatorImpl;
import com.sun.faces.renderkit.RenderKitImpl;
@@ -29,8 +28,8 @@
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectItem;
import javax.faces.component.UISelectItems;
-import javax.faces.context.FacesContext;
import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
import javax.faces.context.FacesContextFactory;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
@@ -50,8 +49,8 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import java.util.Locale;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.StringTokenizer;
@@ -82,14 +81,14 @@
// parameters to test/com/sun/faces/util/TestUtil_messages (see comment there).
/**
- * The message identifier of the {_at_link Message} to be created as
+ * The message identifier of the {_at_link FacesMessage} to be created as
* a result of type conversion error.
*/
public static final String CONVERSION_ERROR_MESSAGE_ID =
"com.sun.faces.TYPECONVERSION_ERROR";
/**
- * The message identifier of the {_at_link Message} to be created if
+ * The message identifier of the {_at_link FacesMessage} to be created if
* there is model update failure.
*/
public static final String MODEL_UPDATE_ERROR_MESSAGE_ID =
@@ -304,10 +303,10 @@
* but have have no value in HTML. For example "disabled" or
* "readonly". <P>
*
- * @see renderBooleanPassthruAttributes
+ * @see #renderBooleanPassThruAttributes
*/
- private static String booleanPassthruAttributes[] = {
+ private static String[] booleanPassthruAttributes = {
"disabled",
"readonly",
"ismap"
@@ -320,9 +319,9 @@
* attribute requires interpretation by a Renderer, it should be
* removed from this array.<P>
*
- * @see renderPassthruAttributes
+ * @see #renderPassThruAttributes
*/
- private static String passthruAttributes[] = {
+ private static String[] passthruAttributes = {
"accept",
"accesskey",
"alt",
@@ -423,7 +422,7 @@
*/
public static synchronized String getExceptionMessageString(String messageId,
- Object params[]) {
+ Object[] params) {
String result = null;
FacesMessage message = MessageFactory.getMessage(messageId, params);
@@ -444,7 +443,7 @@
}
public static synchronized FacesMessage getExceptionMessage(String messageId,
- Object params[]) {
+ Object[] params) {
return MessageFactory.getMessage(messageId, params);
}
@@ -470,19 +469,19 @@
renderKitFactory = (RenderKitFactory)
FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- Util.doAssert(null != renderKitFactory);
+ assert (null != renderKitFactory);
lifecycleFactory = (LifecycleFactory)
FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
- Util.doAssert(null != lifecycleFactory);
+ assert (null != lifecycleFactory);
facesContextFactory = (FacesContextFactory)
FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
- Util.doAssert(null != facesContextFactory);
+ assert (null != facesContextFactory);
applicationFactory = (ApplicationFactory)
FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
- Util.doAssert(null != applicationFactory);
+ assert (null != applicationFactory);
defaultRenderKit =
renderKitFactory.getRenderKit(null,
@@ -564,7 +563,7 @@
/**
- * <p>Return an Iterator over {_at_link SelectItemWrapper} instances representing the
+ * <p>Return an Iterator over {_at_link SelectItem} instances representing the
* available options for this component, assembled from the set of
* {_at_link UISelectItem} and/or {_at_link UISelectItems} components that are
* direct children of this component. If there are no such children, a
@@ -601,7 +600,7 @@
if (value instanceof SelectItem) {
list.add(value);
} else if (value instanceof SelectItem[]) {
- SelectItem items[] = (SelectItem[]) value;
+ SelectItem[] items = (SelectItem[]) value;
for (int i = 0; i < items.length; i++) {
list.add(items[i]);
}
@@ -683,7 +682,7 @@
(javax.servlet.jsp.jstl.fmt.LocalizationContext)
(Util.getValueBinding(bundleName)).getValue(context))) {
result = locCtx.getLocale();
- Util.doAssert(null != result);
+ assert (null != result);
}
}
if (null == result) {
@@ -755,8 +754,8 @@
UIComponent component,
String[] excludes)
throws IOException {
- Util.doAssert(null != writer);
- Util.doAssert(null != component);
+ assert (null != writer);
+ assert (null != component);
int i = 0, len = booleanPassthruAttributes.length, j,
jLen = (null != excludes ? excludes.length : 0);
@@ -787,7 +786,7 @@
if (!(value instanceof String)) {
value = value.toString();
}
- result = (new Boolean((String) value)).booleanValue();
+ result = (Boolean.valueOf((String) value)).booleanValue();
}
//PENDING(rogerk) will revisit "null" param soon..
if (result) {
@@ -821,8 +820,8 @@
UIComponent component,
String[] excludes)
throws IOException {
- Util.doAssert(null != writer);
- Util.doAssert(null != component);
+ assert (null != writer);
+ assert (null != component);
int i = 0, len = passthruAttributes.length, j,
jLen = (null != excludes ? excludes.length : 0);
@@ -1046,7 +1045,6 @@
if (null == expression) {
return false;
}
- int start = 0;
// if it doesn't start and end with delimiters
if (!(expression.startsWith("#{") && expression.endsWith("}"))) {
// see if it has some inside.
@@ -1066,11 +1064,11 @@
throws FacesException {
// Get Application instance
Application application = context.getApplication();
- Util.doAssert(application != null);
+ assert (application != null);
// Get the ViewHandler
ViewHandler viewHandler = application.getViewHandler();
- Util.doAssert(viewHandler != null);
+ assert (viewHandler != null);
return viewHandler;
}
@@ -1084,12 +1082,12 @@
renderKitFactory = (RenderKitFactory)
FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- Util.doAssert(null != renderKitFactory);
+ assert (null != renderKitFactory);
- Util.doAssert(null != renderKitId);
+ assert (null != renderKitId);
renderKit = renderKitFactory.getRenderKit(context, renderKitId);
- Util.doAssert(null != renderKit);
+ assert (null != renderKit);
result = renderKit.getResponseStateManager();
return result;
@@ -1271,7 +1269,7 @@
public static String stripBracketsIfNecessary(String expression)
throws ReferenceSyntaxException {
- Util.doAssert(null != expression);
+ assert (null != expression);
int len = 0;
// look for invalid expressions
if ('#' == expression.charAt(0)) {
@@ -1294,15 +1292,6 @@
// General Methods
//
- private static boolean assertEnabled = true;
-
-
- public static void doAssert(boolean cond) throws FacesException {
- if (assertEnabled && !cond) {
- throw new FacesException(getExceptionMessageString(ASSERTION_FAILED_ID));
- }
- }
-
public static void parameterNonNull(Object param) throws FacesException {
if (null == param) {
@@ -1417,10 +1406,10 @@
}
/**
- * @result a List of expressions from the expressionString
- *
* @param expressionString the expression string, with delimiters
* intact.
+ *
+ * @return a List of expressions from the expressionString
*/
public static List getExpressionsFromString(String expressionString) throws ReferenceSyntaxException {
@@ -1447,8 +1436,8 @@
* @return index of the first occurrence of . or [
*/
private static int getFirstSegmentIndex(String valueBinding) {
- int segmentIndex = valueBinding.indexOf(".");
- int bracketIndex = valueBinding.indexOf("[");
+ int segmentIndex = valueBinding.indexOf('.');
+ int bracketIndex = valueBinding.indexOf('[');
//there is no "." in the valueBinding so take the bracket value
if (segmentIndex < 0) {
Index: systest/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/build.xml,v
retrieving revision 1.21
diff -u -r1.21 build.xml
--- systest/build.xml 8 Sep 2004 18:28:00 -0000 1.21
+++ systest/build.xml 7 Oct 2004 14:05:32 -0000
@@ -219,6 +219,7 @@
destdir="${build.home}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
+ source="1.4"
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
Index: systest/src/com/sun/faces/systest/render/TextRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/src/com/sun/faces/systest/render/TextRenderer.java,v
retrieving revision 1.9
diff -u -r1.9 TextRenderer.java
--- systest/src/com/sun/faces/systest/render/TextRenderer.java 31 Mar 2004 18:48:54 -0000 1.9
+++ systest/src/com/sun/faces/systest/render/TextRenderer.java 7 Oct 2004 14:05:32 -0000
@@ -97,7 +97,7 @@
public void encodeEnd(FacesContext context, UIComponent component)
throws IOException {
ResponseWriter writer = context.getResponseWriter();
- Util.doAssert(writer != null);
+ assert (writer != null);
String styleClass = null;
Index: systest-per-webapp/build.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/build.xml,v
retrieving revision 1.8
diff -u -r1.8 build.xml
--- systest-per-webapp/build.xml 8 Sep 2004 18:28:00 -0000 1.8
+++ systest-per-webapp/build.xml 7 Oct 2004 14:05:35 -0000
@@ -205,6 +205,7 @@
destdir="${basedir}/build/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
+ source="1.4"
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
@@ -378,6 +379,7 @@
destdir="${webapp.build.home}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
+ source="1.4"
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
Index: test/com/sun/faces/FacesTestCaseService.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/FacesTestCaseService.java,v
retrieving revision 1.40
diff -u -r1.40 FacesTestCaseService.java
--- test/com/sun/faces/FacesTestCaseService.java 17 Jul 2004 01:37:13 -0000 1.40
+++ test/com/sun/faces/FacesTestCaseService.java 7 Oct 2004 14:05:35 -0000
@@ -144,7 +144,7 @@
facesContextFactory = (FacesContextFactory)
FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
- Util.doAssert(null != facesContextFactory);
+ assert (null != facesContextFactory);
// Since we run using tomcat's deploy targets, we must obtain the
// absolute path to where we are to write our output files.
@@ -152,14 +152,14 @@
facesTestCase.getConfig().getServletContext().getInitParameter(
"testRootDir");
- Util.doAssert(null != testRootDir);
+ assert (null != testRootDir);
System.setProperty("testRootDir", testRootDir);
String jcovFile =
facesTestCase.getConfig().getServletContext().getInitParameter(
"jcovFile");
- Util.doAssert(null != jcovFile);
+ assert (null != jcovFile);
System.setProperty("jcovFile", jcovFile);
// See if the testcase wants to have its output sent to a file.
@@ -172,9 +172,9 @@
LifecycleFactory factory = (LifecycleFactory)
FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
- Util.doAssert(null != factory);
+ assert (null != factory);
lifecycle = factory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
- Util.doAssert(null != lifecycle);
+ assert (null != lifecycle);
facesContext =
@@ -182,7 +182,7 @@
getServletContext(),
facesTestCase.getRequest(),
response, lifecycle);
- Util.doAssert(null != facesContext);
+ assert (null != facesContext);
if (facesTestCase.sendWriterToFile()) {
ResponseWriter responseWriter = new FileOutputResponseWriter();
Index: test/com/sun/faces/FileOutputResponseWriter.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/FileOutputResponseWriter.java,v
retrieving revision 1.13
diff -u -r1.13 FileOutputResponseWriter.java
--- test/com/sun/faces/FileOutputResponseWriter.java 26 Feb 2004 20:33:59 -0000 1.13
+++ test/com/sun/faces/FileOutputResponseWriter.java 7 Oct 2004 14:05:35 -0000
@@ -69,7 +69,7 @@
writer = new HtmlResponseWriter(out, "text/html", "ISO-8859-1");
} catch (Exception e) {
System.out.println(e.getMessage());
- Util.doAssert(false);
+ assert (false);
}
}
@@ -82,7 +82,7 @@
String testRootDir;
// prepend the testRootDir to the RESPONSE_WRITER_FILENAME
testRootDir = System.getProperty("testRootDir");
- Util.doAssert(null != testRootDir);
+ assert (null != testRootDir);
FACES_RESPONSE_ROOT = testRootDir + "/";
RESPONSE_WRITER_FILENAME =
FACES_RESPONSE_ROOT + RESPONSE_WRITER_FILENAME;
Index: test/com/sun/faces/TestBean.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/TestBean.java,v
retrieving revision 1.15
diff -u -r1.15 TestBean.java
--- test/com/sun/faces/TestBean.java 2 Aug 2004 19:25:09 -0000 1.15
+++ test/com/sun/faces/TestBean.java 7 Oct 2004 14:05:35 -0000
@@ -43,7 +43,7 @@
public void setOne(String newOne) {
one = newOne;
- Util.doAssert(newOne.equals("one"));
+ assert (newOne.equals("one"));
System.setProperty(PROP, TRUE);
}
@@ -325,7 +325,7 @@
public void setTwo(String newTwo) {
two = newTwo;
- Util.doAssert(newTwo.equals("two"));
+ assert (newTwo.equals("two"));
System.setProperty(PROP, TRUE);
}
@@ -395,7 +395,7 @@
public void setThree(String newThree) {
three = newThree;
- Util.doAssert(newThree.equals("three"));
+ assert (newThree.equals("three"));
System.setProperty(PROP, TRUE);
}
Index: test/com/sun/faces/config/ConfigFileTestCase.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/config/ConfigFileTestCase.java,v
retrieving revision 1.64
diff -u -r1.64 ConfigFileTestCase.java
--- test/com/sun/faces/config/ConfigFileTestCase.java 2 Aug 2004 20:22:44 -0000 1.64
+++ test/com/sun/faces/config/ConfigFileTestCase.java 7 Oct 2004 14:05:36 -0000
@@ -293,7 +293,7 @@
Class c = bean.getClass();
Method m[] = c.getDeclaredMethods();
for (int i = 0; i < m.length; i++) {
- Util.doAssert(m[i].getName().equals("setSimpleProperty") ||
+ assert (m[i].getName().equals("setSimpleProperty") ||
m[i].getName().equals("getSimpleProperty") ||
m[i].getName().equals("setIntProperty") ||
m[i].getName().equals("getIntProperty") ||
@@ -304,7 +304,7 @@
if (m[i].getName().equals("getSimpleProperty")) {
Object args[] = null;
Object value = m[i].invoke(bean, args);
- Util.doAssert(((String) value).equals("Bobby Orr"));
+ assert (((String) value).equals("Bobby Orr"));
}
}
} catch (Throwable t) {
Index: test/com/sun/faces/util/TestMessageFactoryImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/util/TestMessageFactoryImpl.java,v
retrieving revision 1.7
diff -u -r1.7 TestMessageFactoryImpl.java
--- test/com/sun/faces/util/TestMessageFactoryImpl.java 7 Apr 2004 17:53:06 -0000 1.7
+++ test/com/sun/faces/util/TestMessageFactoryImpl.java 7 Oct 2004 14:05:36 -0000
@@ -81,7 +81,7 @@
FacesMessage msg = null;
FacesContext facesContext = getFacesContext();
- Util.doAssert(facesContext != null);
+ assert (facesContext != null);
System.out.println("Testing get methods");
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net