Author: Alex.Kolonitsky Date: 2009-12-04 15:41:13 -0500 (Fri, 04 Dec 2009) New Revision: 16070 Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugOutputMaker.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/FacesErrorStateHolder.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/package-info.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/package.html root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCache.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCache.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCacheFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/ServletContextInitMap.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/ServletContextInitMapEntry.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/CacheEntry.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/CacheMap.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCache.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCacheFactory.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/package-info.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxLoadBundleComponent.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/ContextCallbackWrapper.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/EventValueBinding.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/EventValueExpression.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/InvokerCallbackWrapper.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/package-info.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FacesConfig.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FacesConfigHandler.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FilterBean.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FilterMapping.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ParsingException.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ServletBean.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ServletMapping.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/StateHandler.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/StringContentHandler.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/WebXMLParser.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/WebappHandler.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ComponentInvoker.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/InvokerCallback.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ResponseWriterContentHandler.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ViewResources.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/package-info.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/css/CssCompressor.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/css/package-info.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/el/ELContextWrapper.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/el/ELResolverWrapper.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxListenerHelper.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxValidationActionEvent.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/package-info.java Log: RFPL-195 - Code style policy Reformatting Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.application; import org.ajax4jsf.Messages; @@ -31,15 +29,9 @@ import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.webapp.BaseFilter; import org.ajax4jsf.webapp.FilterServletResponseWrapper; - import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; -import java.io.IOException; - -import java.util.Map; - import javax.faces.FacesException; import javax.faces.application.Resource; import javax.faces.application.ResourceHandler; @@ -47,11 +39,12 @@ import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import java.io.IOException; +import java.util.Map; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.5 $ $Date: 2007/02/08 15:02:04 $ - * */ public class AjaxViewHandler extends ViewHandlerWrapper { public static final String SERIALIZED_STATE_KEY = "org.ajax4jsf.view.serializedstate"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,12 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.application; import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; import javax.faces.FacesException; @@ -38,7 +35,6 @@ /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:12 $ - * */ public class DebugLifecycle extends Lifecycle implements PhaseListener { public static final String DEBUG_LYFECYCLE_ID = "DEBUG"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,23 +19,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.application; import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; -import java.util.Iterator; - import javax.faces.lifecycle.Lifecycle; import javax.faces.lifecycle.LifecycleFactory; +import java.util.Iterator; /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:12 $ - * */ public class DebugLifecycleFactory extends LifecycleFactory { private static final Logger LOG = RichfacesLogger.APPLICATION.getLogger(); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugOutputMaker.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugOutputMaker.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/DebugOutputMaker.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,27 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.application; -import java.io.IOException; -import java.io.PrintWriter; +import org.ajax4jsf.Messages; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.Map.Entry; - import javax.el.Expression; import javax.el.ValueExpression; - import javax.faces.FacesException; import javax.faces.application.Resource; import javax.faces.component.UIComponent; @@ -47,12 +32,21 @@ import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.event.PhaseId; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; -import org.ajax4jsf.Messages; - /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:11 $ @@ -137,7 +131,7 @@ // output html prolog out.println("<html><head><title>" + Messages.getMessage(Messages.ERROR_ON_PAGE, viewId) - + "</title></head><body>"); + + "</title></head><body>"); // write script writeScriptAndStyle(out); @@ -146,14 +140,14 @@ PhaseId facesPhase = (PhaseId) context.getExternalContext().getRequestMap().get(DebugLifecycle.PHASE_ID_PARAM); String errorMessage = (facesPhase == null) ? Messages.getMessage(Messages.LIFECYCLE_ERROR, viewId, phase) : Messages.getMessage(Messages.LIFECYCLE_ERROR_AT_PHASE, - new Object[] {viewId, phase, facesPhase.toString()}); + new Object[]{viewId, phase, facesPhase.toString()}); out.println("<h1 >"); out.println(errorMessage); out.println("</h1>"); response.setHeader("Ajax-Error-Message", - errorMessage + ",\n caused by " + e.getClass().getName() + ", with message: " - + e.getMessage()); + errorMessage + ",\n caused by " + e.getClass().getName() + ", with message: " + + e.getMessage()); // Output exceptions writeExceptionStack(e, out); @@ -193,7 +187,7 @@ writeToggleMark(out, "exception" + errorId); out.print(caused + error.getClass().getName() + " : " + error.getMessage() + "</h3>"); out.println("<div id='exception" + errorId - + "' style='display: none;' class='exception'><p>Exception stack :</p><pre>"); + + "' style='display: none;' class='exception'><p>Exception stack :</p><pre>"); StackTraceElement[] stackTrace = error.getStackTrace(); @@ -258,7 +252,7 @@ String logResourceRequestPath = logResource.getRequestPath(); out.print("<iframe name='log' class='log' src='" + logResourceRequestPath + "'><a href='src='" - + logResourceRequestPath + "'>Faces log file </a> </iframe>"); + + logResourceRequestPath + "'>Faces log file </a> </iframe>"); out.println("</div>"); } } @@ -321,7 +315,7 @@ // out bindings // out attributes map - for (Iterator<Entry<String, Object>> it = component.getAttributes().entrySet().iterator(); it.hasNext(); ) { + for (Iterator<Entry<String, Object>> it = component.getAttributes().entrySet().iterator(); it.hasNext();) { Entry<String, Object> entry = it.next(); writeAttribute(out, entry.getKey(), entry.getValue()); @@ -345,7 +339,7 @@ } // childs components - for (Iterator<UIComponent> childIter = component.getChildren().iterator(); childIter.hasNext(); ) { + for (Iterator<UIComponent> childIter = component.getChildren().iterator(); childIter.hasNext();) { UIComponent child = childIter.next(); writeComponent(context, out, child, null); @@ -402,7 +396,7 @@ out.print("<table><caption>"); out.print(caption); out.println("</caption><thead><tr><th style=\"width: 10%; \">Name</th><th style=\"width: 90%; \">" - + "Value</th></tr></thead><tbody>"); + + "Value</th></tr></thead><tbody>"); boolean written = false; @@ -411,7 +405,7 @@ Map.Entry<K, V> entry = null; String key = null; - for (Iterator<Entry<K, V>> itr = map.entrySet().iterator(); itr.hasNext(); ) { + for (Iterator<Entry<K, V>> itr = map.entrySet().iterator(); itr.hasNext();) { entry = itr.next(); key = entry.getKey().toString(); @@ -463,14 +457,14 @@ */ private void writeScript(PrintWriter out) { out.println("<script type='text/javascript' language='javascript'>\n" + "function toggle(id) {\n" - + "var style = document.getElementById(id).style;\n" + "if ('block' == style.display) {\n" - + "style.display = 'none';\n" - + "document.getElementById(id+'_collapsed').style.display = 'inline';\n" - + "document.getElementById(id+'_expanded').style.display = 'none';\n" + "} else {\n" - + "style.display = 'block';\n" - + "document.getElementById(id+'_collapsed').style.display = 'none';\n" - + "document.getElementById(id+'_expanded').style.display = 'inline';\n" + "}\n" + "}\n\n" - + "</script>"); + + "var style = document.getElementById(id).style;\n" + "if ('block' == style.display) {\n" + + "style.display = 'none';\n" + + "document.getElementById(id+'_collapsed').style.display = 'inline';\n" + + "document.getElementById(id+'_expanded').style.display = 'none';\n" + "} else {\n" + + "style.display = 'block';\n" + + "document.getElementById(id+'_collapsed').style.display = 'none';\n" + + "document.getElementById(id+'_expanded').style.display = 'inline';\n" + "}\n" + "}\n\n" + + "</script>"); } /** @@ -479,29 +473,29 @@ private void writeStyleSheet(PrintWriter out) { out.println( "<style type=\'text/css\' >\n" - + "div.a4j_debug, .a4j_debug span, .a4j_debug td, .a4j_debug th, .a4j_debug caption { font-family: " - + "Verdana, Arial, Sans-Serif; }\n" + ".a4j_debug li{\n list-style-position : inside;\n}\n\n" - + ".a4j_debug li, .a4j_debug pre { padding: 0; margin: 0; font-size : 12px;}\n" - + ".a4j_debug ul { padding: 0 0 10 0; margin: 0; font-size : 12px;}\n" - + ".a4j_debug h1 { color: #fff; background-color :#a00; font-size :17px; padding :7px 10px 10px 10px}\n" - + "h2.a4j_debug , h2.a4j_debug span { color: #a00; font-size : 17px; padding : 0px 0px 0px 10px;}\n" - + "h2.a4j_debug a { text-decoration: none; color: #a00; }\n" - + ".exception { color: #000; font-size : 14px; padding : 0px 0px 0px 10px;}\n" - + ".grayBox { padding: 8px; margin: 10px 0; border: 1px solid #CCC; background-color:#f9f9f9; " - + "font-size:12px;}\n" + "#error { color: #900; font-weight: bold; font-size: medium; }\n" - + "#trace, #tree, #vars { display: none; }\n" - + ".a4j_debug code { font-size: medium; font-size : 14px;}\n" + "#tree dl { color: #666; }\n" - + "#tree dd { font-size : 12px;}\n" - + "#tree dt { border: 1px solid #DDD; padding: 2px 4px 4px 4px; border-left: 2px solid #a00; " - + "font-family: \"Courier New\", Courier, mono; font-size: small; font-size : 12px; margin-top: 2px; " - + "margin-bottom: 2px;}\n" + ".uicText { color: #999; }\n" - + ".a4j_debug table { border: 1px solid #CCC; border-collapse: collapse; border-spacing: 0px; width: " - + "100%; text-align: left; }\n" - + ".a4j_debug td { border: 1px solid #CCC; font-size : 12px; vertical-align : top}\n" - + ".a4j_debug thead tr th { padding: 2px; color: #030; background-color: #F9F9F9; font-size : 12px;}\n" - + ".a4j_debug tbody tr td { padding: 10px 6px; }\n" - + ".a4j_debug table caption { text-align:left; padding: 20 0 5 0; font-size:12px; font-weight:bold;}\n" - + ".value {font-size : 12px; font-weight : bold;}\n" + "div.log { width: 100%; height: 400px;}\n" - + "iframe.log { width: 99%; height: 99%; border: 1px solid #CCC;}\n" + "</style>"); + + "div.a4j_debug, .a4j_debug span, .a4j_debug td, .a4j_debug th, .a4j_debug caption { font-family: " + + "Verdana, Arial, Sans-Serif; }\n" + ".a4j_debug li{\n list-style-position : inside;\n}\n\n" + + ".a4j_debug li, .a4j_debug pre { padding: 0; margin: 0; font-size : 12px;}\n" + + ".a4j_debug ul { padding: 0 0 10 0; margin: 0; font-size : 12px;}\n" + + ".a4j_debug h1 { color: #fff; background-color :#a00; font-size :17px; padding :7px 10px 10px 10px}\n" + + "h2.a4j_debug , h2.a4j_debug span { color: #a00; font-size : 17px; padding : 0px 0px 0px 10px;}\n" + + "h2.a4j_debug a { text-decoration: none; color: #a00; }\n" + + ".exception { color: #000; font-size : 14px; padding : 0px 0px 0px 10px;}\n" + + ".grayBox { padding: 8px; margin: 10px 0; border: 1px solid #CCC; background-color:#f9f9f9; " + + "font-size:12px;}\n" + "#error { color: #900; font-weight: bold; font-size: medium; }\n" + + "#trace, #tree, #vars { display: none; }\n" + + ".a4j_debug code { font-size: medium; font-size : 14px;}\n" + "#tree dl { color: #666; }\n" + + "#tree dd { font-size : 12px;}\n" + + "#tree dt { border: 1px solid #DDD; padding: 2px 4px 4px 4px; border-left: 2px solid #a00; " + + "font-family: \"Courier New\", Courier, mono; font-size: small; font-size : 12px; margin-top: 2px; " + + "margin-bottom: 2px;}\n" + ".uicText { color: #999; }\n" + + ".a4j_debug table { border: 1px solid #CCC; border-collapse: collapse; border-spacing: 0px; width: " + + "100%; text-align: left; }\n" + + ".a4j_debug td { border: 1px solid #CCC; font-size : 12px; vertical-align : top}\n" + + ".a4j_debug thead tr th { padding: 2px; color: #030; background-color: #F9F9F9; font-size : 12px;}\n" + + ".a4j_debug tbody tr td { padding: 10px 6px; }\n" + + ".a4j_debug table caption { text-align:left; padding: 20 0 5 0; font-size:12px; font-weight:bold;}\n" + + ".value {font-size : 12px; font-weight : bold;}\n" + "div.log { width: 100%; height: 400px;}\n" + + "iframe.log { width: 99%; height: 99%; border: 1px solid #CCC;}\n" + "</style>"); } } Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/FacesErrorStateHolder.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/FacesErrorStateHolder.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/FacesErrorStateHolder.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,17 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.application; import javax.faces.component.UIViewRoot; /** * Hold detailed faces state for Error output. + * * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:11 $ - * */ public interface FacesErrorStateHolder { Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/package-info.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/package-info.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/package-info.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,4 +1,3 @@ - /** * Classes required to implement and support application-level logic */ Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/package.html =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/package.html 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/application/package.html 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,8 +1,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> -<meta http-equiv="Content-Type" content="text/html; charset=Cp1251"/> -<title>Package description for AJAX components</title> + <meta http-equiv="Content-Type" content="text/html; charset=Cp1251"/> + <title>Package description for AJAX components</title> </head> <body> </body> Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -14,15 +14,11 @@ * limitations under the License. */ - - package org.ajax4jsf.cache; import org.ajax4jsf.cache.lru.LRUMapCacheFactory; import org.ajax4jsf.resource.util.URLToStreamHelper; - import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; import java.io.BufferedReader; @@ -31,7 +27,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; - import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -95,7 +90,7 @@ if (configuredFactoryName != null) { LOG.info("Configured to use [{0}] cache factory", configuredFactoryName); - factories = new String[] {configuredFactoryName}; + factories = new String[]{configuredFactoryName}; } else { factories = DEFAULT_FACTORIES_CHAIN; } @@ -195,7 +190,7 @@ private static String searchInJcacheProperties(String factoryId) { try { String configFile = System.getProperty("java.home") + File.separator + "lib" + File.separator - + "jcache.properties"; + + "jcache.properties"; File file = new File(configFile); if (file.exists()) { Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCache.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCache.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCache.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,4 +1,3 @@ - /** * */ Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,11 +1,9 @@ - /** * */ package org.ajax4jsf.cache; import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; import java.util.Map; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCache.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCache.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCache.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,4 +1,3 @@ - /** * */ @@ -8,16 +7,15 @@ import org.jboss.cache.Fqn; import org.jboss.cache.eviction.ExpirationAlgorithmConfig; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; import javax.transaction.RollbackException; import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.Transaction; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * @author Nick Belaevski Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCacheFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCacheFactory.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCacheFactory.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,11 +1,9 @@ - /** * */ package org.ajax4jsf.cache; import org.ajax4jsf.resource.util.URLToStreamHelper; - import org.jboss.cache.Cache; import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.Fqn; @@ -14,15 +12,12 @@ import org.jboss.cache.config.EvictionRegionConfig; import org.jboss.cache.eviction.ExpirationAlgorithmConfig; +import javax.faces.FacesException; import java.io.IOException; import java.io.InputStream; - import java.net.URL; - import java.util.Map; -import javax.faces.FacesException; - /** * @author Nick Belaevski * @since 4.0 Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCache.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.cache; import com.opensymphony.oscache.base.EntryRefreshPolicy; @@ -31,8 +29,7 @@ /** * @author Nick - mailto:nbelaevski@exadel.com - * created 01.05.2007 - * + * created 01.05.2007 */ public class OSCacheCache implements Cache { private com.opensymphony.oscache.base.Cache cache; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,23 +19,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.cache; import com.opensymphony.oscache.general.GeneralCacheAdministrator; - import org.ajax4jsf.resource.util.URLToStreamHelper; - import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; import java.io.IOException; import java.io.InputStream; - import java.net.URL; - import java.util.Map; import java.util.Properties; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/ServletContextInitMap.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/ServletContextInitMap.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/ServletContextInitMap.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,10 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.cache; +import javax.servlet.ServletContext; import java.util.AbstractMap; import java.util.AbstractSet; import java.util.Enumeration; @@ -30,8 +29,6 @@ import java.util.Map; import java.util.Set; -import javax.servlet.ServletContext; - /** * @author Nick Belaevski - nbelaevski(a)exadel.com * created 02.05.2007 @@ -90,7 +87,6 @@ } } - private class MyIterator implements Iterator<Map.Entry<String, String>> { @SuppressWarnings("unchecked") private Enumeration<String> initNames = servletContext.getInitParameterNames(); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/ServletContextInitMapEntry.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/ServletContextInitMapEntry.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/ServletContextInitMapEntry.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.cache; import java.util.Map; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/CacheEntry.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/CacheEntry.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/CacheEntry.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -17,10 +17,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ + */ - - package org.ajax4jsf.cache.lru; import java.util.Date; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/CacheMap.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/CacheMap.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/CacheMap.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -17,10 +17,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ + */ - - package org.ajax4jsf.cache.lru; import org.ajax4jsf.util.LRUMap; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCache.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCache.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCache.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -17,10 +17,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ + */ - - package org.ajax4jsf.cache.lru; import org.ajax4jsf.cache.Cache; @@ -62,7 +60,8 @@ this.map.put(key, cacheEntry); } - public void start() {} + public void start() { + } public void stop() { this.map.clear(); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCacheFactory.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCacheFactory.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCacheFactory.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,15 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.cache.lru; import org.ajax4jsf.cache.Cache; import org.ajax4jsf.cache.CacheFactory; - import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; import java.util.Map; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/package-info.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/package-info.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/cache/package-info.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,4 +1,3 @@ - /** * Cache implementations */ Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; import org.ajax4jsf.context.AjaxContext; @@ -40,7 +38,6 @@ /** * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.3 $ $Date: 2007/02/06 16:23:21 $ - * */ public abstract class AjaxActionComponent extends UICommand implements AjaxComponent, AjaxSource { public static final String FOCUS_DATA_ID = "_A4J.AJAX.focus"; @@ -94,13 +91,13 @@ /** * Template method with old signature, for backward compability. */ - protected void setupReRender() {} + protected void setupReRender() { + } /** * Template methods for fill set of resions to render in subclasses. * - * @param facesContext - * TODO + * @param facesContext TODO */ protected void setupReRender(FacesContext facesContext) { AjaxContext.getCurrentInstance(facesContext).addRegionsFromComponent(this); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxInputComponent.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; import org.ajax4jsf.context.AjaxContext; @@ -36,9 +34,9 @@ /** * Base class for all AJAX-enabled Input components + * * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.2 $ $Date: 2007/02/06 16:23:21 $ - * */ public abstract class AjaxInputComponent extends UIInput implements AjaxComponent, EditableValueHolder { Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxLoadBundleComponent.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxLoadBundleComponent.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxLoadBundleComponent.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,13 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; /** * @author mikalaj - * - * Marker interface for UILoadBundle component + * <p/> + * Marker interface for UILoadBundle component */ -public interface AjaxLoadBundleComponent {} +public interface AjaxLoadBundleComponent { +} Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,21 +19,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; import org.ajax4jsf.Messages; import org.ajax4jsf.event.AjaxEvent; - import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; import javax.el.ELContext; import javax.el.MethodExpression; import javax.el.ValueExpression; - import javax.faces.component.StateHolder; import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; @@ -43,22 +38,21 @@ /** * @author shura - * - * Brige design pattern for any UIComponent append support ajax partial rendering. For AJAX request, apply - * ActionListeniers, construct list of components for render - by direct setting - * from Listenier or Components bean methods. - * For use in concrete component, in constructor must be instantiated to class field as : - * private AjaxRegionBrige brige; - * .... - * Constructor(){ - * brige = new AjaxRegionBrige(this); - * }. - * And delegate all brige public methods. + * <p/> + * Brige design pattern for any UIComponent append support ajax partial rendering. For AJAX request, apply + * ActionListeniers, construct list of components for render - by direct setting + * from Listenier or Components bean methods. + * For use in concrete component, in constructor must be instantiated to class field as : + * private AjaxRegionBrige brige; + * .... + * Constructor(){ + * brige = new AjaxRegionBrige(this); + * }. + * And delegate all brige public methods. * @See <code>AJAXConatiner</code> interface , or from configuration - by - * <ajax:forupdate>jsp tag's of this or nested components, or from all - * <code>UIForm</code> components instances with <code>isSubmitted</code> - * set to <code>true</code> - * + * <ajax:forupdate>jsp tag's of this or nested components, or from all + * <code>UIForm</code> components instances with <code>isSubmitted</code> + * set to <code>true</code> */ public class AjaxRegionBrige implements AjaxContainerBase, StateHolder { @@ -181,7 +175,7 @@ } /** - * @param submitted The submitted to set. + * @param submitted The submitted to set. */ public void setSubmitted(boolean submitted) { @@ -201,17 +195,12 @@ * {@link org.ajax4jsf.event.AjaxListener}registered on the {@link javax.faces.application.Application}. * </p> * - * @param event - * {@link FacesEvent}to be broadcast - * - * @exception AbortProcessingException - * Signal the JavaServer Faces implementation that no further - * processing on the current event should be performed - * @exception IllegalArgumentException - * if the implementation class of this {@link FacesEvent}is - * not supported by this component - * @exception NullPointerException - * if <code>event</code> is <code>null</code> + * @param event {@link FacesEvent}to be broadcast + * @throws AbortProcessingException Signal the JavaServer Faces implementation that no further + * processing on the current event should be performed + * @throws IllegalArgumentException if the implementation class of this {@link FacesEvent}is + * not supported by this component + * @throws NullPointerException if <code>event</code> is <code>null</code> */ public void broadcast(FacesEvent event) throws AbortProcessingException { @@ -229,7 +218,7 @@ FacesContext context = FacesContext.getCurrentInstance(); ELContext elContext = context.getELContext(); - mb.invoke(elContext, new Object[] {event}); + mb.invoke(elContext, new Object[]{event}); } } } Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; import org.ajax4jsf.Messages; @@ -30,21 +28,10 @@ import org.ajax4jsf.event.AjaxListener; import org.ajax4jsf.event.EventsQueue; import org.ajax4jsf.renderkit.AjaxContainerRenderer; - import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; -import java.io.IOException; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Set; - import javax.el.MethodExpression; - import javax.faces.FacesException; import javax.faces.FactoryFinder; import javax.faces.component.ContextCallback; @@ -60,6 +47,12 @@ import javax.faces.lifecycle.LifecycleFactory; import javax.faces.render.Renderer; import javax.faces.webapp.FacesServlet; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Set; /** * Custom ViewRoot for support render parts of tree for Ajax requests. Main @@ -70,7 +63,6 @@ * * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.4 $ $Date: 2007/02/28 17:01:01 $ - * */ public class AjaxViewRoot extends UIViewRoot implements AjaxContainer { public static final String ROOT_ID = "_viewRoot"; @@ -86,18 +78,23 @@ public void invokeContextCallback(FacesContext context, UIComponent component) { component.processValidators(context); } - public void invokeRoot(FacesContext context) {} + + public void invokeRoot(FacesContext context) { + } }; private InvokerCallback updatesInvoker = new InvokerCallback() { public void invokeContextCallback(FacesContext context, UIComponent component) { component.processUpdates(context); } - public void invokeRoot(FacesContext context) {} + + public void invokeRoot(FacesContext context) { + } }; private InvokerCallback decodeInvoker = new InvokerCallback() { public void invokeContextCallback(FacesContext context, UIComponent component) { component.processDecodes(context); } + public void invokeRoot(FacesContext context) { decode(context); } @@ -156,6 +153,7 @@ // public String getId() { // return ROOT_ID; // } + public String getRendererType() { return COMPONENT_FAMILY; } @@ -227,7 +225,7 @@ if (null != listenerExpression) { event = createPhaseEvent(context, phase); - listenerExpression.invoke(context.getELContext(), new Object[] {event}); + listenerExpression.invoke(context.getELContext(), new Object[]{event}); } if (null != this.phaseListeners) { @@ -277,8 +275,8 @@ String submittedRegionClientId = ajaxContext.getSubmittedRegionClientId(); if (ajaxContext.isAjaxRequest() && (submittedRegionClientId != null) - && !submittedRegionClientId.equals(ROOT_ID) - && !submittedRegionClientId.equals(getClientId(context))) { + && !submittedRegionClientId.equals(ROOT_ID) + && !submittedRegionClientId.equals(getClientId(context))) { invokeOnComponent(context, submittedRegionClientId, new InvokerCallbackWrapper(callback)); } else { @@ -295,7 +293,7 @@ String ajaxSingleClientId = ajaxContext.getAjaxSingleClientId(); if (null == ajaxSingleClientId) { - for (Iterator<UIComponent> iter = getFacetsAndChildren(); iter.hasNext(); ) { + for (Iterator<UIComponent> iter = getFacetsAndChildren(); iter.hasNext();) { callback.invokeContextCallback(context, iter.next()); } } else { @@ -346,7 +344,7 @@ * * @param context * @param phaseId - - * phase, for which events must be processed. + * phase, for which events must be processed. */ public void broadcastEvents(FacesContext context, PhaseId phaseId) { EventsQueue[] eWebXmlvents = getEvents(); @@ -378,8 +376,7 @@ } /** - * @param context - * TODO + * @param context TODO * @param phaseEventsQueue * @param havePhaseEvents */ @@ -420,7 +417,6 @@ * tree ( since RI hold component tree in session ). * * @param phase - * * @return */ protected EventsQueue getEventsQueue(PhaseId phase) { @@ -563,7 +559,7 @@ boolean invoked = false; if ((submittedRegionClientId != null) && !submittedRegionClientId.equals(ROOT_ID) - && !submittedRegionClientId.equals(getClientId(context))) { + && !submittedRegionClientId.equals(getClientId(context))) { invoked = invokeOnComponent(context, submittedRegionClientId, ajaxInvoker); } Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/ContextCallbackWrapper.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/ContextCallbackWrapper.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/ContextCallbackWrapper.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; import javax.faces.component.ContextCallback; @@ -29,7 +27,6 @@ /** * @author Anton Belevich - * */ public class ContextCallbackWrapper implements ContextCallback { ContextCallback callback; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/EventValueBinding.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/EventValueBinding.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/EventValueBinding.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; import org.ajax4jsf.Messages; @@ -45,20 +43,21 @@ private static final long serialVersionUID = -6583167387542332290L; /** - * current update component. transient since saved state as component. + * current update component. transient since saved state as component. */ private transient AjaxSupport component = null; private String componentId; /** - * Default constructor for restoreState. + * Default constructor for restoreState. */ - public EventValueBinding() {} + public EventValueBinding() { + } /** - * Constructor for build from AjaxComponent. + * Constructor for build from AjaxComponent. * - * @param update + * @param update */ public EventValueBinding(AjaxSupport update) { component = update; @@ -105,8 +104,7 @@ } /** - * @param component - * the component to set + * @param component the component to set */ public void setComponent(AjaxSupport component) { this.component = component; @@ -133,7 +131,7 @@ @Override public void setValue(FacesContext facesContext, Object value) throws EvaluationException, PropertyNotFoundException { - + throw new EvaluationException(Messages.getMessage(Messages.EVENT_IS_READ_ONLY)); } Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/EventValueExpression.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/EventValueExpression.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/EventValueExpression.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; import org.ajax4jsf.Messages; @@ -29,14 +27,12 @@ import javax.el.ELContext; import javax.el.ELException; import javax.el.ValueExpression; - import javax.faces.component.StateHolder; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; /** * @author Maksim Kaszynski - * */ public class EventValueExpression extends ValueExpression implements StateHolder { private static final long serialVersionUID = -6583167387542332290L; @@ -189,14 +185,14 @@ } /** - * @param component - * the component to set + * @param component the component to set */ public void setComponent(AjaxSupport component) { this.component = component; } - public void setTransient(boolean newTransientValue) {} + public void setTransient(boolean newTransientValue) { + } /* * (non-Javadoc) Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/InvokerCallbackWrapper.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/InvokerCallbackWrapper.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/InvokerCallbackWrapper.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; import org.ajax4jsf.context.InvokerCallback; @@ -29,7 +27,6 @@ /** * @author Anton Belevich - * */ public class InvokerCallbackWrapper extends ContextCallbackWrapper implements InvokerCallback { public InvokerCallbackWrapper(InvokerCallback invokerCallback) { Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,16 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.component; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; import java.util.LinkedHashMap; import java.util.Map; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; - /** * @author Nick Belaevski * @since 3.3.0 @@ -38,7 +35,8 @@ private boolean shouldCreateDefaultGlobalQueue = false; private Map<String, Object> queuesData = new LinkedHashMap<String, Object>(); - private QueueRegistry() {} + private QueueRegistry() { + } public static QueueRegistry getInstance(FacesContext context) { ExternalContext externalContext = context.getExternalContext(); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/package-info.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/package-info.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/component/package-info.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,4 +1,3 @@ - /** * Base APIs and support classes of AJAX-enabled components */ Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FacesConfig.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FacesConfig.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FacesConfig.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,38 +19,30 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; +import javax.faces.FacesException; +import javax.faces.webapp.FacesServlet; +import javax.servlet.ServletContext; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; import java.io.IOException; import java.io.InputStream; - import java.net.URL; import java.net.URLConnection; - import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.faces.FacesException; -import javax.faces.webapp.FacesServlet; - -import javax.servlet.ServletContext; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - /** * @author asmirnov - * */ public class FacesConfig { private static final String FACES_CONFIG_CLASS_PATH = "META-INF/faces-config.xml"; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FacesConfigHandler.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FacesConfigHandler.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FacesConfigHandler.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; import org.xml.sax.Attributes; @@ -31,12 +29,10 @@ import org.xml.sax.helpers.DefaultHandler; import java.io.StringReader; - import java.util.List; /** * @author asmirnov - * */ public class FacesConfigHandler extends DefaultHandler { private static final String APPLICATION_ELEMENT = "application"; @@ -69,7 +65,6 @@ /** * @author asmirnov - * */ private class ApplicationExtensionHandler extends FacesConfigElementHandler { public ApplicationExtensionHandler(ContentHandler parent) { @@ -86,10 +81,8 @@ } } - /** * @author asmirnov - * */ private class ApplicationHandler extends FacesConfigElementHandler { public ApplicationHandler() { @@ -106,10 +99,8 @@ } } - /** * @author asmirnov - * */ private class ExcludedAttributeHandler extends StringContentHandler { public ExcludedAttributeHandler(ContentHandler parent) { @@ -122,10 +113,8 @@ } } - /** * @author asmirnov - * */ private class ExcludedAttributesHandler extends FacesConfigElementHandler { public ExcludedAttributesHandler(ContentHandler parent) { @@ -142,7 +131,6 @@ } } - private abstract class FacesConfigElementHandler extends StateHandler { public FacesConfigElementHandler(ContentHandler parentHandler) { super(parentHandler); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FilterBean.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FilterBean.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FilterBean.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; class FilterBean { Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FilterMapping.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FilterMapping.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FilterMapping.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; /** * @author asmirnov - * */ class FilterMapping { private final String filterName; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,25 +1,21 @@ package org.ajax4jsf.config; import org.ajax4jsf.util.ELUtils; - import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; -import java.util.EnumMap; -import java.util.Map; -import java.util.regex.Pattern; - import javax.el.ExpressionFactory; import javax.el.ValueExpression; - import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; +import java.util.EnumMap; +import java.util.Map; +import java.util.regex.Pattern; /** * @author Anton Belevich * @since 4.0 - * framework configuration class + * framework configuration class */ public final class FrameworkConfiguration { private static final Logger LOGGER = RichfacesLogger.CONFIG.getLogger(); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ParsingException.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ParsingException.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ParsingException.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; /** * @author asmirnov - * */ public class ParsingException extends Exception { Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ServletBean.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ServletBean.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ServletBean.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; class ServletBean { Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ServletMapping.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ServletMapping.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/ServletMapping.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; class ServletMapping { Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/StateHandler.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/StateHandler.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/StateHandler.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; import org.xml.sax.Attributes; @@ -34,7 +32,6 @@ /** * @author asmirnov - * */ public abstract class StateHandler extends DefaultHandler { private int depth = 0; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/StringContentHandler.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/StringContentHandler.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/StringContentHandler.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; import org.xml.sax.ContentHandler; @@ -29,7 +27,6 @@ /** * @author asmirnov - * */ class StringContentHandler extends StateHandler { private final XMLReader reader; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/WebXMLParser.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/WebXMLParser.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/WebXMLParser.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,35 +19,30 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; -import java.io.IOException; -import java.io.InputStream; - -import java.util.ArrayList; -import java.util.List; - import javax.servlet.ServletContext; import javax.servlet.ServletException; - import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; /** * @author asmirnov - * */ @Deprecated public class WebXMLParser { - static final String FACES_SERVLET_CLASS = "javax.faces.webapp.FacesServlet"; public static final String WEB_XML = "/WEB-INF/web.xml"; + static final String FACES_SERVLET_CLASS = "javax.faces.webapp.FacesServlet"; + private String facesFilterPrefix = null; /** Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/WebappHandler.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/WebappHandler.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/config/WebappHandler.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.config; import org.xml.sax.Attributes; @@ -31,13 +29,11 @@ import org.xml.sax.helpers.DefaultHandler; import java.io.StringReader; - import java.util.ArrayList; import java.util.List; /** * @author asmirnov - * */ public class WebappHandler extends DefaultHandler { static final String FILTER_CLASS_ELEMENT = "filter-class"; @@ -98,7 +94,6 @@ /** * @author asmirnov - * */ public class FilterHandler extends WebappElementHandler { private StringBuilder filterName = new StringBuilder(); @@ -129,10 +124,8 @@ } } - /** * @author asmirnov - * */ public class FilterMappingHandler extends WebappElementHandler { private StringBuilder servletName = new StringBuilder(); @@ -161,11 +154,10 @@ @Override protected void endLastElement() { filterMappings.add(new FilterMapping(filterName.toString().trim(), servletName.toString().trim(), - urlPattern.toString().trim())); + urlPattern.toString().trim())); } } - final class ServletHandler extends WebappElementHandler { private StringBuilder servletName = new StringBuilder(); private StringBuilder servletClass = new StringBuilder(); @@ -193,7 +185,6 @@ } } - final class ServletMappingHandler extends WebappElementHandler { private StringBuilder servletName = new StringBuilder(); private StringBuilder urlPattern = new StringBuilder(); @@ -221,7 +212,6 @@ } } - private abstract class WebappElementHandler extends StateHandler { public WebappElementHandler(ContentHandler parentHandler) { super(parentHandler); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,21 +19,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.context; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Locale; -import java.util.Map; -import java.util.Set; +import org.ajax4jsf.Messages; +import org.ajax4jsf.application.AjaxViewHandler; +import org.ajax4jsf.renderkit.AjaxContainerRenderer; +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.renderkit.RendererUtils; +import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.log.RichfacesLogger; +import org.slf4j.Logger; import javax.faces.FacesException; import javax.faces.FactoryFinder; @@ -49,22 +44,23 @@ import javax.faces.render.RenderKitFactory; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.Locale; +import java.util.Map; +import java.util.Set; -import org.ajax4jsf.Messages; -import org.ajax4jsf.application.AjaxViewHandler; -import org.ajax4jsf.renderkit.AjaxContainerRenderer; -import org.ajax4jsf.renderkit.AjaxRendererUtils; -import org.ajax4jsf.renderkit.RendererUtils; -import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.richfaces.log.RichfacesLogger; -import org.slf4j.Logger; - /** * This class incapsulated * * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.7 $ $Date: 2007/02/08 19:07:16 $ - * */ public class AjaxContextImpl extends AjaxContext { public static final String SERVLET_ERROR_EXCEPTION_ATTRIBUTE = "javax.servlet.error.exception"; @@ -123,6 +119,7 @@ /** * @param context * @throws javax.faces.event.AbortProcessingException + * */ public void renderAjax(FacesContext context) throws FacesException { if (LOG.isDebugEnabled()) { @@ -182,7 +179,7 @@ // Save tree state. } catch (IOException e) { throw new FacesException(Messages.getMessage(Messages.RENDERING_AJAX_REGION_ERROR, - getSubmittedRegionClientId()), e); + getSubmittedRegionClientId()), e); } finally { context.responseComplete(); @@ -244,7 +241,7 @@ if (bufWriter.getBuffer().length() > 0) { context.getExternalContext().getRequestMap().put(AjaxViewHandler.SERIALIZED_STATE_KEY, - bufWriter.toString()); + bufWriter.toString()); } context.setResponseWriter(writer); @@ -272,8 +269,7 @@ } /** - * @param ajaxRequest - * The ajaxRequest to set. + * @param ajaxRequest The ajaxRequest to set. */ public void setAjaxRequest(boolean ajaxRequest) { this.ajaxRequest = ajaxRequest; @@ -321,7 +317,7 @@ } if (ajaxRegions != null) { - for (Iterator<String> iter = ajaxRegions.iterator(); iter.hasNext(); ) { + for (Iterator<String> iter = ajaxRegions.iterator(); iter.hasNext();) { String id = iter.next().toString(); ajaxAreasToRender.add(convertId(component, id)); @@ -425,8 +421,7 @@ } /** - * @param submittedClientId - * The submittedClientId to set. + * @param submittedClientId The submittedClientId to set. */ @Override public void setSubmittedRegionClientId(String submittedClientId) { @@ -457,8 +452,7 @@ } /** - * @param selfRender - * The selfRender to set. + * @param selfRender The selfRender to set. */ public void setSelfRender(boolean selfRender) { this.selfRender = selfRender; @@ -472,8 +466,7 @@ } /** - * @param viewIdHolder - * the vievIdHolder to set + * @param viewIdHolder the vievIdHolder to set */ public void setViewIdHolder(ViewIdHolder viewIdHolder) { this.viewIdHolder = viewIdHolder; @@ -487,8 +480,7 @@ } /** - * @param responseData - * the responseData to set + * @param responseData the responseData to set */ public void setResponseData(Object responseData) { this.responseDataMap.put(RESPONSE_DATA_KEY, responseData); @@ -504,11 +496,9 @@ /** * Gives back the writer of a Response object. * - * @param extContext - * The external context. + * @param extContext The external context. * @return The writer of the response. - * @throws FacesException - * If the response object has no getWriter() method. + * @throws FacesException If the response object has no getWriter() method. */ protected PrintWriter getWriter(ExternalContext extContext) throws FacesException { PrintWriter writer = null; @@ -554,11 +544,11 @@ // HACK - check for a Jboss PortletBridge implementation. If present, append DirectLink attribute to url. // TODO - how to detect portlet application ? if (null != context.getExternalContext().getApplicationMap().get( - "org.jboss.portletbridge.application.PortletStateHolder")) { + "org.jboss.portletbridge.application.PortletStateHolder")) { // Mark Ajax action url as transparent with jsf-portlet bridge. actionURL = actionURL + ((actionURL.lastIndexOf('?') > 0) ? "&" : "?") - + "javax.portlet.faces.DirectLink=true"; + + "javax.portlet.faces.DirectLink=true"; } return context.getExternalContext().encodeActionURL(actionURL); @@ -579,26 +569,25 @@ } /** - * @param oncomplete - * the oncomplete to set + * @param oncomplete the oncomplete to set */ public void setOncomplete(Object oncomplete) { this.oncomplete = oncomplete; } - + /* (non-Javadoc) - * @see org.ajax4jsf.context.AjaxContext#getOnbeforedomupdate() - */ + * @see org.ajax4jsf.context.AjaxContext#getOnbeforedomupdate() + */ @Override public Object getOnbeforedomupdate() { - return onbeforedomupdate; + return onbeforedomupdate; } - + /* (non-Javadoc) - * @see org.ajax4jsf.context.AjaxContext#setOnbeforedomupdate(java.lang.Object) - */ + * @see org.ajax4jsf.context.AjaxContext#setOnbeforedomupdate(java.lang.Object) + */ @Override public void setOnbeforedomupdate(Object onbeforedomupdateFunction) { - this.onbeforedomupdate = onbeforedomupdateFunction; + this.onbeforedomupdate = onbeforedomupdateFunction; } } Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ComponentInvoker.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ComponentInvoker.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ComponentInvoker.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.context; import org.ajax4jsf.component.AjaxViewRoot; @@ -32,13 +30,14 @@ * Interface for call lifecycle methods on component with known clientId * For JSF 1.2 implementation must use invokeOnComponent method, for JSF 1.1 use * simple recursion on view tree ( not compatible with UIData components ) + * * @author shura - * */ public interface ComponentInvoker { /** * Invoke method on active AjaxContainer component, or on viewRoot, if none. + * * @param viewRoot * @param context * @param callback @@ -47,11 +46,12 @@ /** * Recursive call for all children for search component with same clientId as target region + * * @param viewRoot * @param context * @param callback * @param regionId */ public abstract boolean invokeOnComponent(UIComponent root, FacesContext context, InvokerCallback callback, - String regionId); + String regionId); } Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.context; import javax.faces.FacesException; @@ -32,7 +30,6 @@ * single access point to all parameters - simplest for a documentation. * * @author asmirnov - * */ public final class ContextInitParameters { public static final String[] DATATABLE_USES_VIEW_LOCALE = {"org.richfaces.datatableUsesViewLocale"}; @@ -98,7 +95,7 @@ return false; } else { throw new FacesException("Illegal value [" + initParameter + "] for a init parameter +" + paramNames - + ", only logical values 'true' or 'false' is allowed"); + + ", only logical values 'true' or 'false' is allowed"); } } Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/InvokerCallback.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/InvokerCallback.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/InvokerCallback.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.context; import javax.faces.component.ContextCallback; @@ -30,13 +28,14 @@ /** * Callback Interface * for invoke lifecycle methods ( processDecodes, processValidators ... encodeEnd ). + * * @author shura - * */ public interface InvokerCallback extends ContextCallback { /** * Process method on given component. + * * @param context * @param component */ @@ -44,6 +43,7 @@ /** * Default processing on UIVewRoot + * * @param context */ public void invokeRoot(FacesContext context); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ResponseWriterContentHandler.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ResponseWriterContentHandler.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ResponseWriterContentHandler.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,24 +19,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.context; import org.ajax4jsf.renderkit.RendererUtils.HTML; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; import javax.faces.FacesException; - import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -63,7 +58,8 @@ node.appendChild(node.getOwnerDocument().createTextNode(new String(ch, start, length))); } - public void endDocument() throws SAXException {} + public void endDocument() throws SAXException { + } public void endElement(String uri, String localName, String name) throws SAXException { node = node.getParentNode(); @@ -73,7 +69,8 @@ throw new UnsupportedOperationException(); } - public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {} + public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { + } public void processingInstruction(String target, String data) throws SAXException { throw new UnsupportedOperationException(); @@ -87,7 +84,8 @@ throw new UnsupportedOperationException(); } - public void startDocument() throws SAXException {} + public void startDocument() throws SAXException { + } public void startElement(String uri, String localName, String name, Attributes atts) throws SAXException { Document document = node.getOwnerDocument(); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ViewResources.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ViewResources.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/ViewResources.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.context; /** Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/package-info.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/package-info.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/context/package-info.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,4 +1,3 @@ - /** * Classes and interfaces that defines contextual request information */ Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/css/CssCompressor.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/css/CssCompressor.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/css/CssCompressor.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -8,13 +8,10 @@ * This code is a port of Isaac Schlueter's cssmin utility. */ - - package org.ajax4jsf.css; import java.io.IOException; import java.io.Writer; - import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -159,7 +156,7 @@ // Test for AABBCC pattern if (m.group(3).equalsIgnoreCase(m.group(4)) && m.group(5).equalsIgnoreCase(m.group(6)) - && m.group(7).equalsIgnoreCase(m.group(8))) { + && m.group(7).equalsIgnoreCase(m.group(8))) { m.appendReplacement(sb, m.group(1) + m.group(2) + "#" + m.group(3) + m.group(5) + m.group(7)); } else { m.appendReplacement(sb, m.group()); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/css/package-info.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/css/package-info.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/css/package-info.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,4 +1,3 @@ - /** * CSS-processing classes */ Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/el/ELContextWrapper.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/el/ELContextWrapper.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/el/ELContextWrapper.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,20 +19,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.el; -import java.util.Locale; - import javax.el.ELContext; import javax.el.ELResolver; import javax.el.FunctionMapper; import javax.el.VariableMapper; +import java.util.Locale; /** * @author asmirnov - * */ public class ELContextWrapper extends ELContext { private final ELContext parent; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/el/ELResolverWrapper.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/el/ELResolverWrapper.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/el/ELResolverWrapper.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,17 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.el; +import javax.el.ELContext; +import javax.el.ELResolver; import java.beans.FeatureDescriptor; - import java.util.Iterator; -import javax.el.ELContext; -import javax.el.ELResolver; - /** * @author Nick Belaevski * @since 3.3.0 Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxListenerHelper.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxListenerHelper.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxListenerHelper.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,22 +19,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.event; -import java.io.Serializable; - import javax.el.ValueExpression; - import javax.faces.component.StateHolder; import javax.faces.component.UIComponentBase; import javax.faces.context.FacesContext; +import java.io.Serializable; /** * Helper class to keep reference to listener binded as EL-expression. - * @author shura * + * @author shura */ public class AjaxListenerHelper implements AjaxListener, StateHolder { private boolean isTransient = false; @@ -111,12 +107,13 @@ /** * @author shura - * TODO Refactoring + * TODO Refactoring */ private static final class State implements Serializable { private static final long serialVersionUID = 1978277414406556172L; private Object binding; - private State() {} + private State() { + } } } Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,32 +19,26 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.event; import org.ajax4jsf.Messages; import org.ajax4jsf.context.AjaxContext; - import org.richfaces.log.RichfacesLogger; import org.richfaces.skin.SkinFactory; - import org.slf4j.Logger; -import java.util.Map; - import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; +import java.util.Map; /** * Listener for act before Render phase to set RenderKit Id for current skin. * * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.3 $ $Date: 2007/02/06 16:23:19 $ - * */ public class AjaxPhaseListener implements PhaseListener { public static final String AJAX_BEAN_PREFIX = "org.ajax4jsf.ajaxviewbean:"; @@ -110,7 +104,7 @@ if (null != root) { LOG.debug(Messages.getMessage(Messages.ENTER_BEFORE_RENDER_VIEW_PHASE, root.getViewId(), - root.getRenderKitId())); + root.getRenderKitId())); // TODO - create special skin-config.xml configuration. String renderKitId = null; Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxValidationActionEvent.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxValidationActionEvent.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/AjaxValidationActionEvent.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.event; import javax.faces.component.UIComponent; @@ -30,9 +28,9 @@ /** * Action event - always assigned to {@link javax.faces.event.PhaseId#PROCESS_VALIDATIONS} phase * for bypass change phase in components , setPhaseId method do nothing. + * * @author shura (latest modification by $Author: alexsmirnov $) * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:37 $ - * */ public class AjaxValidationActionEvent extends ActionEvent { Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,20 +19,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.event; +import javax.faces.event.FacesEvent; import java.util.AbstractQueue; import java.util.Iterator; import java.util.NoSuchElementException; -import javax.faces.event.FacesEvent; - /** * Very simple implementation of FIFO buffer, to organize JSF events queue. + * * @author asmirnov - * */ public class EventsQueue extends AbstractQueue<FacesEvent> { private int size = 0; @@ -41,6 +38,7 @@ /** * Remove and return first queued event. + * * @return faces event form top of queue * @throws NoSuchElementException , if queue is empty. */ @@ -74,6 +72,7 @@ /** * Add event to queue. + * * @param element * @return TODO */ @@ -114,9 +113,11 @@ public Iterator<FacesEvent> iterator() { return new Iterator<FacesEvent>() { private QueueElement current = first; + public boolean hasNext() { return null != current; } + public FacesEvent next() { if (null == current) { throw new NoSuchElementException(); @@ -128,6 +129,7 @@ return event; } + public void remove() { throw new UnsupportedOperationException(); } Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -19,18 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - - package org.ajax4jsf.event; import org.ajax4jsf.application.AjaxViewHandler; - import org.richfaces.log.RichfacesLogger; - import org.slf4j.Logger; -import java.util.Iterator; - import javax.faces.FactoryFinder; import javax.faces.application.Application; import javax.faces.application.ViewHandler; @@ -40,11 +34,12 @@ import javax.faces.event.PhaseListener; import javax.faces.lifecycle.Lifecycle; import javax.faces.lifecycle.LifecycleFactory; +import java.util.Iterator; /** * One time called listener, for initialize framework at first request. - * @author shura * + * @author shura */ public class InitPhaseListener implements PhaseListener { private static final long serialVersionUID = 8389169240912928686L; @@ -64,7 +59,7 @@ LifecycleFactory factory = (LifecycleFactory) FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY); - for (Iterator<String> iter = factory.getLifecycleIds(); iter.hasNext(); ) { + for (Iterator<String> iter = factory.getLifecycleIds(); iter.hasNext();) { Lifecycle lifecycle = factory.getLifecycle(iter.next()); lifecycle.removePhaseListener(this); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/package-info.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/package-info.java 2009-12-04 20:30:42 UTC (rev 16069) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/event/package-info.java 2009-12-04 20:41:13 UTC (rev 16070) @@ -1,4 +1,3 @@ - /** * Classes implementing event-handling logic of JSF framework */