1.1 --- a/src/java/isac/gui/IToWindowApplication.java	Tue Jul 12 14:04:36 2005 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,25 +0,0 @@
     1.4 -/*
     1.5 - * @author Walther Neuper, member of the ISAC-team, 
     1.6 - * Copyright (c) 2005 by Walther Neuper
     1.7 - * created Jul 11, 2005 3:09:22 PM
     1.8 - * Institute for Softwaretechnology, Graz University of Technology, Austria.
     1.9 - * 
    1.10 - * Use is subject to PGPL license terms.
    1.11 - */
    1.12 -package isac.gui;
    1.13 -
    1.14 -import isac.wsdialog.IUIAction;
    1.15 -
    1.16 -/**
    1.17 - * @author Alois Krichsteiger
    1.18 - *
    1.19 - * interface for the worksheet to communicate with the windowApplication
    1.20 - * (eg. set buttons, find a window under focus etc.)
    1.21 - * TODO should be implemented from the WindowApplication
    1.22 - */
    1.23 -public interface IToWindowApplication {
    1.24 -
    1.25 -    public void addToMenuBar(IUIAction action);
    1.26 -    //returns true if successful
    1.27 -    public boolean removeFromMenuBar(IUIAction action);
    1.28 -}

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/src/java/isac/gui/IToWorksheetUser.java	Tue Jul 12 14:08:01 2005 +0200
     2.3 @@ -0,0 +1,25 @@
     2.4 +/*
     2.5 + * @author Walther Neuper, member of the ISAC-team, 
     2.6 + * Copyright (c) 2005 by Walther Neuper
     2.7 + * created Jul 11, 2005 3:09:22 PM
     2.8 + * Institute for Softwaretechnology, Graz University of Technology, Austria.
     2.9 + * 
    2.10 + * Use is subject to PGPL license terms.
    2.11 + */
    2.12 +package isac.gui;
    2.13 +
    2.14 +import isac.wsdialog.IUIAction;
    2.15 +
    2.16 +/**
    2.17 + * @author Alois Krichsteiger
    2.18 + *
    2.19 + * interface for the worksheet to communicate with the windowApplication
    2.20 + * (eg. set buttons, find a window under focus etc.)
    2.21 + * TODO should be implemented from the WindowApplication
    2.22 + */
    2.23 +public interface IToWorksheetUser {
    2.24 +
    2.25 +    public void addToMenuBar(IUIAction action);
    2.26 +    //returns true if successful
    2.27 +    public boolean removeFromMenuBar(IUIAction action);
    2.28 +}

     3.1 --- a/src/java/isac/gui/WindowApplication.java	Tue Jul 12 14:04:36 2005 +0200
     3.2 +++ b/src/java/isac/gui/WindowApplication.java	Tue Jul 12 14:08:01 2005 +0200
     3.3 @@ -43,7 +43,7 @@
     3.4   *  
     3.5   */
     3.6  public class WindowApplication extends JFrame implements ActionListener,
     3.7 -        ILoginListener, IToWindowApplication {
     3.8 +        ILoginListener, IToWorksheetUser {
     3.9      static Logger logger = Logger.getLogger(WindowApplication.class.getName());
    3.10  
    3.11      /** Local settings for the user, WN0505 unused */
    3.12 @@ -361,7 +361,7 @@
    3.13       *            Requested ViewType for the CalcHead
    3.14       * @throws RemoteException
    3.15       */
    3.16 -    public void openNewWorksheet(final IToWindowApplication winAppl, final Formalization f, final int source)
    3.17 +    public void openNewWorksheet(final IToWorksheetUser winAppl, final Formalization f, final int source)
    3.18              throws RemoteException {
    3.19          JInternalFrame internalFrame = createInternalFrame("Worksheet", true,
    3.20                  true, true, false);

     4.1 --- a/src/java/isac/gui/Worksheet.java	Tue Jul 12 14:04:36 2005 +0200
     4.2 +++ b/src/java/isac/gui/Worksheet.java	Tue Jul 12 14:08:01 2005 +0200
     4.3 @@ -105,7 +105,7 @@
     4.4  
     4.5  	private Vector applicableTactics_;
     4.6  	
     4.7 -	private IToWindowApplication windowApplication_;
     4.8 +	private IToWorksheetUser windowApplication_;
     4.9  	
    4.10  	//Vector containing the actions that should be applied on all calcElements
    4.11  	private Vector dynamic_actions_on_calcElements_;
    4.12 @@ -212,7 +212,7 @@
    4.13  	 *            Where was the calculation started...
    4.14  	 * @see ...{isac.wsdialog.DGuide#STARTFROM_*}
    4.15  	 */
    4.16 -	public Worksheet(IToWindowApplication windowApplication, final Locale l, IWorksheetDialog dialogGuide, Formalization f,
    4.17 +	public Worksheet(IToWorksheetUser windowApplication, final Locale l, IWorksheetDialog dialogGuide, Formalization f,
    4.18  			int source) {
    4.19  		// LK 04.11.18 (1 line)
    4.20  	    windowApplication_ = windowApplication;