[Compiere-cvslog] CVS: client/Src/org/compiere/apps AMenu.java,1.57,1.58

[Jorg J. <jj...@us...>]

Update of /cvsroot/compiere/client/Src/org/compiere/apps
In directory sc8-pr-cvs1:/tmp/cvs-serv15201/Src/org/compiere/apps

Modified Files:
	AMenu.java 
Log Message:
.

Index: AMenu.java
===================================================================
RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/AMenu.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** AMenu.java	31 Jul 2003 07:05:25 -0000	1.57
--- AMenu.java	31 Jul 2003 07:15:18 -0000	1.58
***************
*** 10,16 ****
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
!  * Contributor(s):
!  * Yves Sandfort (RFE: 732605)
!  * ____________________________.
   *****************************************************************************/
  package org.compiere.apps;
--- 10,14 ----
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
!  * Contributor(s): ______________________________________.
   *****************************************************************************/
  package org.compiere.apps;
***************
*** 370,418 ****
  
  	/**
- 	 *  Get Note Window (to get correct window if customized)
- 	 *  @return window ID
- 	 */
- 	private int getNoteMenuID()
- 	{
- 		// Request Table
- 		int AD_Table_ID = 389;
- 		int AD_Window_ID = 0;
- 		int retValue = 0;
- 		String sql = "SELECT AD_Window_ID FROM AD_Table "
- 			+ "WHERE AD_Table_ID=?";
- 		try
- 		{
- 			PreparedStatement pstmt = DB.prepareStatement(sql);
- 			pstmt.setInt(1, AD_Table_ID);
- 			ResultSet rs = pstmt.executeQuery();
- 			if (rs.next())
- 				AD_Window_ID = rs.getInt(1);
- 			rs.close();
- 			pstmt.close();
- 		}
- 		catch (SQLException e)
- 		{
- 			Log.error ("AMenu.getRequestMenuID", e);
- 		}
- 		sql = "SELECT AD_Menu_ID FROM AD_Menu "
- 			+ "WHERE AD_Window_ID=?";
- 		try
- 		{
- 			PreparedStatement pstmt = DB.prepareStatement(sql);
- 			pstmt.setInt(1, AD_Window_ID);
- 			ResultSet rs = pstmt.executeQuery();
- 			if (rs.next())
- 				retValue = rs.getInt(1);
- 			rs.close();
- 			pstmt.close();
- 		}
- 		catch (SQLException e)
- 		{
- 			Log.error ("AMenu.getRequestMenuID", e);
- 		}
- 		return retValue;
- 	}	//	getRequestMenuID
- 
- 	/**
  	 *  Get number of open Notes
  	 *  @return bumber of notes
--- 368,371 ----
***************
*** 447,501 ****
  	private void gotoNotes()
  	{
! 		//int MENU_NOTE = 233;
! 		(new AMenuStartItem (getNoteMenuID(), true, Msg.translate(m_ctx, "AD_Note_ID"), this)).start();		//	async load
  	}   //  gotoMessage
  
  	/**
! 	 *  Get Requests Window (to get correct window if customized)
! 	 *  @return window ID
! 	 */
! 	private int getRequestMenuID()
! 	{
! 		// Request Table
! 		int AD_Table_ID = 417;
! 		int AD_Window_ID = 0;
! 		int retValue = 0;
! 		String sql = "SELECT AD_Window_ID FROM AD_Table "
! 			+ "WHERE AD_Table_ID=?";
! 		try
! 		{
! 			PreparedStatement pstmt = DB.prepareStatement(sql);
! 			pstmt.setInt(1, AD_Table_ID);
! 			ResultSet rs = pstmt.executeQuery();
! 			if (rs.next())
! 				AD_Window_ID = rs.getInt(1);
! 			rs.close();
! 			pstmt.close();
! 		}
! 		catch (SQLException e)
! 		{
! 			Log.error ("AMenu.getRequestMenuID", e);
! 		}
! 		sql = "SELECT AD_Menu_ID FROM AD_Menu "
! 			+ "WHERE AD_Window_ID=?";
! 		try
! 		{
! 			PreparedStatement pstmt = DB.prepareStatement(sql);
! 			pstmt.setInt(1, AD_Window_ID);
! 			ResultSet rs = pstmt.executeQuery();
! 			if (rs.next())
! 				retValue = rs.getInt(1);
! 			rs.close();
! 			pstmt.close();
! 		}
! 		catch (SQLException e)
! 		{
! 			Log.error ("AMenu.getRequestMenuID", e);
! 		}
! 		return retValue;
! 	}	//	getRequestMenuID
! 
! 	/**
! 	 *  Get Number of open Requests
  	 *  @return number of requests
  	 */
--- 400,409 ----
  	private void gotoNotes()
  	{
! 		int MENU_NOTE = 233;
! 		(new AMenuStartItem (MENU_NOTE, true, Msg.translate(m_ctx, "AD_Note_ID"), this)).start();		//	async load
  	}   //  gotoMessage
  
  	/**
! 	 *  Ger Number of open Requests
  	 *  @return number of requests
  	 */
***************
*** 529,533 ****
  	private void gotoTasks()
  	{
! 		(new AMenuStartItem (getRequestMenuID(), true, Msg.translate(m_ctx, "R_Request_ID"), this)).start();		//	async load
  	}   //  gotoTasks
  
--- 437,442 ----
  	private void gotoTasks()
  	{
! 		int MENU_REQUEST = 237;
! 		(new AMenuStartItem (MENU_REQUEST, true, Msg.translate(m_ctx, "R_Request_ID"), this)).start();		//	async load
  	}   //  gotoTasks