Factor out subclass creation

Factor out subclass creation and add Pharo 13 implementation.
SeasideSt · Jul 10, 2024 · 305baf7 · 305baf7
1 parent aadb7a0
commit 305baf7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 10 deletions.
diff --git a/...Pharo-Welcome.package/GRPharoPlatform.extension/instance/subclassOf.named.categorized..st b/...Pharo-Welcome.package/GRPharoPlatform.extension/instance/subclassOf.named.categorized..st
@@ -0,0 +1,12 @@
+*Seaside-Pharo-Welcome
+subclassOf: aSuperClass named: aNameSymbol categorized: aCategoryString
+	^ (aSuperClass respondsTo: #<<)
+		ifTrue: [
+			aSuperClass << aNameSymbol
+				package: aCategoryString;
+				install ]
+		ifFalse: [
+			super
+				subclassOf: aSuperClass 
+				named: aNameSymbol
+				categorized: aCategoryString ]
diff --git a/repository/Seaside-Pharo-Welcome.package/monticello.meta/categories.st b/repository/Seaside-Pharo-Welcome.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'Seaside-Pharo-Welcome'!
+self packageOrganizer ensurePackage: #'Seaside-Pharo-Welcome' withTags: #()!
diff --git a/...ry/Seaside-Welcome.package/GRPlatform.extension/instance/subclassOf.named.categorized..st b/...ry/Seaside-Welcome.package/GRPlatform.extension/instance/subclassOf.named.categorized..st
@@ -0,0 +1,8 @@
+*Seaside-Welcome
+subclassOf: aSuperClass named: aNameSymbol categorized: aCategoryString
+	^ aSuperClass
+		subclass: aNameSymbol
+		instanceVariableNames: ''
+		classVariableNames: ''
+		poolDictionaries: ''
+		category: aCategoryString
diff --git a/...tory/Seaside-Welcome.package/WAWelcomeComponentCreator.class/instance/createComponent..st b/...tory/Seaside-Welcome.package/WAWelcomeComponentCreator.class/instance/createComponent..st
@@ -9,12 +9,10 @@ createComponent: componentName
 		self inform: '''', componentName, ''' is not a valid name for a component. Component names should begin with a letter. Please choose again.'.
 		^ nil ].
 
-	userComponent := WAComponent
-		subclass: componentName
-		instanceVariableNames: ''
-		classVariableNames: ''
-		poolDictionaries: ''
-		category: 'Seaside-User-Examples'.
+	userComponent := GRPlatform current
+		subclassOf: WAComponent
+		named: componentName
+		categorized: 'Seaside-User-Examples'.
 
 	userComponent isNil ifTrue: [
 		self inform: 'A problem occurred creating ''', componentName, ''' component..'.

diff --git a/repository/Seaside-Welcome.package/monticello.meta/categories.st b/repository/Seaside-Welcome.package/monticello.meta/categories.st
@@ -1,3 +1 @@
-SystemOrganization addCategory: #'Seaside-Welcome'!
-SystemOrganization addCategory: #'Seaside-Welcome-Base'!
-SystemOrganization addCategory: #'Seaside-Welcome-Examples'!
+self packageOrganizer ensurePackage: #'Seaside-Welcome' withTags: #(#Base #Examples)!
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SystemOrganization addCategory: #'Seaside-Pharo-Welcome'!
		self packageOrganizer ensurePackage: #'Seaside-Pharo-Welcome' withTags: #()!