midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1060 Tree : selection of a record doesn't select the node.

This commit is contained in:
Heng Sin Low 2013-06-19 17:33:53 +08:00
parent f0c1b2db34
commit 10da24b5a3
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -606,10 +606,10 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
if (gridTab.getRecord_ID() >= 0) { if (gridTab.getRecord_ID() >= 0) {
if (AD_Tree_ID != 0) { if (AD_Tree_ID != 0) {
treePanel.initTree(AD_Tree_ID, windowNo); treePanel.initTree(AD_Tree_ID, windowNo);
setSelectedNode(gridTab.getRecord_ID()); Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
} else if (AD_Tree_ID_Default != 0) { } else if (AD_Tree_ID_Default != 0) {
treePanel.initTree(AD_Tree_ID_Default, windowNo); treePanel.initTree(AD_Tree_ID_Default, windowNo);
setSelectedNode(gridTab.getRecord_ID()); Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
} }
} else { } else {
treePanel.getTree().clear(); treePanel.getTree().clear();
@ -794,6 +794,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
} }
Events.sendEvent(this, new Event(ON_DYNAMIC_DISPLAY_EVENT, this)); Events.sendEvent(this, new Event(ON_DYNAMIC_DISPLAY_EVENT, this));
Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
if (logger.isLoggable(Level.CONFIG)) logger.config(gridTab.toString() + " - fini - " + (col<=0 ? "complete" : "seletive")); if (logger.isLoggable(Level.CONFIG)) logger.config(gridTab.toString() + " - fini - " + (col<=0 ? "complete" : "seletive"));
} // dynamicDisplay } // dynamicDisplay
@ -954,7 +955,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
} }
if (gridTab.getRecord_ID() > 0 && gridTab.isTreeTab() && treePanel != null) { if (gridTab.getRecord_ID() > 0 && gridTab.isTreeTab() && treePanel != null) {
setSelectedNode(gridTab.getRecord_ID()); Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
} }
Event event = new Event(ON_ACTIVATE_EVENT, this, activate); Event event = new Event(ON_ACTIVATE_EVENT, this, activate);
@ -1003,7 +1004,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
navigateTo((DefaultTreeNode<MTreeNode>)item.getValue()); navigateTo((DefaultTreeNode<MTreeNode>)item.getValue());
} }
else if (ON_DEFER_SET_SELECTED_NODE.equals(event.getName())) { else if (ON_DEFER_SET_SELECTED_NODE.equals(event.getName())) {
if (gridTab.getRecord_ID() > 0 && gridTab.isTreeTab() && treePanel != null) { if (gridTab.getRecord_ID() >= 0 && gridTab.isTreeTab() && treePanel != null) {
setSelectedNode(gridTab.getRecord_ID()); setSelectedNode(gridTab.getRecord_ID());
} }
} }
@ -1196,8 +1197,11 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
{ {
if (AD_Tree_ID != 0) if (AD_Tree_ID != 0)
{ {
treePanel.initTree(AD_Tree_ID, windowNo); if (treePanel.initTree(AD_Tree_ID, windowNo))
setSelectedNode(gridTab.getRecord_ID()); Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
else
setSelectedNode(gridTab.getRecord_ID());
} }
else else
{ {

13
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTreePanel.java
View File

@ -49,6 +49,7 @@ public class ADTreePanel extends Panel implements EventListener<Event>
private ToolBarButton expandToggle; // Elaine 2009/02/27 - expand tree private ToolBarButton expandToggle; // Elaine 2009/02/27 - expand tree
private int m_windowno = -1; private int m_windowno = -1;
private int m_tabno = -1; private int m_tabno = -1;
private int AD_Tree_ID = -1;
public ADTreePanel() public ADTreePanel()
{ {
@ -66,10 +67,16 @@ public class ADTreePanel extends Panel implements EventListener<Event>
* @param AD_Tree_ID * @param AD_Tree_ID
* @param windowNo * @param windowNo
*/ */
public void initTree(int AD_Tree_ID, int windowNo) public boolean initTree(int AD_Tree_ID, int windowNo)
{ {
SimpleTreeModel.initADTree(tree, AD_Tree_ID, windowNo); if (this.AD_Tree_ID != AD_Tree_ID)
pnlSearch.initialise(); {
this.AD_Tree_ID = AD_Tree_ID;
SimpleTreeModel.initADTree(tree, AD_Tree_ID, windowNo);
pnlSearch.initialise();
return true;
}
return false;
} }
private void init() private void init()