You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/03/19 06:11:41 UTC
svn commit: r386927 [4/4] - in /jakarta/tapestry/trunk:
contrib/src/java/org/apache/tapestry/contrib/ajax/
contrib/src/java/org/apache/tapestry/contrib/ejb/
contrib/src/java/org/apache/tapestry/contrib/form/
contrib/src/java/org/apache/tapestry/contrib...
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeDataView.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeDataView.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeDataView.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeDataView.java Sat Mar 18 21:11:35 2006
@@ -27,8 +27,10 @@
/**
* @author tsveltin ?
*/
-public abstract class TreeDataView extends BaseComponent implements ITreeRowSource
+public abstract class TreeDataView extends BaseComponent implements
+ ITreeRowSource
{
+
private TreeRowObject m_objTreeRowObject = null;
private int m_nTreeDeep = -1;
@@ -62,25 +64,18 @@
Object objRootUID = objTreeDataModel.getUniqueKey(objRoot, null);
if (getShowRootNode())
{
- walkTree(
- objRoot,
- objRootUID,
- 0,
- objTreeModel,
- writer,
- cycle,
- TreeRowObject.FIRST_LAST_ROW,
- new int[0],
- true);
+ walkTree(objRoot, objRootUID, 0, objTreeModel, writer, cycle,
+ TreeRowObject.FIRST_LAST_ROW, new int[0], true);
}
else
{
boolean bFirst = true;
- int nChildenCount = objTreeModel.getTreeDataModel().getChildCount(objRoot);
+ int nChildenCount = objTreeModel.getTreeDataModel().getChildCount(
+ objRoot);
int nRowPossiotionType = nChildenCount == 1 ? TreeRowObject.FIRST_LAST_ROW
: TreeRowObject.FIRST_ROW;
- for (Iterator iter = objTreeModel.getTreeDataModel().getChildren(objRoot); iter
- .hasNext();)
+ for(Iterator iter = objTreeModel.getTreeDataModel().getChildren(
+ objRoot); iter.hasNext();)
{
Object objChild = iter.next();
Object objChildUID = objTreeModel.getTreeDataModel()
@@ -90,26 +85,18 @@
{
if (bChildLast)
nRowPossiotionType = TreeRowObject.LAST_ROW;
- else
- nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
+ else nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
}
- walkTree(
- objChild,
- objChildUID,
- 0,
- objTreeModel,
- writer,
- cycle,
- nRowPossiotionType,
- new int[0],
- bChildLast);
+ walkTree(objChild, objChildUID, 0, objTreeModel, writer, cycle,
+ nRowPossiotionType, new int[0], bChildLast);
bFirst = false;
}
}
- cycle.setAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE, objExistedTreeModelSource);
+ cycle.setAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE,
+ objExistedTreeModelSource);
}
public void walkTree(Object objParent, Object objParentUID, int nDepth,
@@ -117,44 +104,37 @@
int nRowPossiotionType, int[] arrConnectImages, boolean bLast)
{
m_nTreeDeep = nDepth;
- int nNumberOfChildren = objTreeModel.getTreeDataModel().getChildCount(objParent);
+ int nNumberOfChildren = objTreeModel.getTreeDataModel().getChildCount(
+ objParent);
boolean bLeaf = (nNumberOfChildren == 0) ? true : false;
- m_objTreeRowObject = new TreeRowObject(objParent, objParentUID, nDepth, bLeaf,
- nRowPossiotionType, arrConnectImages);
+ m_objTreeRowObject = new TreeRowObject(objParent, objParentUID, nDepth,
+ bLeaf, nRowPossiotionType, arrConnectImages);
super.renderComponent(writer, cycle);
- boolean bContain = objTreeModel.getTreeStateModel().isUniqueKeyExpanded(objParentUID);
+ boolean bContain = objTreeModel.getTreeStateModel()
+ .isUniqueKeyExpanded(objParentUID);
if (bContain)
{
int[] arrConnectImagesNew = new int[arrConnectImages.length + 1];
- System.arraycopy(arrConnectImages, 0, arrConnectImagesNew, 0, arrConnectImages.length);
+ System.arraycopy(arrConnectImages, 0, arrConnectImagesNew, 0,
+ arrConnectImages.length);
if (bLast)
arrConnectImagesNew[arrConnectImagesNew.length - 1] = TreeRowObject.EMPTY_CONN_IMG;
- else
- arrConnectImagesNew[arrConnectImagesNew.length - 1] = TreeRowObject.LINE_CONN_IMG;
+ else arrConnectImagesNew[arrConnectImagesNew.length - 1] = TreeRowObject.LINE_CONN_IMG;
- for (Iterator iter = objTreeModel.getTreeDataModel().getChildren(objParent); iter
- .hasNext();)
+ for(Iterator iter = objTreeModel.getTreeDataModel().getChildren(
+ objParent); iter.hasNext();)
{
Object objChild = iter.next();
- Object objChildUID = objTreeModel.getTreeDataModel().getUniqueKey(
- objChild,
- objParentUID);
+ Object objChildUID = objTreeModel.getTreeDataModel()
+ .getUniqueKey(objChild, objParentUID);
boolean bChildLast = !iter.hasNext();
if (bChildLast)
nRowPossiotionType = TreeRowObject.LAST_ROW;
- else
- nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
- walkTree(
- objChild,
- objChildUID,
- nDepth + 1,
- objTreeModel,
- writer,
- cycle,
- nRowPossiotionType,
- arrConnectImagesNew,
+ else nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
+ walkTree(objChild, objChildUID, nDepth + 1, objTreeModel,
+ writer, cycle, nRowPossiotionType, arrConnectImagesNew,
bChildLast);
}
}
@@ -185,4 +165,4 @@
public abstract boolean getShowRootNode();
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.java Sat Mar 18 21:11:35 2006
@@ -37,57 +37,60 @@
/**
* @author tsveltin?
*/
-public abstract class TreeNodeView extends BaseComponent implements PageDetachListener
+public abstract class TreeNodeView extends BaseComponent implements
+ PageDetachListener
{
+
private static final Log LOG = LogFactory.getLog(TreeNodeView.class);
private Boolean m_objNodeState;
private Boolean m_objShowNodeImages;
- private Boolean m_objMakeNodeDirect;
-
private INodeRenderFactory m_objNodeRenderFactory;
private IAsset m_objOpenNodeImage;
private IAsset m_objCloseNodeImage;
- private int m_CurrentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
-
- public abstract INodeRenderFactory getNodeRenderFactoryParameter();
-
- public abstract Boolean getShowNodeImages();
+ private int m_currentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
+ /**
+ * Creates tree .
+ *
+ */
public TreeNodeView()
{
super();
initialize();
}
+
+ public abstract INodeRenderFactory getNodeRenderFactoryParameter();
+ public abstract Boolean getShowNodeImages();
+
private void initialize()
{
m_objNodeState = null;
m_objShowNodeImages = null;
m_objNodeRenderFactory = null;
- m_objMakeNodeDirect = null;
- m_CurrentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
+ m_currentForeachConnectImageValue = TreeRowObject.LINE_CONN_IMG;
}
public IRender getCurrentRenderer()
{
INodeRenderFactory objRenderFactory = getNodeRenderFactory();
ITreeRowSource objTreeRowSource = getTreeRowSource();
- return objRenderFactory.getRender(
- objTreeRowSource.getTreeRow().getTreeNode(),
- getTreeModelSource(),
- getPage().getRequestCycle());
+ return objRenderFactory.getRender(objTreeRowSource.getTreeRow()
+ .getTreeNode(), getTreeModelSource(), getPage()
+ .getRequestCycle());
}
public Object[] getNodeContext()
{
ITreeModelSource objModelSource = getTreeModelSource();
- ComponentAddress objModelSourceAddress = new ComponentAddress(objModelSource);
+ ComponentAddress objModelSourceAddress = new ComponentAddress(
+ objModelSource);
ITreeRowSource objTreeRowSource = getTreeRowSource();
TreeRowObject objTreeRowObject = objTreeRowSource.getTreeRow();
Object objValueUID = objTreeRowObject.getTreeNodeUID();
@@ -96,21 +99,21 @@
LOG.debug("getNodeContext objValueUID = " + objValueUID);
}
- return new Object[]
- { objValueUID, new Boolean(isNodeOpen()), objModelSourceAddress };
+ return new Object[] { objValueUID, new Boolean(isNodeOpen()),
+ objModelSourceAddress };
}
/**
- * Called when a node in the tree is clicked by the user. If the node is expanded, it will be
- * collapsed, and vice-versa, that is, the tree state model is retrieved, and it is told to
- * collapse or expand the node.
+ * Called when a node in the tree is clicked by the user. If the node is
+ * expanded, it will be collapsed, and vice-versa, that is, the tree state
+ * model is retrieved, and it is told to collapse or expand the node.
*
* @param cycle
* The Tapestry request cycle object.
*/
public void nodeExpandCollaps(IRequestCycle cycle)
{
- Object context[] = cycle.getListenerParameters();
+ Object[] context = cycle.getListenerParameters();
Object objValueUID = null;
if (context != null && context.length > 0)
{
@@ -120,7 +123,8 @@
ITreeModelSource objTreeModelSource = (ITreeModelSource) objModelSourceAddress
.findComponent(cycle);
// ITreeModelSource objTreeModelSource = getTreeModelSource();
- ITreeStateModel objStateModel = objTreeModelSource.getTreeModel().getTreeStateModel();
+ ITreeStateModel objStateModel = objTreeModelSource.getTreeModel()
+ .getTreeStateModel();
boolean bState = objStateModel.isUniqueKeyExpanded(objValueUID);
if (bState)
@@ -136,15 +140,15 @@
}
/**
- * Called when a node in the tree is selected by the user. the tree state model is retrieved,
- * and it is told to select the node.
+ * Called when a node in the tree is selected by the user. the tree state
+ * model is retrieved, and it is told to select the node.
*
* @param cycle
* The Tapestry request cycle object.
*/
public void nodeSelect(IRequestCycle cycle)
{
- Object context[] = cycle.getListenerParameters();
+ Object[] context = cycle.getListenerParameters();
Object objValueUID = null;
if (context != null && context.length > 0)
{
@@ -154,12 +158,14 @@
ITreeModelSource objTreeModelSource = (ITreeModelSource) objModelSourceAddress
.findComponent(cycle);
// ITreeModelSource objTreeModelSource = getTreeModelSource();
- ITreeStateModel objStateModel = objTreeModelSource.getTreeModel().getTreeStateModel();
+ ITreeStateModel objStateModel = objTreeModelSource.getTreeModel()
+ .getTreeStateModel();
Object objSelectedNodeInState = objStateModel.getSelectedNode();
if (objValueUID.equals(objSelectedNodeInState))
{
- // do nothing, the selected node in UI is the same as the selected in
+ // do nothing, the selected node in UI is the same as the selected
+ // in
// state model. The user should use refresh of back button.
return;
}
@@ -168,28 +174,37 @@
fireNodeSelected(objValueUID, objTreeModelSource);
}
- private void fireNodeSelected(Object objValueUID, ITreeModelSource objTreeModelSource)
+ private void fireNodeSelected(Object objValueUID,
+ ITreeModelSource objTreeModelSource)
{
- deliverEvent(TreeStateEvent.SELECTED_NODE_CHANGED, objValueUID, objTreeModelSource);
+ deliverEvent(TreeStateEvent.SELECTED_NODE_CHANGED, objValueUID,
+ objTreeModelSource);
}
- private void fireNodeCollapsed(Object objValueUID, ITreeModelSource objTreeModelSource)
+ private void fireNodeCollapsed(Object objValueUID,
+ ITreeModelSource objTreeModelSource)
{
- deliverEvent(TreeStateEvent.NODE_COLLAPSED, objValueUID, objTreeModelSource);
+ deliverEvent(TreeStateEvent.NODE_COLLAPSED, objValueUID,
+ objTreeModelSource);
}
- private void fireNodeExpanded(Object objValueUID, ITreeModelSource objTreeModelSource)
+ private void fireNodeExpanded(Object objValueUID,
+ ITreeModelSource objTreeModelSource)
{
- deliverEvent(TreeStateEvent.NODE_EXPANDED, objValueUID, objTreeModelSource);
+ deliverEvent(TreeStateEvent.NODE_EXPANDED, objValueUID,
+ objTreeModelSource);
}
- private void deliverEvent(int nEventUID, Object objValueUID, ITreeModelSource objTreeModelSource)
+ private void deliverEvent(int nEventUID, Object objValueUID,
+ ITreeModelSource objTreeModelSource)
{
- ITreeStateListener objListener = objTreeModelSource.getTreeStateListener();
+ ITreeStateListener objListener = objTreeModelSource
+ .getTreeStateListener();
if (objListener != null)
{
- TreeStateEvent objEvent = new TreeStateEvent(nEventUID, objValueUID, objTreeModelSource
- .getTreeModel().getTreeStateModel());
+ TreeStateEvent objEvent = new TreeStateEvent(nEventUID,
+ objValueUID, objTreeModelSource.getTreeModel()
+ .getTreeStateModel());
objListener.treeStateChanged(objEvent);
}
@@ -200,7 +215,8 @@
initialize();
}
- public void finishLoad(IRequestCycle objCycle, IPageLoader arg0, ComponentSpecification arg1)
+ public void finishLoad(IRequestCycle objCycle, IPageLoader arg0,
+ ComponentSpecification arg1)
{
super.finishLoad(objCycle, arg0, arg1);
getPage().addPageDetachListener(this);
@@ -217,7 +233,8 @@
TreeRowObject objTreeRowObject = objTreeRowSource.getTreeRow();
Object objValueUID = objTreeRowObject.getTreeNodeUID();
ITreeModelSource objTreeModelSource = getTreeModelSource();
- ITreeStateModel objStateModel = objTreeModelSource.getTreeModel().getTreeStateModel();
+ ITreeStateModel objStateModel = objTreeModelSource.getTreeModel()
+ .getTreeStateModel();
boolean bState = objStateModel.isUniqueKeyExpanded(objValueUID);
m_objNodeState = new Boolean(bState);
}
@@ -239,108 +256,108 @@
{
if (isNodeOpen())
{
- switch (nRowType)
+ switch(nRowType)
+ {
+ case TreeRowObject.FIRST_LAST_ROW:
{
- case TreeRowObject.FIRST_LAST_ROW:
- {
- objResult = getAsset("_topLastOpenNodeImage");
- break;
- }
-
- case TreeRowObject.FIRST_ROW:
- {
- objResult = getAsset("_topOpenNodeImage");
- break;
- }
-
- case TreeRowObject.MIDDLE_ROW:
- {
- objResult = getAsset("_middleOpenNodeImage");
- break;
- }
-
- case TreeRowObject.LAST_ROW:
- {
- objResult = getAsset("_bottomOpenNodeImage");
- break;
- }
-
- default:
- {
- objResult = getAsset("_openNodeImage");
- break;
- }
+ objResult = getAsset("_topLastOpenNodeImage");
+ break;
}
- }
- else
- {
- switch (nRowType)
+
+ case TreeRowObject.FIRST_ROW:
+ {
+ objResult = getAsset("_topOpenNodeImage");
+ break;
+ }
+
+ case TreeRowObject.MIDDLE_ROW:
+ {
+ objResult = getAsset("_middleOpenNodeImage");
+ break;
+ }
+
+ case TreeRowObject.LAST_ROW:
+ {
+ objResult = getAsset("_bottomOpenNodeImage");
+ break;
+ }
+
+ default:
{
- case TreeRowObject.FIRST_LAST_ROW:
- {
- objResult = getAsset("_topLastCloseNodeImage");
- break;
- }
-
- case TreeRowObject.FIRST_ROW:
- {
- objResult = getAsset("_topCloseNodeImage");
- break;
- }
-
- case TreeRowObject.MIDDLE_ROW:
- {
- objResult = getAsset("_middleCloseNodeImage");
- break;
- }
-
- case TreeRowObject.LAST_ROW:
- {
- objResult = getAsset("_bottomCloseNodeImage");
- break;
- }
-
- default:
- {
- objResult = getAsset("_closeNodeImage");
- break;
- }
+ objResult = getAsset("_openNodeImage");
+ break;
+ }
}
}
- }
- else
- {
- switch (nRowType)
+ else
{
+ switch(nRowType)
+ {
case TreeRowObject.FIRST_LAST_ROW:
{
- objResult = getAsset("_topLineImage");
+ objResult = getAsset("_topLastCloseNodeImage");
break;
}
case TreeRowObject.FIRST_ROW:
{
- objResult = getAsset("_topLineImage");
+ objResult = getAsset("_topCloseNodeImage");
break;
}
case TreeRowObject.MIDDLE_ROW:
{
- objResult = getAsset("_middleCrossLineImage");
+ objResult = getAsset("_middleCloseNodeImage");
break;
}
case TreeRowObject.LAST_ROW:
{
- objResult = getAsset("_bottomLineImage");
+ objResult = getAsset("_bottomCloseNodeImage");
break;
}
default:
{
- objResult = getAsset("_bottomLineImage");
+ objResult = getAsset("_closeNodeImage");
break;
}
+ }
+ }
+ }
+ else
+ {
+ switch(nRowType)
+ {
+ case TreeRowObject.FIRST_LAST_ROW:
+ {
+ objResult = getAsset("_topLineImage");
+ break;
+ }
+
+ case TreeRowObject.FIRST_ROW:
+ {
+ objResult = getAsset("_topLineImage");
+ break;
+ }
+
+ case TreeRowObject.MIDDLE_ROW:
+ {
+ objResult = getAsset("_middleCrossLineImage");
+ break;
+ }
+
+ case TreeRowObject.LAST_ROW:
+ {
+ objResult = getAsset("_bottomLineImage");
+ break;
+ }
+
+ default:
+ {
+ objResult = getAsset("_bottomLineImage");
+ break;
+ }
}
}
@@ -408,7 +425,8 @@
}
/**
- * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter, IRequestCycle)
+ * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter,
+ * IRequestCycle)
*/
protected void renderComponent(IMarkupWriter arg0, IRequestCycle arg1)
{
@@ -459,8 +477,7 @@
if (objTreeRowObject != null)
{
nTreeRowDepth = objTreeRowObject.getTreeRowDepth();
- if (nTreeRowDepth != 0)
- nTreeRowDepth = nTreeRowDepth - 1;
+ if (nTreeRowDepth != 0) nTreeRowDepth = nTreeRowDepth - 1;
}
return "padding-left: " + nTreeRowDepth * 19 + "px";
}
@@ -471,8 +488,7 @@
{
if (isParameterBound("nodeRenderFactory"))
m_objNodeRenderFactory = getNodeRenderFactoryParameter();
- else
- m_objNodeRenderFactory = new SimpleNodeRenderFactory();
+ else m_objNodeRenderFactory = new SimpleNodeRenderFactory();
}
return m_objNodeRenderFactory;
}
@@ -495,12 +511,9 @@
ITreeModelSource objTreeModelSource = getTreeModelSource();
TreeRowObject objTreeRowObject = objTreeRowSource.getTreeRow();
Object objNodeValueUID = objTreeRowObject.getTreeNodeUID();
- Object objSelectedNode = objTreeModelSource.getTreeModel().getTreeStateModel()
- .getSelectedNode();
- if (objNodeValueUID.equals(objSelectedNode))
- {
- return getSelectedNodeID();
- }
+ Object objSelectedNode = objTreeModelSource.getTreeModel()
+ .getTreeStateModel().getSelectedNode();
+ if (objNodeValueUID.equals(objSelectedNode)) { return getSelectedNodeID(); }
return "";
}
@@ -519,29 +532,27 @@
if (objTreeRowObject != null)
{
Object objNodeValueUID = objTreeRowObject.getTreeNodeUID();
- Object objSelectedNode = objTreeModelSource.getTreeModel().getTreeStateModel()
- .getSelectedNode();
+ Object objSelectedNode = objTreeModelSource.getTreeModel()
+ .getTreeStateModel().getSelectedNode();
bResult = objNodeValueUID.equals(objSelectedNode);
}
- if (bResult)
- {
- return "selectedNodeViewClass";
- }
+ if (bResult) { return "selectedNodeViewClass"; }
return "notSelectedNodeViewClass";
}
public ITreeRowSource getTreeRowSource()
{
- ITreeRowSource objSource = (ITreeRowSource) getPage().getRequestCycle().getAttribute(
- ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE);
+ ITreeRowSource objSource = (ITreeRowSource) getPage().getRequestCycle()
+ .getAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE);
return objSource;
}
public ITreeModelSource getTreeModelSource()
{
- ITreeModelSource objSource = (ITreeModelSource) getPage().getRequestCycle().getAttribute(
- ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE);
+ ITreeModelSource objSource = (ITreeModelSource) getPage()
+ .getRequestCycle().getAttribute(
+ ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE);
return objSource;
}
@@ -549,8 +560,7 @@
{
ITreeRowSource objRowSource = getTreeRowSource();
int nRowType = objRowSource.getTreeRow().getTreeRowPossiotionType();
- if (TreeRowObject.MIDDLE_ROW == nRowType)
- return true;
+ if (TreeRowObject.MIDDLE_ROW == nRowType) return true;
return false;
}
@@ -577,25 +587,25 @@
{
IAsset objResult = null;
int nConnectImageType = getCurrentForeachConnectImageValue();
- switch (nConnectImageType)
+ switch(nConnectImageType)
{
- case TreeRowObject.EMPTY_CONN_IMG:
- {
- objResult = getAsset("_whiteSpaceImage");
- break;
- }
+ case TreeRowObject.EMPTY_CONN_IMG:
+ {
+ objResult = getAsset("_whiteSpaceImage");
+ break;
+ }
- case TreeRowObject.LINE_CONN_IMG:
- {
- objResult = getAsset("_middleLineImage");
- break;
- }
+ case TreeRowObject.LINE_CONN_IMG:
+ {
+ objResult = getAsset("_middleLineImage");
+ break;
+ }
- default:
- {
- objResult = getAsset("_whiteSpaceImage");
- break;
- }
+ default:
+ {
+ objResult = getAsset("_whiteSpaceImage");
+ break;
+ }
}
return objResult;
}
@@ -605,15 +615,16 @@
*/
public int getCurrentForeachConnectImageValue()
{
- return m_CurrentForeachConnectImageValue;
+ return m_currentForeachConnectImageValue;
}
/**
* @param currentForeachConnectImageValue
* The m_CurrentForeachConnectImageValue to set.
*/
- public void setCurrentForeachConnectImageValue(int currentForeachConnectImageValue)
+ public void setCurrentForeachConnectImageValue(
+ int currentForeachConnectImageValue)
{
- m_CurrentForeachConnectImageValue = currentForeachConnectImageValue;
+ m_currentForeachConnectImageValue = currentForeachConnectImageValue;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeView.java Sat Mar 18 21:11:35 2006
@@ -34,8 +34,8 @@
/**
*/
-public abstract class TreeView extends BaseComponent implements PageDetachListener,
- PageBeginRenderListener, ITreeModelSource
+public abstract class TreeView extends BaseComponent implements
+ PageDetachListener, PageBeginRenderListener, ITreeModelSource
{
private static final Log LOG = LogFactory.getLog(TreeView.class);
@@ -72,7 +72,8 @@
}
/**
- * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter, IRequestCycle)
+ * @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter,
+ * IRequestCycle)
*/
/**
@@ -88,10 +89,7 @@
*/
public void pageBeginRender(PageEvent arg0)
{
- if (arg0.getRequestCycle().isRewinding())
- {
- return;
- }
+ if (arg0.getRequestCycle().isRewinding()) { return; }
storeSesion();
}
@@ -142,7 +140,8 @@
* @param sessionStoreManagerBinding
* The SessionStoreManagerBinding to set
*/
- public void setSessionStoreManagerBinding(IBinding sessionStoreManagerBinding)
+ public void setSessionStoreManagerBinding(
+ IBinding sessionStoreManagerBinding)
{
m_objSessionStoreManagerBinding = sessionStoreManagerBinding;
}
@@ -153,7 +152,8 @@
* @param sessionStateManagerBinding
* The sessionStateManagerBinding to set
*/
- public void setSessionStateManagerBinding(IBinding sessionStateManagerBinding)
+ public void setSessionStateManagerBinding(
+ IBinding sessionStateManagerBinding)
{
m_objSessionStateManagerBinding = sessionStateManagerBinding;
}
@@ -174,7 +174,8 @@
}
else
{
- objSessionState = objHolder.getSessionState(this.getPage(), "treeSessionState");
+ objSessionState = objHolder.getSessionState(this.getPage(),
+ "treeSessionState");
}
if (objSessionState != null)
@@ -201,7 +202,8 @@
}
ITreeSessionStateManager objSessionManager = getTreeSessionStateMgr();
- Object objSessionState = objSessionManager.getSessionState(getTreeModel());
+ Object objSessionState = objSessionManager
+ .getSessionState(getTreeModel());
store(objSessionState);
}
@@ -212,11 +214,12 @@
if (objHolder == null)
{
- Tapestry.fireObservedChange(this, "treeSessionState", objSessionState);
+ Tapestry.fireObservedChange(this, "treeSessionState",
+ objSessionState);
}
else
{
- //String strPath = "treeSessionState";
+ // String strPath = "treeSessionState";
String strPath = getExtendedId();
if (LOG.isDebugEnabled())
LOG.debug("store(): setting state with: " + strPath);
@@ -244,7 +247,8 @@
*/
public ISessionStoreManager getSessionStoreManager()
{
- if (m_objSessionStoreManager == null && getSessionStoreManagerBinding() != null)
+ if (m_objSessionStoreManager == null
+ && getSessionStoreManagerBinding() != null)
{
m_objSessionStoreManager = (ISessionStoreManager) getSessionStoreManagerBinding()
.getObject();
@@ -347,7 +351,8 @@
arg1.setAttribute(ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE, this);
super.renderComponent(arg0, arg1);
- arg1.setAttribute(ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE, objExistedTreeModelSource);
+ arg1.setAttribute(ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE,
+ objExistedTreeModelSource);
}
/**
@@ -364,4 +369,4 @@
return objListener;
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTable.java Sat Mar 18 21:11:35 2006
@@ -24,39 +24,45 @@
/**
* @author ceco
*/
-public abstract class TreeTable extends BaseComponent implements ITreeComponent{
+public abstract class TreeTable extends BaseComponent implements ITreeComponent
+{
- /**
- *
- */
- public TreeTable() {
- super();
- }
+ /**
+ *
+ */
+ public TreeTable()
+ {
+ super();
+ }
- public ITreeModelSource getTreeModelSource(){
- return (ITreeModelSource) getComponent("treeView");
- }
+ public ITreeModelSource getTreeModelSource()
+ {
+ return (ITreeModelSource) getComponent("treeView");
+ }
- /**
- * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#resetState()
- */
- public void resetState() {
- TreeView objTreeView = (TreeView)getComponent("treeView");
- objTreeView.resetState();
- }
+ /**
+ * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#resetState()
+ */
+ public void resetState()
+ {
+ TreeView objTreeView = (TreeView) getComponent("treeView");
+ objTreeView.resetState();
+ }
- /**
- * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getComponentPath()
- */
- public ComponentAddress getComponentPath() {
- return new ComponentAddress(this);
- }
+ /**
+ * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getComponentPath()
+ */
+ public ComponentAddress getComponentPath()
+ {
+ return new ComponentAddress(this);
+ }
- /**
- * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getTreeRowSource()
- */
- public ITreeRowSource getTreeRowSource() {
- TreeTableDataView objTreeDataView = (TreeTableDataView)getComponent("treeTableDataView");
- return objTreeDataView;
- }
+ /**
+ * @see org.apache.tapestry.contrib.tree.components.ITreeComponent#getTreeRowSource()
+ */
+ public ITreeRowSource getTreeRowSource()
+ {
+ TreeTableDataView objTreeDataView = (TreeTableDataView) getComponent("treeTableDataView");
+ return objTreeDataView;
+ }
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableColumn.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableColumn.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableColumn.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableColumn.java Sat Mar 18 21:11:35 2006
@@ -25,22 +25,30 @@
*/
public class TreeTableColumn extends SimpleTableColumn
{
- private static final long serialVersionUID = -8046804468741132535L;
- /**
- * @param arg0
- * @param arg1
- */
- public TreeTableColumn(String arg0, boolean arg1, ComponentAddress objComponentAddress) {
- super(arg0, arg1);
- setValueRendererSource(new TreeTableValueRenderSource(objComponentAddress));
- }
+ private static final long serialVersionUID = -8046804468741132535L;
- /**
- * @see org.apache.tapestry.contrib.table.model.common.AbstractTableColumn#getValueRenderer(org.apache.tapestry.IRequestCycle, org.apache.tapestry.contrib.table.model.ITableModelSource, java.lang.Object)
- */
- public IRender getValueRenderer(IRequestCycle arg0, ITableModelSource arg1, Object arg2) {
- return super.getValueRenderer(arg0, arg1, arg2);
- }
+ /**
+ * @param arg0
+ * @param arg1
+ */
+ public TreeTableColumn(String arg0, boolean arg1,
+ ComponentAddress objComponentAddress)
+ {
+ super(arg0, arg1);
+ setValueRendererSource(new TreeTableValueRenderSource(
+ objComponentAddress));
+ }
+
+ /**
+ * @see org.apache.tapestry.contrib.table.model.common.AbstractTableColumn#getValueRenderer(org.apache.tapestry.IRequestCycle,
+ * org.apache.tapestry.contrib.table.model.ITableModelSource,
+ * java.lang.Object)
+ */
+ public IRender getValueRenderer(IRequestCycle arg0, ITableModelSource arg1,
+ Object arg2)
+ {
+ return super.getValueRenderer(arg0, arg1, arg2);
+ }
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableDataView.java Sat Mar 18 21:11:35 2006
@@ -38,9 +38,10 @@
/**
*/
-public abstract class TreeTableDataView extends BaseComponent implements ITreeRowSource,
- PageDetachListener
+public abstract class TreeTableDataView extends BaseComponent implements
+ ITreeRowSource, PageDetachListener
{
+
private int m_nTreeDeep = -1;
private TreeRowObject m_objTreeRowObject = null;
@@ -73,8 +74,9 @@
public ITreeModelSource getTreeModelSource()
{
- ITreeModelSource objSource = (ITreeModelSource) getPage().getRequestCycle().getAttribute(
- ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE);
+ ITreeModelSource objSource = (ITreeModelSource) getPage()
+ .getRequestCycle().getAttribute(
+ ITreeModelSource.TREE_MODEL_SOURCE_ATTRIBUTE);
return objSource == null ? getTreeViewParameter() : objSource;
}
@@ -94,45 +96,32 @@
Object objRootUID = objTreeDataModel.getUniqueKey(objRoot, null);
if (getShowRootNode())
{
- walkTree(
- arrAllExpandedNodes,
- objRoot,
- objRootUID,
- 0,
- objTreeModel,
- TreeRowObject.FIRST_LAST_ROW,
- new int[0],
+ walkTree(arrAllExpandedNodes, objRoot, objRootUID, 0,
+ objTreeModel, TreeRowObject.FIRST_LAST_ROW, new int[0],
true);
}
else
{
- int nChildenCount = objTreeModel.getTreeDataModel().getChildCount(objRoot);
+ int nChildenCount = objTreeModel.getTreeDataModel()
+ .getChildCount(objRoot);
int nRowPossiotionType = nChildenCount == 1 ? TreeRowObject.FIRST_LAST_ROW
: TreeRowObject.FIRST_ROW;
boolean bFirst = true;
- for (Iterator iter = objTreeModel.getTreeDataModel().getChildren(objRoot); iter
- .hasNext();)
+ for(Iterator iter = objTreeModel.getTreeDataModel()
+ .getChildren(objRoot); iter.hasNext();)
{
Object objChild = iter.next();
- Object objChildUID = objTreeModel.getTreeDataModel().getUniqueKey(
- objChild,
- objRoot);
+ Object objChildUID = objTreeModel.getTreeDataModel()
+ .getUniqueKey(objChild, objRoot);
boolean bChildLast = !iter.hasNext();
if (!bFirst)
{
if (bChildLast)
nRowPossiotionType = TreeRowObject.LAST_ROW;
- else
- nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
+ else nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
}
- walkTree(
- arrAllExpandedNodes,
- objChild,
- objChildUID,
- 0,
- objTreeModel,
- nRowPossiotionType,
- new int[0],
+ walkTree(arrAllExpandedNodes, objChild, objChildUID, 0,
+ objTreeModel, nRowPossiotionType, new int[0],
bChildLast);
bFirst = false;
}
@@ -144,48 +133,44 @@
return m_arrAllExpandedNodes;
}
- public void walkTree(ArrayList arrAllExpandedNodes, Object objParent, Object objParentUID,
- int nDepth, ITreeModel objTreeModel, int nRowPossiotionType, int[] arrConnectImages,
- boolean bLast)
+ public void walkTree(ArrayList arrAllExpandedNodes, Object objParent,
+ Object objParentUID, int nDepth, ITreeModel objTreeModel,
+ int nRowPossiotionType, int[] arrConnectImages, boolean bLast)
{
m_nTreeDeep = nDepth;
- int nNumberOfChildren = objTreeModel.getTreeDataModel().getChildCount(objParent);
+ int nNumberOfChildren = objTreeModel.getTreeDataModel().getChildCount(
+ objParent);
boolean bLeaf = (nNumberOfChildren == 0) ? true : false;
- TreeRowObject objTreeRowObject = new TreeRowObject(objParent, objParentUID, nDepth, bLeaf,
- nRowPossiotionType, arrConnectImages);
+ TreeRowObject objTreeRowObject = new TreeRowObject(objParent,
+ objParentUID, nDepth, bLeaf, nRowPossiotionType,
+ arrConnectImages);
arrAllExpandedNodes.add(objTreeRowObject);
- boolean bContain = objTreeModel.getTreeStateModel().isUniqueKeyExpanded(objParentUID);
+ boolean bContain = objTreeModel.getTreeStateModel()
+ .isUniqueKeyExpanded(objParentUID);
if (bContain)
{
int[] arrConnectImagesNew = new int[arrConnectImages.length + 1];
- System.arraycopy(arrConnectImages, 0, arrConnectImagesNew, 0, arrConnectImages.length);
+ System.arraycopy(arrConnectImages, 0, arrConnectImagesNew, 0,
+ arrConnectImages.length);
if (bLast)
arrConnectImagesNew[arrConnectImagesNew.length - 1] = TreeRowObject.EMPTY_CONN_IMG;
- else
- arrConnectImagesNew[arrConnectImagesNew.length - 1] = TreeRowObject.LINE_CONN_IMG;
- Iterator colChildren = objTreeModel.getTreeDataModel().getChildren(objParent);
- for (Iterator iter = colChildren; iter.hasNext();)
+ else arrConnectImagesNew[arrConnectImagesNew.length - 1] = TreeRowObject.LINE_CONN_IMG;
+ Iterator colChildren = objTreeModel.getTreeDataModel().getChildren(
+ objParent);
+ for(Iterator iter = colChildren; iter.hasNext();)
{
Object objChild = iter.next();
- Object objChildUID = objTreeModel.getTreeDataModel().getUniqueKey(
- objChild,
- objParentUID);
+ Object objChildUID = objTreeModel.getTreeDataModel()
+ .getUniqueKey(objChild, objParentUID);
boolean bChildLast = !iter.hasNext();
if (bChildLast)
nRowPossiotionType = TreeRowObject.LAST_ROW;
- else
- nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
- walkTree(
- arrAllExpandedNodes,
- objChild,
- objChildUID,
- nDepth + 1,
- objTreeModel,
- nRowPossiotionType,
- arrConnectImagesNew,
- bChildLast);
+ else nRowPossiotionType = TreeRowObject.MIDDLE_ROW;
+ walkTree(arrAllExpandedNodes, objChild, objChildUID,
+ nDepth + 1, objTreeModel, nRowPossiotionType,
+ arrConnectImagesNew, bChildLast);
}
}
}
@@ -201,8 +186,8 @@
}
/*
- * public ITableModel getTableModel() { if(m_objTableModel == null){ m_objTableModel =
- * createTableModel(); } return m_objTableModel; }
+ * public ITableModel getTableModel() { if(m_objTableModel == null){
+ * m_objTableModel = createTableModel(); } return m_objTableModel; }
*/
public ITableModel getTableModel()
{
@@ -215,8 +200,8 @@
Object[] arrAllExpandedNodes = new Object[arrAllNodes.size()];
arrAllNodes.toArray(arrAllExpandedNodes);
- SimpleTableModel objTableModel = new SimpleTableModel(arrAllExpandedNodes,
- getTableColunms());
+ SimpleTableModel objTableModel = new SimpleTableModel(
+ arrAllExpandedNodes, getTableColunms());
objTableModel.getPagingState().setPageSize(getEntriesPerTablePage());
return objTableModel;
@@ -228,8 +213,7 @@
arrColumnsList.add(new TreeTableColumn("Name", false, null));
List arrTableColunms = getTableColumnsParameter();
- if (arrTableColunms != null)
- arrColumnsList.addAll(arrTableColunms);
+ if (arrTableColunms != null) arrColumnsList.addAll(arrTableColunms);
ITableColumn[] arrColumns = new ITableColumn[arrColumnsList.size()];
arrColumnsList.toArray(arrColumns);
@@ -251,8 +235,10 @@
public ITableSessionStateManager getTableSessionStateManager()
{
- SimpleListTableDataModel objDataModel = new SimpleListTableDataModel(generateNodeList());
- SimpleTableColumnModel objColumnModel = new SimpleTableColumnModel(getTableColunms());
+ SimpleListTableDataModel objDataModel = new SimpleListTableDataModel(
+ generateNodeList());
+ SimpleTableColumnModel objColumnModel = new SimpleTableColumnModel(
+ getTableColunms());
SimpleTableSessionStateManager objStateManager = new SimpleTableSessionStateManager(
objDataModel, objColumnModel);
return objStateManager;
@@ -271,7 +257,8 @@
super.renderComponent(writer, cycle);
- cycle.setAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE, objExistedTreeModelSource);
+ cycle.setAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE,
+ objExistedTreeModelSource);
}
/**
@@ -286,7 +273,8 @@
super.renderBody(writer, cycle);
- cycle.setAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE, objExistedTreeModelSource);
+ cycle.setAttribute(ITreeRowSource.TREE_ROW_SOURCE_ATTRIBUTE,
+ objExistedTreeModelSource);
}
public TreeRowObject getTreeRowObject()
@@ -300,4 +288,4 @@
}
public abstract boolean getShowRootNode();
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableNodeViewDelegator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableNodeViewDelegator.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableNodeViewDelegator.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/components/table/TreeTableNodeViewDelegator.java Sat Mar 18 21:11:35 2006
@@ -23,23 +23,27 @@
/**
* @author ceco
*/
-public abstract class TreeTableNodeViewDelegator extends BaseComponent implements ITableRendererListener{
+public abstract class TreeTableNodeViewDelegator extends BaseComponent
+ implements ITableRendererListener
+{
- /**
- *
- */
- public TreeTableNodeViewDelegator() {
- super();
- }
+ /**
+ *
+ */
+ public TreeTableNodeViewDelegator()
+ {
+ super();
+ }
- /**
- * @see org.apache.tapestry.contrib.table.model.ITableRendererListener#initializeRenderer(org.apache.tapestry.IRequestCycle, org.apache.tapestry.contrib.table.model.ITableModelSource, org.apache.tapestry.contrib.table.model.ITableColumn, java.lang.Object)
- */
- public void initializeRenderer(
- IRequestCycle arg0,
- ITableModelSource arg1,
- ITableColumn arg2,
- Object arg3) {
- }
+ /**
+ * @see org.apache.tapestry.contrib.table.model.ITableRendererListener#initializeRenderer(org.apache.tapestry.IRequestCycle,
+ * org.apache.tapestry.contrib.table.model.ITableModelSource,
+ * org.apache.tapestry.contrib.table.model.ITableColumn,
+ * java.lang.Object)
+ */
+ public void initializeRenderer(IRequestCycle arg0, ITableModelSource arg1,
+ ITableColumn arg2, Object arg3)
+ {
+ }
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ISessionStoreManager.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ISessionStoreManager.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ISessionStoreManager.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ISessionStoreManager.java Sat Mar 18 21:11:35 2006
@@ -20,7 +20,11 @@
* @author ceco
*/
-public interface ISessionStoreManager {
- Object getSessionState(IPage objPage, String strSessionStateID);
- Object setSessionState(IPage objPage, String strSessionStateID, Object objSessionState);
+public interface ISessionStoreManager
+{
+
+ Object getSessionState(IPage objPage, String strSessionStateID);
+
+ Object setSessionState(IPage objPage, String strSessionStateID,
+ Object objSessionState);
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeDataModel.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeDataModel.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeDataModel.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeDataModel.java Sat Mar 18 21:11:35 2006
@@ -17,56 +17,76 @@
import java.util.Iterator;
/**
- * The interface that defines a suitable data model for a <code>TreeView component</code>.
+ * The interface that defines a suitable data model for a
+ * <code>TreeView component</code>.
*
* @author ceco
*/
public interface ITreeDataModel
{
- /**
- * Returns the root node of the tree
- */
- Object getRoot();
-
- /**
- * Returns the number of children of parent node.
- * @param objParent is the parent object whose nr of children are sought
- */
- int getChildCount(Object objParent);
-
- /**
- * Get an iterator to the Collection of children belonging to the parent node object
- * @param objParent is the parent object whose children are requested
- */
- Iterator getChildren(Object objParent);
-
- /**
- * Get the actual node object based on some identifier (for example an UUID)
- * @param objUniqueKey is the unique identifier of the node object being retrieved
- * @return the instance of the node object identified by the key
- */
- Object getObject(Object objUniqueKey);
-
- /**
- * Get the unique identifier (UUID) of the node object with a certain parent node
- * @param objTarget is the Object whose identifier is required
- * @param objParentUniqueKey is the unique id of the parent of objTarget
- * @return the unique identifier of objTarget
- */
- Object getUniqueKey(Object objTarget, Object objParentUniqueKey);
-
- /**
- * Get the unique identifier of the parent of an object
- * @param objChildUniqueKey is the identifier of the Object for which the parent identifier is sought
- * @return the identifier (possibly UUID) of the parent of objChildUniqueKey
- */
- Object getParentUniqueKey(Object objChildUniqueKey);
-
- /**
- * Check to see (on the basis of some node object identifier) whether the parent node is indeed the parent of the object
- * @param objChildUniqueKey is the identifier of the object whose parent is being checked
- * @param objParentUniqueKey is the identifier of the parent which is to be checked against
- */
- boolean isAncestorOf(Object objChildUniqueKey, Object objParentUniqueKey);
-
+
+ /**
+ * Returns the root node of the tree.
+ */
+ Object getRoot();
+
+ /**
+ * Returns the number of children of parent node.
+ *
+ * @param objParent
+ * is the parent object whose nr of children are sought
+ */
+ int getChildCount(Object objParent);
+
+ /**
+ * Get an iterator to the Collection of children belonging to the parent
+ * node object.
+ *
+ * @param objParent
+ * is the parent object whose children are requested
+ */
+ Iterator getChildren(Object objParent);
+
+ /**
+ * Get the actual node object based on some identifier (for example an UUID).
+ *
+ * @param objUniqueKey
+ * is the unique identifier of the node object being retrieved
+ * @return the instance of the node object identified by the key
+ */
+ Object getObject(Object objUniqueKey);
+
+ /**
+ * Get the unique identifier (UUID) of the node object with a certain parent
+ * node.
+ *
+ * @param objTarget
+ * is the Object whose identifier is required
+ * @param objParentUniqueKey
+ * is the unique id of the parent of objTarget
+ * @return the unique identifier of objTarget
+ */
+ Object getUniqueKey(Object objTarget, Object objParentUniqueKey);
+
+ /**
+ * Get the unique identifier of the parent of an object.
+ *
+ * @param objChildUniqueKey
+ * is the identifier of the Object for which the parent
+ * identifier is sought
+ * @return the identifier (possibly UUID) of the parent of objChildUniqueKey
+ */
+ Object getParentUniqueKey(Object objChildUniqueKey);
+
+ /**
+ * Check to see (on the basis of some node object identifier) whether the
+ * parent node is indeed the parent of the object.
+ *
+ * @param objChildUniqueKey
+ * is the identifier of the object whose parent is being checked
+ * @param objParentUniqueKey
+ * is the identifier of the parent which is to be checked against
+ */
+ boolean isAncestorOf(Object objChildUniqueKey, Object objParentUniqueKey);
+
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeModelSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeModelSource.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeModelSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeModelSource.java Sat Mar 18 21:11:35 2006
@@ -21,9 +21,11 @@
*/
public interface ITreeModelSource extends IComponent
{
- final static String TREE_MODEL_SOURCE_ATTRIBUTE = "org.apache.tapestry.contrib.tree.model.ITreeModelSource";
- ITreeModel getTreeModel();
- ITreeStateListener getTreeStateListener();
+ String TREE_MODEL_SOURCE_ATTRIBUTE = "org.apache.tapestry.contrib.tree.model.ITreeModelSource";
+
+ ITreeModel getTreeModel();
+
+ ITreeStateListener getTreeStateListener();
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeNode.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeNode.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeNode.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeNode.java Sat Mar 18 21:11:35 2006
@@ -23,7 +23,7 @@
public interface ITreeNode extends Serializable
{
-
+
/**
* Returns the <code>Collection</code> of children.
*/
@@ -41,7 +41,7 @@
ITreeNode getParent();
/**
- * Returns the true if current node contains received children, otherwise return false;
+ * Returns the true if current node contains received children, otherwise return false.
*/
boolean containsChild(ITreeNode node);
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeNodeManager.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeNodeManager.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeNodeManager.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeNodeManager.java Sat Mar 18 21:11:35 2006
@@ -20,6 +20,8 @@
/**
* @author ceco
*/
-public interface ITreeNodeManager {
- IRender getRenderer(Object objUniqueKey, ITreeComponent objTreeComponent);
+public interface ITreeNodeManager
+{
+
+ IRender getRenderer(Object objUniqueKey, ITreeComponent objTreeComponent);
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeRowSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeRowSource.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeRowSource.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeRowSource.java Sat Mar 18 21:11:35 2006
@@ -15,21 +15,20 @@
package org.apache.tapestry.contrib.tree.model;
/**
- * A Tapestry component that provides the current row value.
- * This interface is used for obtaining the row source by components
- * wrapped by the row source
+ * A Tapestry component that provides the current row value. This interface is
+ * used for obtaining the row source by components wrapped by the row source
*
* @author tsvetelin
*/
public interface ITreeRowSource
{
- final static String TREE_ROW_SOURCE_ATTRIBUTE = "org.apache.tapestry.contrib.tree.model.ITreeRowSource";
-
- /**
- * Method getTreeRow
- * @return Object the current tree row object.
- */
- TreeRowObject getTreeRow();
- //Object getTreeRowNodeUID();
- //int getTreeNodeDeep();
+
+ String TREE_ROW_SOURCE_ATTRIBUTE = "org.apache.tapestry.contrib.tree.model.ITreeRowSource";
+
+ /**
+ * Method getTreeRow.
+ *
+ * @return Object the current tree row object.
+ */
+ TreeRowObject getTreeRow();
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeSessionStateManager.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeSessionStateManager.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeSessionStateManager.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeSessionStateManager.java Sat Mar 18 21:11:35 2006
@@ -14,12 +14,13 @@
package org.apache.tapestry.contrib.tree.model;
-
-
/**
* @author ceco
*/
-public interface ITreeSessionStateManager {
- Object getSessionState(ITreeModel objModel);
- ITreeModel getModel(Object objSessionState);
+public interface ITreeSessionStateManager
+{
+
+ Object getSessionState(ITreeModel objModel);
+
+ ITreeModel getModel(Object objSessionState);
}
Modified: jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeStateListener.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeStateListener.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeStateListener.java (original)
+++ jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/tree/model/ITreeStateListener.java Sat Mar 18 21:11:35 2006
@@ -17,6 +17,8 @@
/**
* @author ceco
*/
-public interface ITreeStateListener {
- void treeStateChanged(TreeStateEvent objEvent);
+public interface ITreeStateListener
+{
+
+ void treeStateChanged(TreeStateEvent objEvent);
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/MultiKey.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/MultiKey.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/MultiKey.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/MultiKey.java Sat Mar 18 21:11:35 2006
@@ -22,90 +22,88 @@
import org.apache.tapestry.Tapestry;
/**
- * A complex key that may be used as an alternative to nested
- * {@link java.util.Map}s.
- *
- * @author Howard Lewis Ship
- *
- **/
+ * A complex key that may be used as an alternative to nested
+ * {@link java.util.Map}s.
+ *
+ * @author Howard Lewis Ship
+ */
public class MultiKey implements Externalizable
{
+
/**
- * @since 2.0.4
- *
- **/
-
+ * @since 2.0.4
+ */
+
private static final long serialVersionUID = 4465448607415788806L;
-
+
private static final int HASH_CODE_UNSET = -1;
private transient int hashCode = HASH_CODE_UNSET;
- private Object[] keys;
+ private Object[] _keys;
/**
- * Public no-arguments constructor needed to be compatible with
- * {@link Externalizable}; this leaves the new MultiKey in a
- * non-usable state and shouldn't be used by user code.
- *
- **/
+ * Public no-arguments constructor needed to be compatible with
+ * {@link Externalizable}; this leaves the new MultiKey in a non-usable
+ * state and shouldn't be used by user code.
+ */
public MultiKey()
{
}
/**
- * Builds a <code>MultiKey</code> from an array of keys. If the array is not
- * copied, then it must not be modified.
+ * Builds a <code>MultiKey</code> from an array of keys. If the array is
+ * not copied, then it must not be modified.
*
- * @param keys The components of the key.
- * @param makeCopy If true, a copy of the keys is created. If false,
- * the keys are simple retained by the <code>MultiKey</code>.
- *
- * @throws IllegalArgumentException if keys is null, of if the
- * first element of keys is null.
- *
- **/
+ * @param keys
+ * The components of the key.
+ * @param makeCopy
+ * If true, a copy of the keys is created. If false, the keys are
+ * simple retained by the <code>MultiKey</code>.
+ * @throws IllegalArgumentException
+ * if keys is null, of if the first element of keys is null.
+ */
public MultiKey(Object[] keys, boolean makeCopy)
{
super();
if (keys == null || keys.length == 0)
- throw new IllegalArgumentException(Tapestry.getMessage("MultiKey.null-keys"));
+ throw new IllegalArgumentException(Tapestry
+ .getMessage("MultiKey.null-keys"));
if (keys[0] == null)
- throw new IllegalArgumentException(Tapestry.getMessage("MultiKey.first-element-may-not-be-null"));
+ throw new IllegalArgumentException(Tapestry
+ .getMessage("MultiKey.first-element-may-not-be-null"));
if (makeCopy)
{
- this.keys = new Object[keys.length];
- System.arraycopy(keys, 0, this.keys, 0, keys.length);
+ this._keys = new Object[keys.length];
+ System.arraycopy(keys, 0, this._keys, 0, keys.length);
}
- else
- this.keys = keys;
+ else this._keys = keys;
}
/**
- * Returns true if:
- * <ul>
- * <li>The other object is a <code>MultiKey</code>
- * <li>They have the same number of key elements
- * <li>Every element is an exact match or is equal
- * </ul>
- *
- **/
+ * Returns true if. :
+ * <ul>
+ * <li>The other object is a <code>MultiKey</code>
+ * <li>They have the same number of key elements
+ * <li>Every element is an exact match or is equal
+ * </ul>
+ */
public boolean equals(Object other)
{
int i;
- if (other == null)
- return false;
+ if (other == null) return false;
- if (keys == null)
- throw new IllegalStateException(Tapestry.getMessage("MultiKey.no-keys"));
+ if (_keys == null)
+ throw new IllegalStateException(Tapestry
+ .getMessage("MultiKey.no-keys"));
// Would a hashCode check be worthwhile here?
@@ -113,29 +111,26 @@
{
MultiKey otherMulti = (MultiKey) other;
- if (keys.length != otherMulti.keys.length)
- return false;
+ if (_keys.length != otherMulti._keys.length) return false;
- for (i = 0; i < keys.length; i++)
+ for(i = 0; i < _keys.length; i++)
{
- // On an exact match, continue. This means that null matches
+ // On an exact match, continue. This means that null matches
// null.
- if (keys[i] == otherMulti.keys[i])
- continue;
+ if (_keys[i] == otherMulti._keys[i]) continue;
// If either is null, but not both, then
// not a match.
- if (keys[i] == null || otherMulti.keys[i] == null)
+ if (_keys[i] == null || otherMulti._keys[i] == null)
return false;
- if (!keys[i].equals(otherMulti.keys[i]))
- return false;
+ if (!_keys[i].equals(otherMulti._keys[i])) return false;
}
- // Every key equal. A match.
+ // Every key equal. A match.
return true;
}
@@ -147,27 +142,22 @@
}
/**
- * Returns the hash code of the receiver, which is computed from all the
- * non-null key elements. This value is computed once and
- * then cached, so elements should not change their hash codes
- * once created (note that this
- * is the same constraint that would be used if the individual
- * key elements were
- * themselves {@link java.util.Map} keys.
- *
- *
- **/
+ * Returns the hash code of the receiver, which is computed from all the
+ * non-null key elements. This value is computed once and then cached, so
+ * elements should not change their hash codes once created (note that this
+ * is the same constraint that would be used if the individual key elements
+ * were themselves {@link java.util.Map} keys.
+ */
public int hashCode()
{
if (hashCode == HASH_CODE_UNSET)
{
- hashCode = keys[0].hashCode();
+ hashCode = _keys[0].hashCode();
- for (int i = 1; i < keys.length; i++)
+ for(int i = 1; i < _keys.length; i++)
{
- if (keys[i] != null)
- hashCode ^= keys[i].hashCode();
+ if (_keys[i] != null) hashCode ^= _keys[i].hashCode();
}
}
@@ -175,9 +165,8 @@
}
/**
- * Identifies all the keys stored by this <code>MultiKey</code>.
- *
- **/
+ * Identifies all the keys stored by this <code>MultiKey</code>.
+ */
public String toString()
{
@@ -186,15 +175,13 @@
buffer = new StringBuffer("MultiKey[");
- for (i = 0; i < keys.length; i++)
+ for(i = 0; i < _keys.length; i++)
{
- if (i > 0)
- buffer.append(", ");
+ if (i > 0) buffer.append(", ");
- if (keys[i] == null)
+ if (_keys[i] == null)
buffer.append("<null>");
- else
- buffer.append(keys[i]);
+ else buffer.append(_keys[i]);
}
buffer.append(']');
@@ -203,31 +190,32 @@
}
/**
- * Writes a count of the keys, then writes each individual key.
- *
- **/
+ * Writes a count of the keys, then writes each individual key.
+ */
- public void writeExternal(ObjectOutput out) throws IOException
+ public void writeExternal(ObjectOutput out)
+ throws IOException
{
- out.writeInt(keys.length);
+ out.writeInt(_keys.length);
- for (int i = 0; i < keys.length; i++)
- out.writeObject(keys[i]);
+ for(int i = 0; i < _keys.length; i++)
+ out.writeObject(_keys[i]);
}
/**
- * Reads the state previously written by {@link #writeExternal(ObjectOutput)}.
- *
- **/
+ * Reads the state previously written by
+ * {@link #writeExternal(ObjectOutput)}.
+ */
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+ public void readExternal(ObjectInput in)
+ throws IOException, ClassNotFoundException
{
int count;
count = in.readInt();
- keys = new Object[count];
+ _keys = new Object[count];
- for (int i = 0; i < count; i++)
- keys[i] = in.readObject();
+ for(int i = 0; i < count; i++)
+ _keys[i] = in.readObject();
}
-}
\ No newline at end of file
+}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/exception/ExceptionDescription.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/exception/ExceptionDescription.java?rev=386927&r1=386926&r2=386927&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/exception/ExceptionDescription.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/util/exception/ExceptionDescription.java Sat Mar 18 21:11:35 2006
@@ -17,59 +17,54 @@
import java.io.Serializable;
/**
- * A description of an <code>Exception</code>. This is useful when presenting an
- * exception (in output or on a web page).
- *
- * <p>We capture all the information about an exception as
- * Strings.
- *
- * @author Howard Lewis Ship
+ * A description of an <code>Exception</code>. This is useful when presenting
+ * an exception (in output or on a web page).
+ * <p>
+ * We capture all the information about an exception as Strings.
*
- **/
+ * @author Howard Lewis Ship
+ */
public class ExceptionDescription implements Serializable
{
+
/**
- * @since 2.0.4
- *
- **/
+ * @since 2.0.4
+ */
private static final long serialVersionUID = -4874930784340781514L;
- private String exceptionClassName;
- private String message;
- private ExceptionProperty[] properties;
- private String[] stackTrace;
-
- public ExceptionDescription(
- String exceptionClassName,
- String message,
- ExceptionProperty[] properties,
- String[] stackTrace)
+ private String _exceptionClassName;
+ private String _message;
+ private ExceptionProperty[] _properties;
+ private String[] _stackTrace;
+
+ public ExceptionDescription(String exceptionClassName, String message,
+ ExceptionProperty[] properties, String[] stackTrace)
{
- this.exceptionClassName = exceptionClassName;
- this.message = message;
- this.properties = properties;
- this.stackTrace = stackTrace;
+ this._exceptionClassName = exceptionClassName;
+ this._message = message;
+ this._properties = properties;
+ this._stackTrace = stackTrace;
}
public String getExceptionClassName()
{
- return exceptionClassName;
+ return _exceptionClassName;
}
public String getMessage()
{
- return message;
+ return _message;
}
public ExceptionProperty[] getProperties()
{
- return properties;
+ return _properties;
}
public String[] getStackTrace()
{
- return stackTrace;
+ return _stackTrace;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org