Author: alexsmirnov Date: 2007-06-29 13:35:11 -0400 (Fri, 29 Jun 2007) New Revision: 1418 Removed: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/JSONDataSerializer.java Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxInputComponent.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java branches/refactor1/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java branches/refactor1/framework/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java Log: continue refactoring. API project restored Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxContextImpl.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -29,7 +29,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -62,7 +61,6 @@ import org.ajax4jsf.framework.skin.Skin; import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.skin.SkinNotFoundException; -import org.ajax4jsf.framework.util.config.WebXml; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxInputComponent.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxInputComponent.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxInputComponent.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -29,9 +29,7 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.ajax4jsf.framework.renderer.AjaxRendererUtils; - /** * Base class for all AJAX-enabled Input components * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxRegionBrige.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -21,12 +21,6 @@ package org.ajax4jsf.framework.ajax; -import java.io.IOException; -import java.util.Collection; -import java.util.Iterator; -import java.util.Set; - -import javax.faces.FacesException; import javax.faces.application.Application; import javax.faces.component.StateHolder; import javax.faces.component.UIComponent; @@ -36,7 +30,6 @@ import javax.faces.el.ValueBinding; import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; -import javax.faces.event.PhaseId; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewHandler.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -26,7 +26,6 @@ import javax.faces.FacesException; import javax.faces.application.ViewHandler; -import javax.faces.component.UIComponent; import javax.faces.component.UIViewRoot; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/AjaxViewRoot.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -24,7 +24,6 @@ import java.io.IOException; import javax.faces.FacesException; -import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/ajax/xmlfilter/BaseFilter.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -39,7 +39,6 @@ import javax.servlet.http.HttpSession; import org.ajax4jsf.ajax.PushEventsCounter; -import org.ajax4jsf.cache.Cache; import org.ajax4jsf.framework.renderer.AjaxContainerRenderer; import org.ajax4jsf.framework.resource.InternetResourceService; import org.ajax4jsf.framework.util.message.Messages; Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AJAXDataSerializer.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -21,8 +21,8 @@ package org.ajax4jsf.framework.renderer; -import net.sf.json.JSONSerializer; + import org.ajax4jsf.framework.util.javascript.ScriptUtils; /** Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxChildrenRenderer.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -30,7 +30,6 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.UILoadBundle; import org.ajax4jsf.framework.ajax.AjaxChildrenEncoder; import org.ajax4jsf.framework.ajax.AjaxOutput; import org.ajax4jsf.framework.util.message.Messages; Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxContainerRenderer.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -22,19 +22,16 @@ package org.ajax4jsf.framework.renderer; import java.io.IOException; -import java.util.Locale; import java.util.Map; import java.util.Set; import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; import org.ajax4jsf.framework.ajax.AjaxContainer; import org.ajax4jsf.framework.ajax.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxEvent; -import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.message.Messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxRendererUtils.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -32,20 +32,17 @@ import java.util.Map; import java.util.Set; -import javax.faces.application.ViewHandler; import javax.faces.component.ActionSource; import javax.faces.component.EditableValueHolder; import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; import javax.faces.component.UIForm; import javax.faces.component.UIParameter; -import javax.faces.component.UIViewRoot; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.ajax.UILoadBundle; import org.ajax4jsf.framework.ajax.AjaxComponent; import org.ajax4jsf.framework.ajax.AjaxContainer; import org.ajax4jsf.framework.ajax.AjaxContext; Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/AjaxViewRootRenderer.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -21,13 +21,6 @@ package org.ajax4jsf.framework.renderer; -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.ajax4jsf.framework.ajax.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxViewRoot; import org.ajax4jsf.framework.resource.InternetResource; Deleted: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/JSONDataSerializer.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/JSONDataSerializer.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/renderer/JSONDataSerializer.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -1,45 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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.framework.renderer; - -import net.sf.json.JSONSerializer; - -/** - * @author shura - * - */ -public class JSONDataSerializer extends AJAXDataSerializer { - - /* (non-Javadoc) - * @see org.ajax4jsf.framework.renderer.AJAXDataSerializer#asString(java.lang.Object) - */ - public String asString(Object data) { - StringBuffer result = new StringBuffer(); - if(null != data){ - result.append("<![CDATA[ "); - result.append(JSONSerializer.toJSON(data)); - result.append(" ]]>"); - } - return result.toString(); - } - -} Modified: branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/ajax4jsf/framework/resource/cached/CachedResourceBuilder.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -27,8 +27,6 @@ import javax.faces.FacesException; import javax.faces.context.FacesContext; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; Modified: branches/refactor1/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/richfaces/json/JSContentHandler.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -22,7 +22,6 @@ package org.richfaces.json; import java.io.IOException; -import java.io.StringWriter; import java.io.Writer; import java.util.Arrays; Modified: branches/refactor1/framework/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java =================================================================== --- branches/refactor1/framework/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java 2007-06-29 17:33:47 UTC (rev 1417) +++ branches/refactor1/framework/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java 2007-06-29 17:35:11 UTC (rev 1418) @@ -8,12 +8,6 @@ import java.util.Iterator; import java.util.List; -import org.antlr.runtime.ANTLRStringStream; -import org.antlr.runtime.CommonTokenStream; -import org.antlr.runtime.RecognitionException; -import org.richfaces.RichMacroDefinitionLexer; -import org.richfaces.RichMacroDefinitionParser; -import org.richfaces.RichMacroDefinitionParser.expression_return; import org.richfaces.json.JSContentHandler; import org.xml.sax.Attributes; import org.xml.sax.SAXException;