Merge pull request #193 from dalehenrich/issue_184

Issue #184, Issue #186, ++
dalehenrich · Sep 1, 2015 · 27ec323 · 27ec323
2 parents edba51e + 1d141c3
commit 27ec323
Show file tree

Hide file tree

Showing 386 changed files with 1,902 additions and 960 deletions.
diff --git a/...-Common.package/TDAlternateStretchWindowProperties.class/instance/caculateWindowBounds.st b/...-Common.package/TDAlternateStretchWindowProperties.class/instance/caculateWindowBounds.st
@@ -1,6 +1,6 @@
 window bounds
 caculateWindowBounds
-	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth diff lce projectList transcript |
+	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth diff lce projectList transcript classicClassDef classicClassButtonBar classicProtocol |
 	displayExtent := Display usableArea extent.
 	layoutExtent := displayExtent - (2 @ 2 * margin).
 	lo := margin.
@@ -27,7 +27,10 @@ caculateWindowBounds
 	evaluator := classes bottomLeft extent: (codeWidth * 0.80) @ shellHeight.
 	superclasses := classCategories topRight extent: lw @ topHeight.
 	classDef := superclasses topRight extent: (1.35 * lw) @ topHeight.
+	classicClassDef := superclasses topRight extent: (1.35 * lw) @ (topHeight * 0.65).
+	classicClassButtonBar := superclasses topRight + (0 @ (topHeight * 0.65)) extent: (1.35 * lw) @ (topHeight * 0.35).
 	instanceSelectors := classDef topRight extent: lw @ (topHeight + codeHeight).
+	classicProtocol := instanceSelectors.
 	classSelectors := instanceSelectors topRight extent: lw @ (topHeight + codeHeight).
 	configurations := lo extent: lw @ (lh // 2).
 	packages := configurations bottomLeft extent: lw @ (lh // 2).
@@ -49,6 +52,9 @@ caculateWindowBounds
 		at: #evaluator put: evaluator;
 		at: #superclasses put: superclasses;
 		at: #classDef put: classDef;
+		at: #classicClassDef put: classicClassDef;
+		at: #classicClassButtonBar put: classicClassButtonBar;
+		at: #classicProtocol put: classicProtocol;
 		at: #instanceSelectors put: instanceSelectors;
 		at: #classSelectors put: classSelectors;
 		at: #configurations put: configurations;

diff --git a/...Tode-Client-Common.package/TDAlternateStretchWindowProperties.class/methodProperties.json b/...Tode-Client-Common.package/TDAlternateStretchWindowProperties.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"caculateWindowBounds" : "dkh 3/21/2015 14:03" } }
+		"caculateWindowBounds" : "dkh 8/31/2015 17:28" } }
diff --git a/...-Client-Common.package/TDAlternateWindowProperties.class/instance/caculateWindowBounds.st b/...-Client-Common.package/TDAlternateWindowProperties.class/instance/caculateWindowBounds.st
@@ -1,6 +1,6 @@
 window bounds
 caculateWindowBounds
-	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth diff lcw lce projectList transcript |
+	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth diff lcw lce projectList transcript classicClassDef classicClassButtonBar classicProtocol |
 	displayExtent := Display usableArea extent.
 	layoutExtent := displayExtent - (2 @ 2 * margin).
 	lo := margin.
@@ -27,7 +27,10 @@ caculateWindowBounds
 	evaluator := classes bottomLeft extent: shellExtent.
 	superclasses := classCategories topRight extent: lw @ topHeight.
 	classDef := superclasses topRight extent: (1.5 * lw) @ topHeight.
+	classicClassDef := superclasses topRight extent: (1.5 * lw) @ (topHeight * 0.65).
+	classicClassButtonBar := superclasses topRight + (0 @ (topHeight * 0.65)) extent: (1.5 * lw) @ (topHeight * 0.35).
 	instanceSelectors := classDef topRight extent: lw @ topHeight.
+	classicProtocol := instanceSelectors.
 	classSelectors := instanceSelectors topRight extent: lw @ topHeight.
 	configurations := lo extent: lw @ (lh // 2).
 	packages := configurations bottomLeft extent: lw @ (lh // 2).
@@ -49,6 +52,9 @@ caculateWindowBounds
 		at: #evaluator put: evaluator;
 		at: #superclasses put: superclasses;
 		at: #classDef put: classDef;
+		at: #classicClassDef put: classicClassDef;
+		at: #classicClassButtonBar put: classicClassButtonBar;
+		at: #classicProtocol put: classicProtocol;
 		at: #instanceSelectors put: instanceSelectors;
 		at: #classSelectors put: classSelectors;
 		at: #configurations put: configurations;

diff --git a/...sitory/Tode-Client-Common.package/TDAlternateWindowProperties.class/methodProperties.json b/...sitory/Tode-Client-Common.package/TDAlternateWindowProperties.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"caculateWindowBounds" : "dkh 3/21/2015 14:04" } }
+		"caculateWindowBounds" : "dkh 8/31/2015 17:39" } }
diff --git a/...ode-Client-Common.package/TDJigsawWindowProperties.class/instance/caculateWindowBounds.st b/...ode-Client-Common.package/TDJigsawWindowProperties.class/instance/caculateWindowBounds.st
@@ -1,6 +1,6 @@
 window bounds
 caculateWindowBounds
-	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth diff lce projectList workspace transcript |
+	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth diff lce projectList workspace transcript classicClassDef classicClassButtonBar classicProtocol |
 	displayExtent := Display usableArea extent.
 	layoutExtent := displayExtent - (2 @ 2 * margin).
 	lo := margin.
@@ -24,6 +24,9 @@ caculateWindowBounds
 	evaluator := margin x @ (lh * 2) extent: (codeWidth * 0.80) @ shellHeight.
 	superclasses := lo extent: lw @ topHeight.
 	classDef := superclasses topRight extent: (1.35 * lw) @ topHeight.
+	classicClassDef := superclasses topRight extent: (1.35 * lw) @ (topHeight * 0.65).
+	classicClassButtonBar := superclasses topRight + (0 @ (topHeight * 0.65)) extent: (1.35 * lw) @ (topHeight * 0.35).
+	classicProtocol := classDef topRight extent: lw @ topHeight.
 	instanceSelectors := classDef topRight extent: lw @ (lh * 2).
 	classSelectors := instanceSelectors topRight extent: lw @ (lh * 2).
 	method := superclasses bottomLeft extent: (instanceSelectors topRight x - margin x) @ codeHeight.
@@ -50,6 +53,9 @@ caculateWindowBounds
 		at: #evaluator put: evaluator;
 		at: #superclasses put: superclasses;
 		at: #classDef put: classDef;
+		at: #classicClassDef put: classicClassDef;
+		at: #classicClassButtonBar put: classicClassButtonBar;
+		at: #classicProtocol put: classicProtocol;
 		at: #instanceSelectors put: instanceSelectors;
 		at: #classSelectors put: classSelectors;
 		at: #configurations put: configurations;

diff --git a/repository/Tode-Client-Common.package/TDJigsawWindowProperties.class/methodProperties.json b/repository/Tode-Client-Common.package/TDJigsawWindowProperties.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"caculateWindowBounds" : "dkh 3/21/2015 14:06" } }
+		"caculateWindowBounds" : "dkh 8/31/2015 17:22" } }
diff --git a/repository/Tode-Client-Common.package/TDShell.class/class/lookupPharoScript..st b/repository/Tode-Client-Common.package/TDShell.class/class/lookupPharoScript..st
@@ -0,0 +1,10 @@
+as yet unclassified
+lookupPharoScript: scriptFilename
+	{(self todeSysLocalPharoPath).
+	(self todeSysDefaultPharoPath)}
+		do: [ :rootPath | 
+			| path |
+			path := rootPath , scriptFilename.
+			path asFileReference exists
+				ifTrue: [ ^ path ] ].
+	self error: 'The script ' , scriptFilename printString , ' was not found in the local|default/pharo directories'
diff --git a/repository/Tode-Client-Common.package/TDShell.class/class/pharoPath.st b/repository/Tode-Client-Common.package/TDShell.class/class/pharoPath.st
@@ -0,0 +1,3 @@
+as yet unclassified
+pharoPath
+	^ 'pharo/'
diff --git a/repository/Tode-Client-Common.package/TDShell.class/class/todeSysDefaultPharoPath.st b/repository/Tode-Client-Common.package/TDShell.class/class/todeSysDefaultPharoPath.st
@@ -0,0 +1,3 @@
+as yet unclassified
+todeSysDefaultPharoPath
+	^self todeSysDefaultPath , self pharoPath
diff --git a/repository/Tode-Client-Common.package/TDShell.class/class/todeSysLocalPharoPath.st b/repository/Tode-Client-Common.package/TDShell.class/class/todeSysLocalPharoPath.st
@@ -0,0 +1,3 @@
+as yet unclassified
+todeSysLocalPharoPath
+	^self todeSysLocalPath , self pharoPath
diff --git a/repository/Tode-Client-Common.package/TDShell.class/instance/close.st b/repository/Tode-Client-Common.package/TDShell.class/instance/close.st
@@ -3,5 +3,5 @@ close
 	"close all windows"
 
 	windowStatus ifNil: [ ^ nil ].
-	windowStatus close.
+	self deferFlushEventNotificationDuring: [ windowStatus close ].
 	^ nil
diff --git a/...y/Tode-Client-Common.package/TDShell.class/instance/deferFlushEventNotificationDuring..st b/...y/Tode-Client-Common.package/TDShell.class/instance/deferFlushEventNotificationDuring..st
@@ -0,0 +1,13 @@
+built-ins
+deferFlushEventNotificationDuring: aBlock
+	"defer flushEventCache until all windows are closed."
+
+	| shouldFlushEventCache |
+	shouldFlushEventCache := false.
+	aBlock
+		on: TDShouldFlushEventCacheNotification
+		do: [ :ex | 
+			shouldFlushEventCache := true.
+			ex resume: false ].
+	shouldFlushEventCache
+		ifTrue: [ self topezClient flushEventCache ].
diff --git a/repository/Tode-Client-Common.package/TDShell.class/instance/executeUpdateClient..st b/repository/Tode-Client-Common.package/TDShell.class/instance/executeUpdateClient..st
@@ -5,16 +5,14 @@ executeUpdateClient: command
 	options
 		at: 'help'
 		ifAbsent: [ 
-			Metacello image
-				baseline: 'Metacello';
-				get;
-				load.
-			Metacello image
-				baseline: 'Tode';
-				get;
-				load.
+			| filePath todeLoadSource |
+			filePath := self class lookupPharoScript: 'todeLoad.st'.
+			filePath asFileReference readStreamDo: [ :fileStream | todeLoadSource := fileStream contents ].
+			Compiler evaluate: todeLoadSource.
+			false
+				ifTrue: [ Smalltalk snapshot: true andQuit: false ].
 			self class resetWorldMenu.
-			^'Client updated' ]
+			^ 'Client updated' ]
 		ifPresent: [ :ignored | 
 			^ (TDMultiLineText new
 				prompt: 'Help for ' , command command;
@@ -26,16 +24,7 @@ SYNOPSIS
   updateClient --help
 
 DESCRIPTION
-  Update the Metacello and tODE software on the client, using the following Metacello statements:
-
-    Metacello image
-      baseline: ''Metacello'';
-      get;
-      load.
-    Metacello image
-      baseline: ''Tode'';
-      get;
-      load.
+  Update the Metacello and tODE software on the client, using the todeLoad.st file in $GS_HOME/tode/sys/default|local/pharo.
 
 EXAMPLES
   updateClient --help

diff --git a/repository/Tode-Client-Common.package/TDShell.class/instance/windowIsClosing.st b/repository/Tode-Client-Common.package/TDShell.class/instance/windowIsClosing.st
@@ -1,10 +1,12 @@
 accessing
 windowIsClosing
-  | status |
-  windowStatus ifNil: [ ^ self ].
-  windowStatus unregisterShellWindow: self shellWindow.
-  status := windowStatus.
-  windowStatus := nil.
-  status windowIsClosing.
-  status shellWindows isEmpty
-    ifTrue: [ self exit ]
+	| status |
+	windowStatus ifNil: [ ^ self ].
+	self
+		deferFlushEventNotificationDuring: [ 
+			windowStatus unregisterShellWindow: self shellWindow.
+			status := windowStatus.
+			windowStatus := nil.
+			status close ].
+	status shellWindows isEmpty
+		ifTrue: [ self exit ]
diff --git a/repository/Tode-Client-Common.package/TDShell.class/methodProperties.json b/repository/Tode-Client-Common.package/TDShell.class/methodProperties.json
@@ -16,6 +16,7 @@
 		"importSessionDescriptionFrom:for:" : "dkh 4/12/2015 11:33",
 		"initialize" : "dkh 6/1/2014 19:06",
 		"lookupClientScripts:stoneName:" : "dkh 3/11/2015 15:54",
+		"lookupPharoScript:" : "dkh 8/16/2015 11:30",
 		"lookupServerScripts:" : "dkh 3/11/2015 15:54",
 		"lookupWindowLayout:" : "dkh 3/11/2015 15:56",
 		"onServer:do:" : "dkh 4/15/2015 10:40",
@@ -24,6 +25,7 @@
 		"openFrom:" : "dkh 5/28/2014 07:15",
 		"openOnSessionDescription:" : "dkh 4/12/2014 08:43",
 		"openSessionDescription:evaluate:" : "dkh 4/13/2014 08:30",
+		"pharoPath" : "dkh 8/16/2015 11:28",
 		"pharoWorldMenuOn:" : "dkh 3/25/2015 08:37",
 		"resetWorldMenu" : "dkh 3/21/2015 09:20",
 		"resizeTranscript:" : "dkh 4/4/2015 16:50",
@@ -51,10 +53,12 @@
 		"todeSessionToolsMenuOn:" : "dkh 3/21/2015 15:45",
 		"todeSysDefaultClientScriptsPath" : "dkh 3/11/2015 15:51",
 		"todeSysDefaultPath" : "dkh 11/14/2014 10:59",
+		"todeSysDefaultPharoPath" : "dkh 8/16/2015 11:29",
 		"todeSysDefaultServerScriptsPath" : "dkh 3/11/2015 12:24",
 		"todeSysDefaultWindowLayoutPath" : "dkh 3/11/2015 09:58",
 		"todeSysLocalClientScriptsPath" : "dkh 3/11/2015 15:51",
 		"todeSysLocalPath" : "dkh 11/14/2014 10:59",
+		"todeSysLocalPharoPath" : "dkh 8/16/2015 11:29",
 		"todeSysLocalServerScriptsPath" : "dkh 3/11/2015 12:23",
 		"todeSysLocalSessionDescriptionPath" : "dkh 3/11/2015 11:24",
 		"todeSysLocalWindowLayoutPath" : "dkh 3/11/2015 09:58",
@@ -81,11 +85,12 @@
 		"batchMode:" : "dkh 7/25/2014 16:40",
 		"builtInCommands" : "dkh 3/25/2015 21:30",
 		"builtIns" : "dkh 3/25/2015 21:38",
-		"close" : "dkh 3/22/2014 12:50",
+		"close" : "dkh 9/1/2015 09:17",
 		"collapse" : "dkh 3/22/2014 12:50",
 		"console" : "dkh 4/17/2015 11:20",
 		"debugMode" : "dkh 8/6/2014 09:36",
 		"debugMode:" : "dkh 7/25/2014 07:45",
+		"deferFlushEventNotificationDuring:" : "dkh 9/1/2015 09:16",
 		"displaySessionDescription" : "dkh 3/22/2014 13:16",
 		"doEndOfFile" : "dkh 11/19/2012 14:41",
 		"editSessionDescription" : "dkh 3/23/2014 10:01",
@@ -101,7 +106,7 @@
 		"executeRestoreBackup:" : "dkh 1/5/2014 14:03",
 		"executeScript:" : "dkh 3/26/2015 11:20",
 		"executeSessionDescription:" : "dkh 5/28/2014 07:15",
-		"executeUpdateClient:" : "dkh 3/25/2015 07:41",
+		"executeUpdateClient:" : "dkh 8/16/2015 11:48",
 		"exit" : "dkh 4/17/2015 06:30",
 		"expand" : "dkh 3/22/2014 12:51",
 		"exportClassToServer:" : "dkh 4/15/2015 13:31",
@@ -140,7 +145,7 @@
 		"testLogin" : "dkh 12/8/2013 09:25",
 		"topez" : "dkh 12/21/2012 12:43",
 		"topezClient" : "dkh 2/23/2013 07:36",
-		"windowIsClosing" : "dkh 3/21/2015 13:05",
+		"windowIsClosing" : "dkh 9/1/2015 09:18",
 		"windowLabel" : "dkh 3/22/2014 14:27",
 		"windowRegistration" : "dkh 12/21/2012 10:10",
 		"windowStatus" : "dkh 1/15/2013 12:02" } }
diff --git a/...Tode-Client-Common.package/TDSmallWindowProperties.class/instance/caculateWindowBounds.st b/...Tode-Client-Common.package/TDSmallWindowProperties.class/instance/caculateWindowBounds.st
@@ -1,6 +1,6 @@
 window bounds
 caculateWindowBounds
-	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth lcw lce projectList transcript |
+	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth lcw lce projectList transcript classicClassDef classicClassButtonBar classicProtocol |
 	displayExtent := Display usableArea extent.
 	layoutExtent := displayExtent - (2 @ 2 * margin).
 	lo := margin.
@@ -19,7 +19,10 @@ caculateWindowBounds
 	method := superclasses bottomLeft extent: codeWidth @ codeHeight.
 	evaluator := method bottomLeft extent: shellExtent.
 	classDef := superclasses topRight extent: (1.5 * lw) @ topHeight.
+	classicClassDef := superclasses topRight extent: (1.5 * lw) @ (topHeight * 0.65).
+	classicClassButtonBar := superclasses topRight + (0 @ (topHeight * 0.65)) extent: (1.5 * lw) @ (topHeight * 0.35).
 	instanceSelectors := classDef topRight extent: lw @ topHeight.
+	classicProtocol := instanceSelectors.
 	classSelectors := instanceSelectors topRight extent: lw @ topHeight.
 	implementors := method topRight extent: shellExtent x @ codeHeight.
 	inspector := evaluator topRight extent: shellExtent.
@@ -36,6 +39,9 @@ caculateWindowBounds
 		at: #evaluator put: evaluator;
 		at: #superclasses put: superclasses;
 		at: #classDef put: classDef;
+		at: #classicClassDef put: classicClassDef;
+		at: #classicClassButtonBar put: classicClassButtonBar;
+		at: #classicProtocol put: classicProtocol;
 		at: #instanceSelectors put: instanceSelectors;
 		at: #classSelectors put: classSelectors;
 		at: #implementors put: implementors;

diff --git a/repository/Tode-Client-Common.package/TDSmallWindowProperties.class/methodProperties.json b/repository/Tode-Client-Common.package/TDSmallWindowProperties.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"caculateWindowBounds" : "dkh 3/21/2015 14:06" } }
+		"caculateWindowBounds" : "dkh 8/31/2015 17:35" } }
diff --git a/...e-Client-Common.package/TDStandardWindowProperties.class/instance/caculateWindowBounds.st b/...e-Client-Common.package/TDStandardWindowProperties.class/instance/caculateWindowBounds.st
@@ -1,6 +1,6 @@
 window bounds
 caculateWindowBounds
-	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth le shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth projectList transcript |
+	| layoutExtent dict lw lo lh topHeight shellHeight browserHeight codeWidth le shellExtent classCategories classes evaluator superclasses classDef instanceSelectors classSelectors configurations packages implementors app1 app2 app3 app4 context debugger inspector method codeHeight appExtent displayExtent debuggerWidth projectList transcript classicClassDef classicClassButtonBar classicProtocol |
 	displayExtent := Display usableArea extent.
 	layoutExtent := displayExtent - (2 @ 2 * margin).
 	lo := margin.
@@ -21,8 +21,11 @@ caculateWindowBounds
 	classes := classCategories bottomLeft extent: le.
 	evaluator := classes bottomLeft extent: shellExtent.
 	superclasses := classCategories topRight extent: lw @ topHeight.
-	classDef := superclasses topRight extent: (codeWidth - lw) @ topHeight.
+	classDef := superclasses topRight extent: (codeWidth - lw) @ (topHeight * 0.65).
+	classicClassDef := superclasses topRight extent: (codeWidth - lw) @ (topHeight * 0.65).
+	classicClassButtonBar := superclasses topRight + (0 @ (topHeight * 0.65)) extent: (codeWidth - lw) @ (topHeight * 0.35).
 	instanceSelectors := classDef topRight extent: le.
+	classicProtocol := instanceSelectors.
 	classSelectors := instanceSelectors topRight extent: le.
 	configurations := lo extent: lw @ (lh // 2).
 	packages := configurations bottomLeft extent: lw @ (lh // 2).
@@ -44,6 +47,9 @@ caculateWindowBounds
 		at: #evaluator put: evaluator;
 		at: #superclasses put: superclasses;
 		at: #classDef put: classDef;
+		at: #classicClassDef put: classicClassDef;
+		at: #classicClassButtonBar put: classicClassButtonBar;
+		at: #classicProtocol put: classicProtocol;
 		at: #instanceSelectors put: instanceSelectors;
 		at: #classSelectors put: classSelectors;
 		at: #configurations put: configurations;

diff --git a/repository/Tode-Client-Common.package/TDStandardWindowProperties.class/methodProperties.json b/repository/Tode-Client-Common.package/TDStandardWindowProperties.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		"standardOne" : "dkh 5/31/2014 18:09" },
 	"instance" : {
-		"caculateWindowBounds" : "dkh 3/21/2015 14:01",
+		"caculateWindowBounds" : "dkh 8/31/2015 17:28",
 		"codeWidthFactor" : "dkh 5/31/2014 17:07",
 		"codeWidthFactor:" : "dkh 5/31/2014 17:07",
 		"extraLists" : "dkh 5/31/2014 17:07",

diff --git a/repository/Tode-Client-Common.package/TDTopezClient.class/instance/clearUserEditFlagFor..st b/repository/Tode-Client-Common.package/TDTopezClient.class/instance/clearUserEditFlagFor..st
@@ -0,0 +1,3 @@
+as yet unclassified
+clearUserEditFlagFor: aWindowId
+	self windowStatus clearUserEditFlagFor: aWindowId
diff --git a/...ient-Common.package/TDTopezClient.class/instance/editElement.aspect.label.inWindow.at..st b/...ient-Common.package/TDTopezClient.class/instance/editElement.aspect.label.inWindow.at..st
@@ -7,7 +7,16 @@ editElement: aClientElement aspect: aspectSelector label: labelString inWindow:
 	self currentWindowId: windowId.
 	label := labelString.
 	newWindow := (self windowStatus windowAt: windowId) isNil.
-	(win := self editorWindowAt: windowId) model
+	win := self editorWindowAt: windowId.
+	newWindow
+		ifFalse: [ 
+			| morph |
+			morph := win model activeEditor morph.
+			morph canDiscardEdits
+				ifFalse: [ 
+					morph promptForCancel
+						ifTrue: [ ^ self ] ] ].
+	win model
 		perform: aspectSelector;
 		clientElement: aClientElement;
 		windowId: windowId;

diff --git a/repository/Tode-Client-Common.package/TDTopezClient.class/instance/eventCache.st b/repository/Tode-Client-Common.package/TDTopezClient.class/instance/eventCache.st
@@ -0,0 +1,4 @@
+client element caching
+eventCache
+	eventCache ifNil: [ eventCache := TDEventsCache new ].
+	^ eventCache
diff --git a/repository/Tode-Client-Common.package/TDTopezClient.class/instance/retireClientElement..st b/repository/Tode-Client-Common.package/TDTopezClient.class/instance/retireClientElement..st
@@ -0,0 +1,3 @@
+client element caching
+retireClientElement: clientElement
+	self eventCache listAt: #clientElementRetirees add: clientElement clientElementOop