Generalize SquotTonelPackageBrowser to SquotCodePackageBrowser

hpi-swa · Apr 18, 2024 · dc61ff0 · dc61ff0
1 parent c39471f
commit dc61ff0
Show file tree

Hide file tree

Showing 48 changed files with 34 additions and 11 deletions.
diff --git a/src/Squot.package/SqueakWorkingCopy.class/instance/replaceMapper.with..st b/src/Squot.package/SqueakWorkingCopy.class/instance/replaceMapper.with..st
@@ -0,0 +1,4 @@
+mappers
+replaceMapper: aMapper with: anotherMapper
+	self mappers at: (self mappers indexOf: aMapper) put: anotherMapper.
+	self changed: #mappers.
diff --git a/src/Squot.package/SqueakWorkingCopy.class/methodProperties.json b/src/Squot.package/SqueakWorkingCopy.class/methodProperties.json
@@ -141,6 +141,7 @@
 		"removeCredentialsFor:" : "mad 10/17/2023 12:01",
 		"removeMapper:" : "mad 9/20/2023 17:30",
 		"rename" : "mad 12/8/2023 20:04",
+		"replaceMapper:with:" : "mad 4/18/2024 18:22",
 		"repository" : "mad 11/30/2023 17:02",
 		"repositoryExists" : "mad 11/30/2023 17:03",
 		"requestAndMoveToNewRepositoryLocation" : "mad 12/22/2023 17:49",

diff --git a/src/Squot.package/SquotCodeMapper.class/class/projectListMenu.for..st b/src/Squot.package/SquotCodeMapper.class/class/projectListMenu.for..st
@@ -1,8 +1,8 @@
-as yet unclassified
+menu
 projectListMenu: aMenu for: aWorkingCopy
 	aWorkingCopy ifNil: [^ self].
 	aMenu
 		add: 'Manage packages'
-		target: SquotTonelPackageBrowser
+		target: SquotCodePackageBrowser
 		selector: #openOnWorkingCopy:
 		argument: aWorkingCopy.
diff --git a/src/Squot.package/SquotCodeMapper.class/methodProperties.json b/src/Squot.package/SquotCodeMapper.class/methodProperties.json
@@ -4,7 +4,7 @@
 		"encodingName" : "mad 4/18/2024 18:11",
 		"package:" : "mad 4/21/2023 23:40",
 		"package:path:" : "mad 4/21/2023 23:41",
-		"projectListMenu:for:" : "mad 11/3/2023 15:10" },
+		"projectListMenu:for:" : "mad 4/15/2024 20:27" },
 	"instance" : {
 		"=" : "mad 9/26/2023 15:20",
 		"aboutToStyle:with:requestor:at:" : "mad 11/7/2023 12:09",

diff --git a/.../SquotTonelPackageBrowser.class/README.md → ...e/SquotCodePackageBrowser.class/README.md b/.../SquotTonelPackageBrowser.class/README.md → ...e/SquotCodePackageBrowser.class/README.md
diff --git a/...kageBrowser.class/class/onWorkingCopy..st → ...kageBrowser.class/class/onWorkingCopy..st b/...kageBrowser.class/class/onWorkingCopy..st → ...kageBrowser.class/class/onWorkingCopy..st
diff --git a/...Browser.class/class/openOnWorkingCopy..st → ...Browser.class/class/openOnWorkingCopy..st b/...Browser.class/class/openOnWorkingCopy..st → ...Browser.class/class/openOnWorkingCopy..st
diff --git a/...rowser.class/instance/actionAddPackage.st → ...rowser.class/instance/actionAddPackage.st b/...rowser.class/instance/actionAddPackage.st → ...rowser.class/instance/actionAddPackage.st
diff --git a/src/Squot.package/SquotCodePackageBrowser.class/instance/actionChangeEncoding.st b/src/Squot.package/SquotCodePackageBrowser.class/instance/actionChangeEncoding.st
@@ -0,0 +1,6 @@
+actions
+actionChangeEncoding
+	| mapper newMapper |
+	mapper := self selectedMapper.
+	newMapper := mapper changeEncoding ifNil: [^ self].
+	self workingCopy replaceMapper: mapper with: newMapper.
diff --git a/...r.class/instance/actionEditPackagePath.st → ...r.class/instance/actionEditPackagePath.st b/...r.class/instance/actionEditPackagePath.st → ...r.class/instance/actionEditPackagePath.st
@@ -8,7 +8,7 @@ actionEditPackagePath
 						('The package will be stored in a subdirectory of the path below, named ''{1}''. ',
 						'Thus, the package is currently stored in the directory ''{2}''.' format: {
 							packageName.
-							SquotPathUtilities asString: mapper pathWithPackage.
+							SquotPathUtilities asString: mapper packagePath.
 						})
 					initialAnswer: mapper path)
 						ifNil: [^ self].

diff --git a/...ser.class/instance/actionRemovePackage.st → ...ser.class/instance/actionRemovePackage.st b/...ser.class/instance/actionRemovePackage.st → ...ser.class/instance/actionRemovePackage.st
diff --git a/....class/instance/buildAddPackageButton..st → ....class/instance/buildAddPackageButton..st b/....class/instance/buildAddPackageButton..st → ....class/instance/buildAddPackageButton..st
diff --git a/...wser.class/instance/buildAutoSaveNote..st → ...wser.class/instance/buildAutoSaveNote..st b/...wser.class/instance/buildAutoSaveNote..st → ...wser.class/instance/buildAutoSaveNote..st
diff --git a/...geBrowser.class/instance/buildButtons..st → ...geBrowser.class/instance/buildButtons..st b/...geBrowser.class/instance/buildButtons..st → ...geBrowser.class/instance/buildButtons..st
@@ -3,5 +3,6 @@ buildButtons: builder
 	^ SquotGUIUtilities buildButtons: {
 		self buildAddPackageButton: builder.
 		self buildEditPackagePathButton: builder.
+		self buildChangeEncodingButton: builder.
 		self buildRemovePackageButton: builder.
 	} with: builder
diff --git a/src/Squot.package/SquotCodePackageBrowser.class/instance/buildChangeEncodingButton..st b/src/Squot.package/SquotCodePackageBrowser.class/instance/buildChangeEncodingButton..st
@@ -0,0 +1,9 @@
+toolbuilder
+buildChangeEncodingButton: builder
+	^ builder pluggableActionButtonSpec new
+		model: self;
+		action: #actionChangeEncoding;
+		enabled: #isSelectedPackageMapped;
+		label: 'Change package encoding';
+		help: 'Change which encoding is used to serialize the package to the repository.';
+		yourself
diff --git a/...s/instance/buildEditPackagePathButton..st → ...s/instance/buildEditPackagePathButton..st b/...s/instance/buildEditPackagePathButton..st → ...s/instance/buildEditPackagePathButton..st
diff --git a/...ageBrowser.class/instance/buildLayout..st → ...ageBrowser.class/instance/buildLayout..st b/...ageBrowser.class/instance/buildLayout..st → ...ageBrowser.class/instance/buildLayout..st
diff --git a/...rowser.class/instance/buildMainLayout..st → ...rowser.class/instance/buildMainLayout..st b/...rowser.class/instance/buildMainLayout..st → ...rowser.class/instance/buildMainLayout..st
diff --git a/...class/instance/buildMappedPackageList..st → ...class/instance/buildMappedPackageList..st b/...class/instance/buildMappedPackageList..st → ...class/instance/buildMappedPackageList..st
diff --git a/...ass/instance/buildRemovePackageButton..st → ...ass/instance/buildRemovePackageButton..st b/...ass/instance/buildRemovePackageButton..st → ...ass/instance/buildRemovePackageButton..st
diff --git a/...ass/instance/buildUnmappedPackageList..st → ...ass/instance/buildUnmappedPackageList..st b/...ass/instance/buildUnmappedPackageList..st → ...ass/instance/buildUnmappedPackageList..st
diff --git a/...ageBrowser.class/instance/buildWindow..st → ...ageBrowser.class/instance/buildWindow..st b/...ageBrowser.class/instance/buildWindow..st → ...ageBrowser.class/instance/buildWindow..st
diff --git a/...ckageBrowser.class/instance/buildWith..st → ...ckageBrowser.class/instance/buildWith..st b/...ckageBrowser.class/instance/buildWith..st → ...ckageBrowser.class/instance/buildWith..st
diff --git a/...owser.class/instance/categoriesChanged.st → ...owser.class/instance/categoriesChanged.st b/...owser.class/instance/categoriesChanged.st → ...owser.class/instance/categoriesChanged.st
diff --git a/....class/instance/categoriesPlusPrefixes.st → ....class/instance/categoriesPlusPrefixes.st b/....class/instance/categoriesPlusPrefixes.st → ....class/instance/categoriesPlusPrefixes.st
diff --git a/...class/instance/commonPackagePathPrefix.st → ...class/instance/commonPackagePathPrefix.st b/...class/instance/commonPackagePathPrefix.st → ...class/instance/commonPackagePathPrefix.st
diff --git a/...wser.class/instance/defaultPackagePath.st → ...wser.class/instance/defaultPackagePath.st b/...wser.class/instance/defaultPackagePath.st → ...wser.class/instance/defaultPackagePath.st
diff --git a/...ckageBrowser.class/instance/initialize.st → ...ckageBrowser.class/instance/initialize.st b/...ckageBrowser.class/instance/initialize.st → ...ckageBrowser.class/instance/initialize.st
diff --git a/...class/instance/isSelectedPackageMapped.st → ...class/instance/isSelectedPackageMapped.st b/...class/instance/isSelectedPackageMapped.st → ...class/instance/isSelectedPackageMapped.st
diff --git a/...ass/instance/isSelectedPackageUnmapped.st → ...ass/instance/isSelectedPackageUnmapped.st b/...ass/instance/isSelectedPackageUnmapped.st → ...ass/instance/isSelectedPackageUnmapped.st
diff --git a/...owser.class/instance/mappedPackageList.st → ...owser.class/instance/mappedPackageList.st b/...owser.class/instance/mappedPackageList.st → ...owser.class/instance/mappedPackageList.st
diff --git a/...ckageBrowser.class/instance/mapperFor..st → ...ckageBrowser.class/instance/mapperFor..st b/...ckageBrowser.class/instance/mapperFor..st → ...ckageBrowser.class/instance/mapperFor..st
diff --git a/src/Squot.package/SquotCodePackageBrowser.class/instance/mappers.st b/src/Squot.package/SquotCodePackageBrowser.class/instance/mappers.st
@@ -0,0 +1,3 @@
+accessing
+mappers
+	^ self workingCopy mappersOfKind: SquotCodeMapper
diff --git a/...eBrowser.class/instance/mappersChanged.st → ...eBrowser.class/instance/mappersChanged.st b/...eBrowser.class/instance/mappersChanged.st → ...eBrowser.class/instance/mappersChanged.st
diff --git a/...onelPackageBrowser.class/instance/open.st → ...CodePackageBrowser.class/instance/open.st b/...onelPackageBrowser.class/instance/open.st → ...CodePackageBrowser.class/instance/open.st
diff --git a/...owser.class/instance/packageOrganizer..st → ...owser.class/instance/packageOrganizer..st b/...owser.class/instance/packageOrganizer..st → ...owser.class/instance/packageOrganizer..st
diff --git a/...rowser.class/instance/packageOrganizer.st → ...rowser.class/instance/packageOrganizer.st b/...rowser.class/instance/packageOrganizer.st → ...rowser.class/instance/packageOrganizer.st
diff --git a/...eBrowser.class/instance/removePackage..st → ...eBrowser.class/instance/removePackage..st b/...eBrowser.class/instance/removePackage..st → ...eBrowser.class/instance/removePackage..st
diff --git a/...eBrowser.class/instance/selectedMapper.st → ...eBrowser.class/instance/selectedMapper.st b/...eBrowser.class/instance/selectedMapper.st → ...eBrowser.class/instance/selectedMapper.st
diff --git a/...er.class/instance/selectedPackageName..st → ...er.class/instance/selectedPackageName..st b/...er.class/instance/selectedPackageName..st → ...er.class/instance/selectedPackageName..st
diff --git a/...ser.class/instance/selectedPackageName.st → ...ser.class/instance/selectedPackageName.st b/...ser.class/instance/selectedPackageName.st → ...ser.class/instance/selectedPackageName.st
diff --git a/...ser.class/instance/unmappedPackageList.st → ...ser.class/instance/unmappedPackageList.st b/...ser.class/instance/unmappedPackageList.st → ...ser.class/instance/unmappedPackageList.st
diff --git a/...lPackageBrowser.class/instance/update..st → ...ePackageBrowser.class/instance/update..st b/...lPackageBrowser.class/instance/update..st → ...ePackageBrowser.class/instance/update..st
diff --git a/...ageBrowser.class/instance/workingCopy..st → ...ageBrowser.class/instance/workingCopy..st b/...ageBrowser.class/instance/workingCopy..st → ...ageBrowser.class/instance/workingCopy..st
diff --git a/...kageBrowser.class/instance/workingCopy.st → ...kageBrowser.class/instance/workingCopy.st b/...kageBrowser.class/instance/workingCopy.st → ...kageBrowser.class/instance/workingCopy.st
diff --git a/...ackageBrowser.class/methodProperties.json → ...ackageBrowser.class/methodProperties.json b/...ackageBrowser.class/methodProperties.json → ...ackageBrowser.class/methodProperties.json
@@ -4,11 +4,13 @@
 		"openOnWorkingCopy:" : "mad 9/19/2023 15:47" },
 	"instance" : {
 		"actionAddPackage" : "mad 11/27/2023 11:37",
-		"actionEditPackagePath" : "mad 11/14/2023 19:00",
+		"actionChangeEncoding" : "mad 4/18/2024 18:25",
+		"actionEditPackagePath" : "mad 10/21/2023 22:54",
 		"actionRemovePackage" : "mad 11/27/2023 11:39",
 		"buildAddPackageButton:" : "mad 9/19/2023 16:23",
 		"buildAutoSaveNote:" : "mad 10/1/2023 17:58",
-		"buildButtons:" : "mad 9/19/2023 16:22",
+		"buildButtons:" : "mad 4/18/2024 18:23",
+		"buildChangeEncodingButton:" : "mad 4/18/2024 18:23",
 		"buildEditPackagePathButton:" : "mad 9/19/2023 16:24",
 		"buildLayout:" : "mad 10/1/2023 17:57",
 		"buildMainLayout:" : "mad 9/19/2023 15:51",
@@ -26,7 +28,7 @@
 		"isSelectedPackageUnmapped" : "mad 9/19/2023 16:23",
 		"mappedPackageList" : "mad 9/19/2023 15:55",
 		"mapperFor:" : "mad 11/27/2023 11:31",
-		"mappers" : "mad 9/20/2023 18:12",
+		"mappers" : "mad 4/18/2024 18:24",
 		"mappersChanged" : "mad 9/19/2023 16:18",
 		"open" : "mad 9/19/2023 15:47",
 		"packageOrganizer" : "mad 9/19/2023 15:45",

diff --git a/...TonelPackageBrowser.class/properties.json → ...tCodePackageBrowser.class/properties.json b/...TonelPackageBrowser.class/properties.json → ...tCodePackageBrowser.class/properties.json
@@ -9,7 +9,7 @@
 		"workingCopy",
 		"packageOrganizer",
 		"selectedPackageName" ],
-	"name" : "SquotTonelPackageBrowser",
+	"name" : "SquotCodePackageBrowser",
 	"pools" : [
 		 ],
 	"super" : "Model",

diff --git a/src/Squot.package/SquotTonelPackageBrowser.class/instance/mappers.st b/src/Squot.package/SquotTonelPackageBrowser.class/instance/mappers.st