RK 060711 some errors from merging fixed
authorrkoenig
Tue, 11 Jul 2006 14:48:17 +0200
changeset 33137f960c2aafe8
parent 3312 4528577eecc0
child 3314 b523840f094e
RK 060711 some errors from merging fixed
src/java/isac/session/Session.java
src/java/isac/users/UserManager.java
     1.1 --- a/src/java/isac/session/Session.java	Tue Jul 11 14:37:10 2006 +0200
     1.2 +++ b/src/java/isac/session/Session.java	Tue Jul 11 14:48:17 2006 +0200
     1.3 @@ -13,6 +13,15 @@
     1.4  import isac.browserdialog.MethodDialog;
     1.5  import isac.browserdialog.TheoryDialog;
     1.6  import isac.browserdialog.ExampleDialog;
     1.7 +import isac.wsdialog.WSDialogManager;
     1.8 +import isac.wsdialog.IContextProvider;
     1.9 +import java.util.HashMap;
    1.10 +import java.util.Map;
    1.11 +import isac.util.formulae.ContextTheory;
    1.12 +import isac.util.formulae.ContextProblem;
    1.13 +import isac.util.formulae.ContextMethod;
    1.14 +import isac.util.formulae.ContextExample;
    1.15 +import isac.browserdialog.IContextPresenter;
    1.16  
    1.17  /**
    1.18   * This class contains all browser dialoges and a worksheet dialog
    1.19 @@ -38,6 +47,8 @@
    1.20  	private ExampleDialog example_dialog_;
    1.21  
    1.22  	private WSDialogManager ws_dialog_manager_;
    1.23 +	
    1.24 +	private Map wsid_map_exampleid_ = new HashMap();
    1.25  
    1.26  	/**
    1.27  	 * Constructor
    1.28 @@ -46,7 +57,7 @@
    1.29  	 * 
    1.30  	 * @param session_id the session id of the session to create
    1.31  	 */
    1.32 -	public Session(String session_id) {
    1.33 +	public Session(String session_id) throws RemoteException{
    1.34  		// TODO RK060710 implement me
    1.35  		System.out.println("TODO: isac.session.Session#Session(String): implement me!");
    1.36  		System.exit(-1);
    1.37 @@ -114,8 +125,9 @@
    1.38  
    1.39  	/**
    1.40  	 * returns a IContextProvider, which acts as the interface between
    1.41 -	 * the the browser dialoges and the active worksheet dialog. The
    1.42 -	 * IContextProvider is implemented by the Worksheetdialog. The returned
    1.43 +	 * the the browser dialoges and the active worksheet dialog. This interface
    1.44 +	 * can only be used by the browser dialoges to access the active worksheet dailog.
    1.45 +	 * The IContextProvider is implemented by the Worksheetdialog. The returned
    1.46  	 * interface belogs to the currently active WorksheetDialog. If no
    1.47  	 * WorksheetDialog is active at the moment (e.g. if there is no opened
    1.48  	 * WorksheetDialog at all), null is returned. The WSDialogManager knows
    1.49 @@ -130,4 +142,73 @@
    1.50  		System.exit(-1);
    1.51  		return null;
    1.52  	}
    1.53 +	
    1.54 +	/**
    1.55 +	 * returns a IContextPresenter, which acts as the interface between
    1.56 +	 * the the browser dialoges and the active worksheet dialog. This interface
    1.57 +	 * can only be used by the active worksheet dialoges to commnicate to the 
    1.58 +	 * method dialog.
    1.59 +	 * The IContextPresenter interface is implemented by all browser dialoges. The 
    1.60 +	 * returned interface belogs to the MethodDialog of this session.
    1.61 +	 * 
    1.62 +	 * @return the IContextPresenter interface of the MethodDialog of this Session
    1.63 +	 */
    1.64 +	public IContextPresenter getContextPresenter(ContextMethod context) {
    1.65 +		// TODO RK060710 implement me
    1.66 +		System.out.println("TODO: isac.session.Session#getContextProvider(): implement me!");
    1.67 +		System.exit(-1);
    1.68 +		return null;
    1.69 +	}
    1.70 +
    1.71 +	/**
    1.72 +	 * returns a IContextPresenter, which acts as the interface between
    1.73 +	 * the the browser dialoges and the active worksheet dialog. This interface
    1.74 +	 * can only be used by the active worksheet dialoges to commnicate to the 
    1.75 +	 * method dialog.
    1.76 +	 * The IContextPresenter interface is implemented by all browser dialoges. The 
    1.77 +	 * returned interface belogs to the ProblemDialog of this session.
    1.78 +	 * 
    1.79 +	 * @return the IContextPresenter interface of the ProblemDialog of this Session
    1.80 +	 */
    1.81 +	public IContextPresenter getContextPresenter(ContextProblem context) {
    1.82 +		// TODO RK060710 implement me
    1.83 +		System.out.println("TODO: isac.session.Session#getContextProvider(): implement me!");
    1.84 +		System.exit(-1);
    1.85 +		return null;
    1.86 +	}
    1.87 +	
    1.88 +	/**
    1.89 +	 * returns a IContextPresenter, which acts as the interface between
    1.90 +	 * the the browser dialoges and the active worksheet dialog. This interface
    1.91 +	 * can only be used by the active worksheet dialoges to commnicate to the 
    1.92 +	 * method dialog.
    1.93 +	 * The IContextPresenter interface is implemented by all browser dialoges. The 
    1.94 +	 * returned interface belogs to the TheoryDialog of this session.
    1.95 +	 * 
    1.96 +	 * @return the IContextPresenter interface of the TheoryDialog of this Session
    1.97 +	 */
    1.98 +	public IContextPresenter getContextPresenter(ContextTheory context) {
    1.99 +		// TODO RK060710 implement me
   1.100 +		System.out.println("TODO: isac.session.Session#getContextProvider(): implement me!");
   1.101 +		System.exit(-1);
   1.102 +		return null;
   1.103 +	}
   1.104 +	
   1.105 +	/**
   1.106 +	 * returns a IContextPresenter, which acts as the interface between
   1.107 +	 * the the browser dialoges and the active worksheet dialog. This interface
   1.108 +	 * can only be used by the active worksheet dialoges to commnicate to the 
   1.109 +	 * method dialog.
   1.110 +	 * The IContextPresenter interface is implemented by all browser dialoges. The 
   1.111 +	 * returned interface belogs to the ExampleDialog of this session.
   1.112 +	 * 
   1.113 +	 * @return the IContextPresenter interface of the ExampleDialog of this Session
   1.114 +	 */
   1.115 +	public IContextPresenter getContextPresenter(ContextExample context) {
   1.116 +		// TODO RK060710 implement me
   1.117 +		System.out.println("TODO: isac.session.Session#getContextProvider(): implement me!");
   1.118 +		System.exit(-1);
   1.119 +		return null;
   1.120 +	}
   1.121 +	
   1.122  }
     2.1 --- a/src/java/isac/users/UserManager.java	Tue Jul 11 14:37:10 2006 +0200
     2.2 +++ b/src/java/isac/users/UserManager.java	Tue Jul 11 14:48:17 2006 +0200
     2.3 @@ -25,6 +25,8 @@
     2.4  	 * only instance of this class.
     2.5  	 */
     2.6  	private UserManager() throws RemoteException {
     2.7 +		System.out.println("TODO: isac.user.UserManager#UserManager(): implement me!");
     2.8 +		System.exit(-1);
     2.9  		// TODO RK060710 implement me
    2.10  	}
    2.11  
    2.12 @@ -41,6 +43,8 @@
    2.13  	 */
    2.14  	public Session login(String username, String pass) {
    2.15  		// TODO RK060710 implement me
    2.16 +		System.out.println("TODO: isac.user.UserManager#login(String,String): implement me!");
    2.17 +		System.exit(-1);
    2.18  		return null;
    2.19  	}
    2.20  
    2.21 @@ -54,6 +58,8 @@
    2.22  	 */
    2.23  	public User getUser(String session_id) {
    2.24  		// TODO RK060710 implement me
    2.25 +		System.out.println("TODO: isac.user.UserManager#getUser(String): implement me!");
    2.26 +		System.exit(-1);
    2.27  		return null;
    2.28  	}
    2.29  
    2.30 @@ -67,6 +73,8 @@
    2.31  	 */
    2.32  	public User getUsername(String session_id) {
    2.33  		// TODO RK060710 implement me
    2.34 +		System.out.println("TODO: isac.user.UserManager#getUserName(String): implement me!");
    2.35 +		System.exit(-1);
    2.36  		return null;
    2.37  	}
    2.38