Revision: 1099
Author:   peterdb
Date:     2006-04-27 11:46:48 -0700 (Thu, 27 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/spring-rich-c/?rev=1099&view=rev

Log Message:
-----------
fix for RCP-243: make ApplicationLifeCycleAdvisor lifecycle methods empty

Modified Paths:
--------------
    
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/Application.java
    
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/config/ApplicationLifecycleAdvisor.java
    
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/support/DefaultApplicationWindow.java
    
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/security/support/DefaultSecurityControllerManagerTests.java
Modified: 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/Application.java
===================================================================
--- 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/Application.java
   2006-04-27 18:01:35 UTC (rev 1098)
+++ 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/Application.java
   2006-04-27 18:46:48 UTC (rev 1099)
@@ -132,6 +132,7 @@
     public void afterPropertiesSet() throws Exception {
         Assert.notNull(this.lifecycleAdvisor,
                 "The application advisor is required, for processing of 
application lifecycle events");
+        getLifecycleAdvisor().setApplication(this);
         getLifecycleAdvisor().onPreInitialize(this);
     }
 

Modified: 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/config/ApplicationLifecycleAdvisor.java
===================================================================
--- 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/config/ApplicationLifecycleAdvisor.java
    2006-04-27 18:01:35 UTC (rev 1098)
+++ 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/config/ApplicationLifecycleAdvisor.java
    2006-04-27 18:46:48 UTC (rev 1099)
@@ -93,7 +93,7 @@
     }
 
     public void onPreInitialize(Application application) {
-        this.application = application;
+        
     }
 
     public void onPreStartup() {
@@ -103,9 +103,12 @@
     public void onPostStartup() {
 
     }
+    
+    public void setOpeningWindow(ApplicationWindow window) {
+       this.openingWindow = window;
+    }
 
     public void onPreWindowOpen(ApplicationWindowConfigurer configurer) {
-        this.openingWindow = configurer.getWindow();
         configurer.setTitle(getApplication().getName());
         configurer.setImage(getApplication().getImage());
     }
@@ -175,4 +178,8 @@
         return this.eventExceptionHandler;
     }
 
+       public void setApplication(Application application) {
+               this.application = application;
+       }
+
 }
\ No newline at end of file

Modified: 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/support/DefaultApplicationWindow.java
===================================================================
--- 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/support/DefaultApplicationWindow.java
      2006-04-27 18:01:35 UTC (rev 1098)
+++ 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/application/support/DefaultApplicationWindow.java
      2006-04-27 18:46:48 UTC (rev 1099)
@@ -81,6 +81,7 @@
 
     public DefaultApplicationWindow(int number) {
         this.number = number;
+        getAdvisor().setOpeningWindow(this);
         getAdvisor().onPreWindowOpen(getWindowConfigurer());
         init();
         getAdvisor().onCommandsCreated(this);

Modified: 
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/security/support/DefaultSecurityControllerManagerTests.java
===================================================================
--- 
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/security/support/DefaultSecurityControllerManagerTests.java
    2006-04-27 18:01:35 UTC (rev 1098)
+++ 
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/security/support/DefaultSecurityControllerManagerTests.java
    2006-04-27 18:46:48 UTC (rev 1099)
@@ -41,7 +41,7 @@
         app.setApplicationContext( _applicationContext );
 
         ala.setStartingPageId( "start" );
-        ala.onPreInitialize( app );
+        ala.setApplication( app );
         app.openWindow( "start" );
 
         _testAuth1 = (TestAuthorizable) _applicationContext.getBean( 
"testAuth1" );


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
spring-rich-c-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs

Reply via email to