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

Revert commit 6736, because tabInclude don't work

This commit is contained in:
vpj-cd 2008-10-27 19:58:16 +00:00
parent 467d7bcb05
commit 29655f4656
1 changed files with 9 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
client/src/org/compiere/grid/VTabbedPane.java
View File

@ -53,10 +53,6 @@ public class VTabbedPane extends CTabbedPane
/** Disabled Icon */ /** Disabled Icon */
private static Icon s_disabledIcon = null; private static Icon s_disabledIcon = null;
private ArrayList<Component> components = new ArrayList<Component>();
private ArrayList<GridTab> gTabs = new ArrayList<GridTab>();
private ArrayList<String> tabNames = new ArrayList<String>();
/** /**
* toString * toString
* @return info * @return info
@ -76,13 +72,8 @@ public class VTabbedPane extends CTabbedPane
public void addTab(String tabName, GridTab gTab, Component tabElement) public void addTab(String tabName, GridTab gTab, Component tabElement)
{ {
int index = getTabCount(); int index = getTabCount();
tabNames.add(tabName);
gTabs.add(gTab);
components.add(tabElement);
super.addTab (tabName, gTab.getIcon(), super.addTab (tabName, gTab.getIcon(),
tabElement, gTab.getDescription()); tabElement, gTab.getDescription());
ArrayList<String> dependents = gTab.getDependentOn(); ArrayList<String> dependents = gTab.getDependentOn();
for (int i = 0; i < dependents.size(); i++) for (int i = 0; i < dependents.size(); i++)
{ {
@ -95,35 +86,7 @@ public class VTabbedPane extends CTabbedPane
setDisabledIconAt(index, s_disabledIcon); setDisabledIconAt(index, s_disabledIcon);
} // addTab } // addTab
private void hideTab(String tabName) {
int tabIndex = indexOfTab(tabName);
if ( tabIndex != -1 )
removeTabAt(tabIndex);
}
private void showTab(String tabName) {
int insertAt = 0;
if ( indexOfTab(tabName) != -1 ) // already visible
return;
for ( int i = 0; i < tabNames.size(); i++ )
{
String name = tabNames.get(i);
if ( name.equals(tabName))
{
insertTab (tabName, gTabs.get(i).getIcon(),
components.get(i), gTabs.get(i).getDescription(), insertAt);
break;
}
if ( indexOfTab(name) != -1 ) // tab is visible, insert after
insertAt ++;
}
}
/** /**
* Set Workbench - or Window * Set Workbench - or Window
* @param isWorkbench * @param isWorkbench
@ -306,17 +269,17 @@ public class VTabbedPane extends CTabbedPane
if (process) if (process)
{ {
log.config(columnName == null ? "" : columnName); log.config(columnName == null ? "" : columnName);
for (int i = 0; i < components.size(); i++) for (int i = 0; i < getTabCount(); i++)
{ {
Component c = components.get(i); Component c = getComponentAt(i);
if (c instanceof GridController) if (c instanceof GridController)
{ {
GridController gc = (GridController)c; GridController gc = (GridController)c;
boolean display = isDisplay(gc); String logic = gc.getDisplayLogic();
if ( display ) boolean display = true;
showTab(tabNames.get(i)); if (logic != null && logic.length() > 0)
else display = Evaluator.evaluateLogic(gc, logic);
hideTab(tabNames.get(i)); setEnabledAt(i, display);
} }
} }
} }