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

Merge e3ba7855a947

This commit is contained in:
Heng Sin Low 2013-06-26 22:38:11 +08:00
parent ac67fe763e 0ce064eec6
commit 05a6c860d8
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/compiere/util/Env.java
View File

@ -1250,7 +1250,7 @@ public final class Env
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (WindowNo > 0){ if (WindowNo > 0){
sb.append(getContext(ctx, WindowNo, "WindowName", false)).append(" "); sb.append(getContext(ctx, WindowNo, "_WinInfo_WindowName", false)).append(" ");
final String documentNo = getContext(ctx, WindowNo, "DocumentNo", false); final String documentNo = getContext(ctx, WindowNo, "DocumentNo", false);
final String value = getContext(ctx, WindowNo, "Value", false); final String value = getContext(ctx, WindowNo, "Value", false);
final String name = getContext(ctx, WindowNo, "Name", false); final String name = getContext(ctx, WindowNo, "Name", false);

2
org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
View File

@ -176,7 +176,7 @@ public final class AMenu extends CFrame
treePanel.initTree(AD_Tree_ID); treePanel.initTree(AD_Tree_ID);
// Translate // Translate
Env.setContext(m_ctx, m_WindowNo, "WindowName", Msg.getMsg(m_ctx, "Menu")); Env.setContext(m_ctx, m_WindowNo, "_WinInfo_WindowName", Msg.getMsg(m_ctx, "Menu"));
setTitle(Env.getHeader(m_ctx, m_WindowNo)); setTitle(Env.getHeader(m_ctx, m_WindowNo));
progressBar.setString(Msg.getMsg(m_ctx, "SelectProgram")); progressBar.setString(Msg.getMsg(m_ctx, "SelectProgram"));

2
org.adempiere.ui.swing/src/org/compiere/apps/APanel.java
View File

@ -907,7 +907,7 @@ public final class APanel extends CPanel
tabPanel.addTab(m_mWorkbench.getName(wb), m_mWorkbench.getIcon(wb), window, m_mWorkbench.getDescription(wb)); tabPanel.addTab(m_mWorkbench.getName(wb), m_mWorkbench.getIcon(wb), window, m_mWorkbench.getDescription(wb));
} }
// Used for Env.getHeader // Used for Env.getHeader
Env.setContext(m_ctx, m_curWindowNo, "WindowName", m_mWorkbench.getName(wb)); Env.setContext(m_ctx, m_curWindowNo, "_WinInfo_WindowName", m_mWorkbench.getName(wb));
} // Workbench Loop } // Workbench Loop

2
org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java
View File

@ -321,7 +321,7 @@ public class FormFrame extends CFrame
{ {
if (log.isLoggable(Level.INFO)) log.info("AD_Form_ID=" + AD_Form_ID + " - Class=" + className); if (log.isLoggable(Level.INFO)) log.info("AD_Form_ID=" + AD_Form_ID + " - Class=" + className);
Properties ctx = Env.getCtx(); Properties ctx = Env.getCtx();
Env.setContext(ctx, m_WindowNo, "WindowName", name); Env.setContext(ctx, m_WindowNo, "_WinInfo_WindowName", name);
setTitle(Env.getHeader(ctx, m_WindowNo)); setTitle(Env.getHeader(ctx, m_WindowNo));
this.gridTab = gridTab; this.gridTab = gridTab;

9
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
View File

@ -348,9 +348,12 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
if (tab == 0 && gridTab == null && m_findCancelled) if (tab == 0 && gridTab == null && m_findCancelled)
return false; return false;
} }
Env.setContext(ctx, curWindowNo, "WindowName", gridWindow.getName()); // WindowName variable preserved for backward compatibility
Env.setContext(ctx, curWindowNo, "AD_Window_ID", gridWindow.getAD_Window_ID()); // please consider it as DEPRECATED and use _WinInfo_WindowName instead
Env.setContext(ctx, curWindowNo, "AD_Window_UU", gridWindow.getAD_Window_UU()); Env.setContext(ctx, curWindowNo, "WindowName", gridWindow.getName()); // deprecated
Env.setContext(ctx, curWindowNo, "_WinInfo_WindowName", gridWindow.getName());
Env.setContext(ctx, curWindowNo, "_WinInfo_AD_Window_ID", gridWindow.getAD_Window_ID());
Env.setContext(ctx, curWindowNo, "_WinInfo_AD_Window_UU", gridWindow.getAD_Window_UU());
if (gridTab != null) if (gridTab != null)
gridTab.getTableModel().setChanged(false); gridTab.getTableModel().setChanged(false);

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
View File

@ -646,7 +646,7 @@ public final class AEnv
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (WindowNo > 0){ if (WindowNo > 0){
sb.append(Env.getContext(ctx, WindowNo, "WindowName", false)).append(" "); sb.append(Env.getContext(ctx, WindowNo, "_WinInfo_WindowName", false)).append(" ");
final String documentNo = Env.getContext(ctx, WindowNo, "DocumentNo", false); final String documentNo = Env.getContext(ctx, WindowNo, "DocumentNo", false);
final String value = Env.getContext(ctx, WindowNo, "Value", false); final String value = Env.getContext(ctx, WindowNo, "Value", false);
final String name = Env.getContext(ctx, WindowNo, "Name", false); final String name = Env.getContext(ctx, WindowNo, "Name", false);
@ -710,7 +710,7 @@ public final class AEnv
public static String getDialogHeader(Properties ctx, int windowNo) { public static String getDialogHeader(Properties ctx, int windowNo) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (windowNo > 0){ if (windowNo > 0){
sb.append(Env.getContext(ctx, windowNo, "WindowName", false)).append(" "); sb.append(Env.getContext(ctx, windowNo, "_WinInfo_WindowName", false)).append(" ");
final String documentNo = Env.getContext(ctx, windowNo, "DocumentNo", false); final String documentNo = Env.getContext(ctx, windowNo, "DocumentNo", false);
final String value = Env.getContext(ctx, windowNo, "Value", false); final String value = Env.getContext(ctx, windowNo, "Value", false);
final String name = Env.getContext(ctx, windowNo, "Name", false); final String name = Env.getContext(ctx, windowNo, "Name", false);

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
View File

@ -355,7 +355,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
linkDiv.appendChild(reportLink); linkDiv.appendChild(reportLink);
south.appendChild(linkDiv); south.appendChild(linkDiv);
//m_WindowNo //m_WindowNo
int AD_Window_ID = Env.getContextAsInt(Env.getCtx(), m_reportEngine.getWindowNo(), "AD_Window_ID", true); int AD_Window_ID = Env.getContextAsInt(Env.getCtx(), m_reportEngine.getWindowNo(), "_WinInfo_AD_Window_ID", true);
int AD_Process_ID = m_reportEngine.getPrintInfo() != null ? m_reportEngine.getPrintInfo().getAD_Process_ID() : 0; int AD_Process_ID = m_reportEngine.getPrintInfo() != null ? m_reportEngine.getPrintInfo().getAD_Process_ID() : 0;
updateToolbarAccess(AD_Window_ID, AD_Process_ID); updateToolbarAccess(AD_Window_ID, AD_Process_ID);