You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2006/01/30 16:47:51 UTC
svn commit: r373532 - in /myfaces:
commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/
commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/
core/trunk/api/src/main/java/javax/faces/webapp/
core/trunk/impl/src/main/java/org/apa...
Author: mmarinschek
Date: Mon Jan 30 07:47:34 2006
New Revision: 373532
URL: http://svn.apache.org/viewcvs?rev=373532&view=rev
Log:
jscookmenu working with state-saving = client again
Modified:
myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java
myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormUtils.java
myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java
myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/example1/CalcForm.java
myfaces/tomahawk/trunk/examples/simple/src/main/webapp/jscookmenu.jsp
Modified: myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java?rev=373532&r1=373531&r2=373532&view=diff
==============================================================================
--- myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java (original)
+++ myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java Mon Jan 30 07:47:34 2006
@@ -101,7 +101,7 @@
if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll())
{
- JavascriptUtils.renderAutoScrollHiddenInput(writer);
+ JavascriptUtils.renderAutoScrollHiddenInput(facesContext,writer);
}
if(!facesContext.getApplication().getStateManager().isSavingStateInClient(facesContext))
Modified: myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormUtils.java?rev=373532&r1=373531&r2=373532&view=diff
==============================================================================
--- myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormUtils.java (original)
+++ myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/DummyFormUtils.java Mon Jan 30 07:47:34 2006
@@ -145,6 +145,7 @@
writer.flush();
StateManager stateManager = facesContext.getApplication().getStateManager();
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
if (stateManager.isSavingStateInClient(facesContext))
{
//render state parameters
@@ -163,9 +164,10 @@
if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll())
{
- JavascriptUtils.renderAutoScrollHiddenInput(writer);
+ JavascriptUtils.renderAutoScrollHiddenInput(facesContext,writer);
}
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
if (dummyFormParams != null)
{
HtmlRendererUtils.renderHiddenCommandFormParams(writer, dummyFormParams);
@@ -173,6 +175,7 @@
DUMMY_FORM_NAME,
dummyFormParams, null);
}
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.endElement(HTML.FORM_ELEM);
}
Modified: myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java?rev=373532&r1=373531&r2=373532&view=diff
==============================================================================
--- myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java Mon Jan 30 07:47:34 2006
@@ -17,6 +17,7 @@
import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -260,7 +261,7 @@
{
//TODO/FIXME (manolito): This info should be better stored in the viewroot component and not in the session
Boolean sessionValue = (Boolean)externalContext.getSessionMap().get(JAVASCRIPT_DETECTED);
- return sessionValue == null ? false : sessionValue.booleanValue();
+ return sessionValue != null && sessionValue.booleanValue();
}
@@ -278,12 +279,14 @@
/**
* Renders the hidden form input that is necessary for the autoscroll feature.
*/
- public static void renderAutoScrollHiddenInput(ResponseWriter writer) throws IOException
+ public static void renderAutoScrollHiddenInput(FacesContext facesContext, ResponseWriter writer) throws IOException
{
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.startElement(HTML.INPUT_ELEM, null);
writer.writeAttribute(HTML.TYPE_ATTR, "hidden", null);
writer.writeAttribute(HTML.NAME_ATTR, AUTO_SCROLL_PARAM, null);
writer.endElement(HTML.INPUT_ELEM);
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
}
/**
@@ -292,6 +295,7 @@
public static void renderAutoScrollFunction(FacesContext facesContext,
ResponseWriter writer) throws IOException
{
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
writer.startElement(HTML.SCRIPT_ELEM,null);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
@@ -342,6 +346,7 @@
writer.writeText(script.toString(),null);
writer.endElement(HTML.SCRIPT_ELEM);
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java?rev=373532&r1=373531&r2=373532&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java Mon Jan 30 07:47:34 2006
@@ -653,7 +653,7 @@
StringBuffer retValue = new StringBuffer(UIViewRoot.UNIQUE_ID_PREFIX);
retValue.append("Jsp");
- retValue.append(currentCounter);
+ retValue.append(lCurrentCounter);
lCurrentCounter++;
@@ -688,7 +688,7 @@
componentType);
component.setId(id);
component.setValueBinding("binding", componentBinding);
- recurseFacetsAndChildrenForId(context, component.getFacetsAndChildren(), id + "_", 0);
+ recurseFacetsAndChildrenForId(component.getFacetsAndChildren(), id + "_", 0);
_created = true;
return component;
}
@@ -707,10 +707,10 @@
* because this would affect the order of the created ids upon
* rerendering the page!
*/
- private int recurseFacetsAndChildrenForId(FacesContext context,
- Iterator facetsAndChildren,
- String idPrefix,
- int cnt)
+ private int recurseFacetsAndChildrenForId(
+ Iterator facetsAndChildren,
+ String idPrefix,
+ int cnt)
{
while (facetsAndChildren.hasNext())
{
@@ -720,7 +720,7 @@
++cnt;
comp.setId(idPrefix + cnt);
}
- cnt = recurseFacetsAndChildrenForId(context, comp.getFacetsAndChildren(), idPrefix, cnt);
+ cnt = recurseFacetsAndChildrenForId(comp.getFacetsAndChildren(), idPrefix, cnt);
}
return cnt;
}
@@ -953,10 +953,7 @@
buf.insert(0,intBuf);
- if(component!=null)
- {
- getPathToComponent(component.getParent(),buf);
- }
+ getPathToComponent(component.getParent(),buf);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java?rev=373532&r1=373531&r2=373532&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java Mon Jan 30 07:47:34 2006
@@ -17,7 +17,6 @@
import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlResponseWriterImpl;
import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
import org.apache.myfaces.renderkit.html.util.HtmlBufferResponseWriterWrapper;
import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
@@ -33,6 +32,7 @@
*/
public class MyFacesJavascriptRendererUtil
{
+ private static final String ORG_APACHE_MYFACES_MY_FACES_JAVASCRIPT = "org.apache.myfaces.myFacesJavascript";
/**
* Renders stuff such as the dummy form and the autoscroll javascript, which goes before the closing </body>
@@ -40,7 +40,7 @@
*/
public static void renderCodeBeforeBodyEnd(FacesContext facesContext) throws IOException
{
- Object myFacesJavascript = facesContext.getExternalContext().getRequestMap().get("org.apache.myfaces.myFacesJavascript");
+ Object myFacesJavascript = facesContext.getExternalContext().getRequestMap().get(ORG_APACHE_MYFACES_MY_FACES_JAVASCRIPT);
if (myFacesJavascript != null)
{
@@ -50,6 +50,7 @@
ResponseWriter responseWriter = facesContext.getResponseWriter();
HtmlBufferResponseWriterWrapper writerWrapper = HtmlBufferResponseWriterWrapper
.getInstance(responseWriter);
+ facesContext.setResponseWriter(writerWrapper);
if (DummyFormUtils.isWriteDummyForm(facesContext))
{
@@ -77,6 +78,8 @@
JavascriptUtils.renderAutoScrollFunction(facesContext, writerWrapper);
}
- facesContext.getExternalContext().getRequestMap().put("org.apache.myfaces.myFacesJavascript", "<!-- MYFACES JAVASCRIPT -->\n"+writerWrapper.toString()+"\n");
+ facesContext.setResponseWriter(responseWriter);
+
+ facesContext.getExternalContext().getRequestMap().put(ORG_APACHE_MYFACES_MY_FACES_JAVASCRIPT, "<!-- MYFACES JAVASCRIPT -->\n"+writerWrapper.toString()+"\n");
}
}
Modified: myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/example1/CalcForm.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/example1/CalcForm.java?rev=373532&r1=373531&r2=373532&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/example1/CalcForm.java (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/example1/CalcForm.java Mon Jan 30 07:47:34 2006
@@ -30,9 +30,9 @@
* serial id for serialisation versioning
*/
private static final long serialVersionUID = 1L;
- private BigDecimal number1 = new BigDecimal(0);
- private BigDecimal number2 = new BigDecimal(0);
- private BigDecimal result = new BigDecimal(0);
+ private BigDecimal number1 = new BigDecimal(0d);
+ private BigDecimal number2 = new BigDecimal(0d);
+ private BigDecimal result = new BigDecimal(0d);
public void add()
{
Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/jscookmenu.jsp
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/jscookmenu.jsp?rev=373532&r1=373531&r2=373532&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/jscookmenu.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/jscookmenu.jsp Mon Jan 30 07:47:34 2006
@@ -30,7 +30,6 @@
<f:loadBundle
basename="org.apache.myfaces.examples.resource.example_messages"
var="example_messages" />
- <h:form>
<t:jscookMenu layout="hbr" theme="ThemeOffice" styleLocation="css/jscookmenu">
<%/* Availaible jscookMenu themes: ThemeIE, ThemeMiniBlack, ThemeOffice, ThemePanel
Availaible jscookMenu layout: hbr, hbl, hur, hul, vbr, vbl, vur, vul
@@ -101,8 +100,6 @@
<t:jscookMenu id="menu2" layout="hbr" theme="ThemeOffice" styleLocation="css/jscookmenu">
<t:navigationMenuItems id="navitems" value="#{navigationMenu.panelNavigationItems}" />
</t:jscookMenu>
-
- </h:form>
</f:view>
<%@include file="inc/page_footer.jsp"%>