--- a/ApplicationModel.st	Mon Jun 07 11:34:24 2004 +0200
+++ b/ApplicationModel.st	Wed Jun 09 18:24:31 2004 +0200
@@ -1529,6 +1529,91 @@
     "Modified: / 31.7.1998 / 17:55:31 / cg"
 ! !
 
+!ApplicationModel methodsFor:'hooks'!
+
+commonPostBuild
+    "a common hook for postBuildWith: and postBuildAsSubcanvasWith:."
+!
+
+commonPostOpen
+    "a common hook for postOpenWith: and postOpenAsSubcanvasWith:."
+!
+
+commonPreBuild
+    "a common hook for preBuildWith: and preBuildAsSubcanvasWith:."
+!
+
+postApplicationProcessCreate:newProcess windowGroup:newGroup
+    "this is sent whenever a new application is launched from this app, 
+     which forks its own windowGroup process. Allows for process group management,
+     or process-global exception handlers to be installed.
+     Nothing done here - to be redefined in concrete applications"
+
+!
+
+postBuildAsSubcanvasWith:aBuilder
+    "this is sent after an interface is built from a spec as subcanvas.
+     Can be redefined in subclasses for additional setup after
+     the subcanvas view has been built, but not yet opened."
+
+    |sameApp|
+
+    sameApp := aBuilder application == aBuilder window topView application.
+
+    "/ If I am opened as subcanvas in another application
+    "/ then treat this like a regular open.
+    "/ otherwise ignore it.
+    sameApp ifFalse:[
+        self postBuildWith:aBuilder.
+    ] ifTrue:[
+        self commonPostBuild.
+    ].
+
+    "Modified: / 8.7.1998 / 18:28:55 / cg"
+!
+
+postBuildWith:aBuilder
+    "this is sent after an interface is built from a spec.
+     Can be redefined in subclasses for additional setup after
+     the view has been built, but not yet opened."
+
+    self commonPostBuild
+!
+
+postOpenAsSubcanvasWith:aBuilder
+    "this is sent after the applications window is opened inside another application.
+     Can be redefined in subclasses for actions after opening the view."
+
+    self commonPostOpen
+!
+
+postOpenWith:aBuilder
+    "this is sent after the applications main window is opened.
+     Can be redefined in subclasses for actions after opening the view."
+
+    self commonPostOpen
+!
+
+preBuildAsSubcanvasWith:aBuilder
+    "this is sent before an interface is built from a spec as a subcanvas.
+     Can be redefined for apps which need to be informed about that."
+
+    self commonPreBuild
+!
+
+preBuildWith:aBuilder
+    "this is sent before an interface is built from a spec.
+     Can be redefined in subclasses.
+     mhmh - what should this do here ?"
+
+    self commonPreBuild
+!
+
+preOpenWith:aBuilder
+    "this is sent before the applications main window is opened.
+     Can be redefined in subclasses for actions right before opening the view."
+! !
+
 !ApplicationModel methodsFor:'initialization'!
 
 addTopViewsToCurrentProject
@@ -2211,69 +2296,6 @@
 
     self addTopViewsToCurrentProject.
     self postOpenWith:builder
-!
-
-postApplicationProcessCreate:newProcess windowGroup:newGroup
-    "this is sent whenever a new application is launched from this app, 
-     which forks its own windowGroup process. Allows for process group management,
-     or process-global exception handlers to be installed.
-     Nothing done here - to be redefined in concrete applications"
-
-!
-
-postBuildAsSubcanvasWith:aBuilder
-    "this is sent after an interface is built from a spec as subcanvas.
-     Can be redefined in subclasses for additional setup after
-     the subcanvas view has been built, but not yet opened."
-
-    |sameApp|
-
-    sameApp := aBuilder application == aBuilder window topView application.
-
-    "/ If I am opened as subcanvas in another application
-    "/ then treat this like a regular open.
-    "/ otherwise ignore it.
-    sameApp ifFalse:[
-        self postBuildWith:aBuilder.
-    ]
-
-    "Modified: / 8.7.1998 / 18:28:55 / cg"
-!
-
-postBuildWith:aBuilder
-    "this is sent after an interface is built from a spec.
-     Can be redefined in subclasses for additional setup after
-     the view has been built, but not yet opened."
-!
-
-postOpenAsSubcanvasWith:aBuilder
-    "this is sent after the applications window is opened inside another application.
-     Can be redefined in subclasses for actions after opening the view."
-!
-
-postOpenWith:aBuilder
-    "this is sent after the applications main window is opened.
-     Can be redefined in subclasses for actions after opening the view."
-
-
-!
-
-preBuildAsSubcanvasWith:aBuilder
-    "this is sent before an interface is built from a spec as a subcanvas.
-     Can be redefined for apps which need to be informed about that."
-
-    "Modified: / 8.7.1998 / 18:29:34 / cg"
-!
-
-preBuildWith:aBuilder
-    "this is sent before an interface is built from a spec.
-     Can be redefined in subclasses.
-     mhmh - what should this do here ?"
-!
-
-preOpenWith:aBuilder
-    "this is sent before the applications main window is opened.
-     Can be redefined in subclasses for actions right before opening the view."
 ! !
 
 !ApplicationModel methodsFor:'private'!
@@ -2769,7 +2791,7 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.205 2004-06-07 09:24:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.206 2004-06-09 16:24:31 cg Exp $'
 ! !
 
 ApplicationModel initialize!