test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-04 20:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refs #536 (Переход в уже открытый экран вместо открытия нового)

Browse Source
This commit is contained in:
Konstantin Devyatkin 2011-05-06 11:31:48 +00:00
parent 55c699b1fb
commit 7f5bd6d282
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/web/src/com/haulmont/cuba/web/WebWindowManager.java
View File

@ -50,6 +50,7 @@ public class WebWindowManager extends WindowManager {
protected final Map<WindowBreadCrumbs,Stack<Map.Entry<Window,Integer>>> stacks = new HashMap<WindowBreadCrumbs,Stack<Map.Entry<Window,Integer>>>();
protected final Map<Window, WindowOpenMode> windowOpenMode = new LinkedHashMap<Window, WindowOpenMode>();
protected final Map<Window,Integer> windows = new HashMap<Window,Integer>();
protected final Map<Layout, WindowBreadCrumbs> fakeTabs = new HashMap<Layout, WindowBreadCrumbs>();
}
protected App app;
@ -90,6 +91,10 @@ public class WebWindowManager extends WindowManager {
return getCurrentWindowData().tabs;
}
protected Map<Layout, WindowBreadCrumbs> getFakeTabs() {
return getCurrentWindowData().fakeTabs;
}
private Map<Window, WindowOpenMode> getWindowOpenMode() {
return getCurrentWindowData().windowOpenMode;
}
@ -177,7 +182,13 @@ public class WebWindowManager extends WindowManager {
}
protected Layout findTab(Integer hashCode) {
Set<Map.Entry<Layout, WindowBreadCrumbs>> set = getTabs().entrySet();
Set<Map.Entry<Layout, WindowBreadCrumbs>> set = getFakeTabs().entrySet();
for (Map.Entry<Layout, WindowBreadCrumbs> entry : set) {
Window currentWindow = entry.getValue().getCurrentWindow();
if (hashCode.equals(getWindowHashCode(currentWindow)))
return entry.getKey();
}
set = getTabs().entrySet();
for (Map.Entry<Layout, WindowBreadCrumbs> entry : set) {
Window currentWindow = entry.getValue().getCurrentWindow();
if (hashCode.equals(getWindowHashCode(currentWindow)))
@ -235,7 +246,7 @@ public class WebWindowManager extends WindowManager {
final Window oldWindow = oldBreadCrumbs.getCurrentWindow();
Layout l = new VerticalLayout();
appWindow.getTabSheet().replaceComponent(tab, l);
getCurrentWindowData().tabs.put(l, oldBreadCrumbs);
getCurrentWindowData().fakeTabs.put(l, oldBreadCrumbs);
oldWindow.closeAndRun("mainMenu", new Runnable() {
public void run() {
putToWindowMap(oldWindow, hashCode);
@ -330,8 +341,6 @@ public class WebWindowManager extends WindowManager {
final Layout layout = createNewTabLayout(window, caption, description, appWindow, breadCrumbs);
getTabs().put(layout, breadCrumbs);
return layout;
}
@ -359,9 +368,10 @@ public class WebWindowManager extends WindowManager {
tab = findTab(hashCode);
if (tab != null) {
tabSheet.replaceComponent(tab, layout);
tabSheet.removeComponent(tab);
getTabs().put(layout, (WindowBreadCrumbs) components[0]);
removeFromWindowMap(getTabs().get(tab).getCurrentWindow());
getTabs().remove(tab);
removeFromWindowMap(getFakeTabs().get(tab).getCurrentWindow());
getFakeTabs().remove(tab);
newTab = tabSheet.getTab(layout);
} else {
newTab = tabSheet.addTab(layout, formatTabCaption(caption, description), null);

9
modules/web/src/com/haulmont/cuba/web/toolkit/ui/ActionsTabSheet.java
View File

@ -57,8 +57,13 @@ public class ActionsTabSheet extends com.vaadin.ui.TabSheet implements Action.Co
if (tab != null) {
while (openedComponents.removeElement(tab))
openedComponents.removeElement(tab);
if ((!openedComponents.empty()) && (selected.equals(tab)))
setSelectedTab(openedComponents.pop());
if ((!openedComponents.empty()) && (selected.equals(tab))) {
Component c = openedComponents.pop();
while (!components.contains(c) && !openedComponents.isEmpty())
c = openedComponents.pop();
setSelectedTab(c);
}
closeHandler.onTabClose(this, tab);
}
} else {