Merge pull request #1344 from instantiations/default-manager

Modifies WAServerManager to support subclasses to be defined as default
SeasideSt · Mar 4, 2023 · 5c41593 · 5c41593
2 parents 4c61fff + f66f47d
commit 5c41593
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 8 deletions.
diff --git a/repository/Seaside-Core.package/WAServerManager.class/class/beDefault.st b/repository/Seaside-Core.package/WAServerManager.class/class/beDefault.st
@@ -0,0 +1,5 @@
+configuring
+beDefault
+	"Set an instance of receiver to be the default Server Manager."
+
+	self setDefault: self new
diff --git a/repository/Seaside-Core.package/WAServerManager.class/class/default.st b/repository/Seaside-Core.package/WAServerManager.class/class/default.st
@@ -1,4 +1,6 @@
 accessing
 default
-	default contents ifNil: [ default contents: self new ].
-	^ default contents
+
+	self initializeDefaultValueHolder.
+	Default contents ifNil: [ Default contents: self new ].
+	^ Default contents
diff --git a/repository/Seaside-Core.package/WAServerManager.class/class/initializeDefaultValueHolder.st b/repository/Seaside-Core.package/WAServerManager.class/class/initializeDefaultValueHolder.st
@@ -1,4 +1,4 @@
 class initialization
 initializeDefaultValueHolder
-	default isNil ifTrue: [ 
-		default := GRPlatform current newTransientValueHolder ]
+	Default isNil ifTrue: [ 
+		Default := GRPlatform current newTransientValueHolder ]
diff --git a/repository/Seaside-Core.package/WAServerManager.class/class/setDefault..st b/repository/Seaside-Core.package/WAServerManager.class/class/setDefault..st
@@ -0,0 +1,6 @@
+configuring
+setDefault: aWAServerManager
+	"Private - Sets aWAServerManager as the default instance of receiver."
+
+	self initializeDefaultValueHolder.
+	Default contents: aWAServerManager.
diff --git a/repository/Seaside-Core.package/WAServerManager.class/properties.json b/repository/Seaside-Core.package/WAServerManager.class/properties.json
@@ -2,11 +2,11 @@
 	"commentStamp" : "TorstenBergmann 9/18/2021 23:06",
 	"super" : "WAObject",
 	"category" : "Seaside-Core-Server",
-	"classinstvars" : [
-		"default"
-	],
+	"classinstvars" : [ ],
 	"pools" : [ ],
-	"classvars" : [ ],
+	"classvars" : [
+		"Default"
+	],
 	"instvars" : [
 		"adaptors"
 	],

diff --git a/repository/Seaside-Tests-Core.package/WAServerManagerTest.class/instance/testBeDefault.st b/repository/Seaside-Tests-Core.package/WAServerManagerTest.class/instance/testBeDefault.st
@@ -0,0 +1,13 @@
+tests
+testBeDefault
+
+	| previous |
+	previous := WAServerManager default.
+	[ 
+    	WATestServerManager beDefault.
+    	self
+		  assert: WAServerManager default class
+		  equals: WATestServerManager
+	 ] ensure: [ 
+		WAServerManager setDefault: previous 
+	 ]
diff --git a/repository/Seaside-Tests-Core.package/WAServerManagerTest.class/instance/testSetDefault.st b/repository/Seaside-Tests-Core.package/WAServerManagerTest.class/instance/testSetDefault.st
@@ -0,0 +1,13 @@
+tests
+testSetDefault
+
+	| previous |
+	previous := WAServerManager default.
+	[ 
+		WAServerManager setDefault: WATestServerManager new.
+		self
+			assert: WAServerManager default class
+			equals: WATestServerManager
+	] ensure: [ 
+		WAServerManager setDefault: previous
+	]
diff --git a/repository/Seaside-Tests-Core.package/WATestServerManager.class/README.md b/repository/Seaside-Tests-Core.package/WATestServerManager.class/README.md
@@ -0,0 +1 @@
+I am a server manager used as an alternative of the WAServerManager, because some Smalltalk dialects have subclasses of WAServerManager.
diff --git a/repository/Seaside-Tests-Core.package/WATestServerManager.class/properties.json b/repository/Seaside-Tests-Core.package/WATestServerManager.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "EstebanMaringolo 9/13/2022 16:08",
+	"super" : "WAServerManager",
+	"category" : "Seaside-Tests-Core-Server",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "WATestServerManager",
+	"type" : "normal"
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		I am a server manager used as an alternative of the WAServerManager, because some Smalltalk dialects have subclasses of WAServerManager.