Author: andyhot
Date: Tue Apr 25 05:06:54 2006
New Revision: 396856
URL: http://svn.apache.org/viewcvs?rev=396856&view=rev
Log:
Fixed deprecation and unused component warnings
Modified:
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc
Modified:
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java?rev=396856&r1=396855&r2=396856&view=diff
==============================================================================
---
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java
(original)
+++
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java
Tue Apr 25 05:06:54 2006
@@ -17,6 +17,7 @@
import java.util.HashMap;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.tapestry.BaseComponent;
@@ -37,10 +38,12 @@
public abstract boolean getDisableAutoProlong();
public abstract String getExpirationFunction();
+
+ public abstract HttpServletRequest getHttpServletRequest();
protected HttpSession getSession()
{
- return
getPage().getRequestCycle().getRequestContext().getSession();
+ return getHttpServletRequest().getSession(false);
}
protected int getSessionTime()
Modified:
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc?rev=396856&r1=396855&r2=396856&view=diff
==============================================================================
---
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc
(original)
+++
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc
Tue Apr 25 05:06:54 2006
@@ -73,10 +73,12 @@
The JavaScript function that will be invoked when the session
expires.
</description>
</parameter>
-
<component id="script" type="Script">
<binding name="script"
value="literal:/org/apache/tapestry/contrib/ajax/Timeout.script"/>
<binding name="symbols" value="scriptSymbols"/>
</component>
+
+ <inject property="httpServletRequest"
object="service:tapestry.globals.HttpServletRequest"/>
+
</component-specification>
Modified:
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc?rev=396856&r1=396855&r2=396856&view=diff
==============================================================================
---
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc
(original)
+++
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc
Tue Apr 25 05:06:54 2006
@@ -43,7 +43,7 @@
<description>The image to use to describe a column sorted in a
descending order.</description>
</parameter>
- <parameter name="class" property="columnClassParameter">
+ <parameter name="class" property="columnClassParameter" cache="false">
<description>The CSS class of the table columns</description>
</parameter>
Modified:
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc?rev=396856&r1=396855&r2=396856&view=diff
==============================================================================
---
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc
(original)
+++
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc
Tue Apr 25 05:06:54 2006
@@ -36,7 +36,7 @@
<description>The tag to use to wrap the values in, 'td' by
default.</description>
</parameter>
- <parameter name="class" property="cellClass">
+ <parameter name="class" property="cellClass" cache="false">
<description>The CSS class of the table values</description>
</parameter>
Modified:
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java?rev=396856&r1=396855&r2=396856&view=diff
==============================================================================
---
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java
(original)
+++
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java
Tue Apr 25 05:06:54 2006
@@ -45,8 +45,6 @@
private Boolean m_objShowNodeImages;
- private Boolean m_objMakeNodeDirect;
-
private INodeRenderFactory m_objNodeRenderFactory;
private IAsset m_objOpenNodeImage;
@@ -70,7 +68,6 @@
m_objNodeState = null;
m_objShowNodeImages = null;
m_objNodeRenderFactory = null;
- m_objMakeNodeDirect = null;
m_CurrentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
}
@@ -543,15 +540,6 @@
ITreeModelSource objSource = (ITreeModelSource)
getPage().getRequestCycle().getAttribute(
ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE);
return objSource;
- }
-
- public boolean getShowConnectImage()
- {
- ITreeRowSource objRowSource = getTreeRowSource();
- int nRowType = objRowSource.getTreeRow().getTreeRowPossiotionType();
- if (TreeRowObject.MIDDLE_ROW == nRowType)
- return true;
- return false;
}
public int[] getForeachConnectImageList()
Modified:
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc?rev=396856&r1=396855&r2=396856&view=diff
==============================================================================
---
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc
(original)
+++
tapestry/tapestry4/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc
Tue Apr 25 05:06:54 2006
@@ -96,9 +96,6 @@
<asset name="_whiteSpaceImage" path="WhiteSpace.gif"/>
- <component id="showConnectImage" type="If">
- <binding name="condition" value="showConnectImage"/>
- </component>
<component id="connectImage" type="Image">
<binding name="image" value="connectImage"/>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
