60100

18545 Update Fuel https://pharo.fogbugz.com/f/cases/18545 18535 Nautilus should be open to support different method categorizer https://pharo.fogbugz.com/f/cases/18535 http://files.pharo.org/image/60/60100.zip
pharo-project · Jun 21, 2016 · 6b13f1f · 6b13f1f
1 parent 02ebfc9
commit 6b13f1f
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 41 deletions.
diff --git a/ConfigurationOfFuel.package/ConfigurationOfFuel.class/instance/versions-2/version216_.st b/ConfigurationOfFuel.package/ConfigurationOfFuel.class/instance/versions-2/version216_.st
@@ -0,0 +1,37 @@
+version216: spec
+	<version: '2.1.6' imports: #('2.1.0-baseline')>
+
+	spec for: #common do: [
+		spec blessing: #release.
+		spec description: 'Use encodeReferenceToClusterObjectClass: instead of encodeReferenceTo: to reference classes in cluster header (in the same way as FLObjectCluster>>clusterSerializeStepWith: does).'.
+		spec
+			package: 'Fuel' with: 'Fuel-MartinDias.826';
+			package: 'FuelTests' with: 'FuelTests-MartinDias.412';
+			package: 'FuelMetalevel' with: 'FuelMetalevel-MaxLeske.83';
+			package: 'FuelMetalevelTests' with: 'FuelMetalevelTests-MaxLeske.63';
+			package: 'FuelDebug' with: 'FuelDebug-MartinDias.12';
+			package: 'FuelPreview' with: 'FuelPreview-MartinDias.13';
+			package: 'FuelUtilities' with: 'FuelUtilities-MartinDias.1';
+			package: 'FuelProgressUpdate' with: 'FuelProgressUpdate-MartinDias.62';
+			package: 'FuelBenchmarks' with: 'FuelBenchmarks-MaxLeske.150'.
+
+		spec 
+			project: 'MagmaBase' with: '1.0';
+			project: 'SIXX' with: '0.3.6';
+			project: 'StOMP' with: '1.8.3';
+			project: 'Roassal' with: '1.61'.
+
+		spec 
+			package: 'FuelBenchmarksMagma' with: 'FuelBenchmarksMagma-MartinDias.7';
+			package: 'FuelBenchmarksSIXX' with: 'FuelBenchmarksSIXX-MartinDias.4';
+			package: 'FuelBenchmarksStomp' with: 'FuelBenchmarksStomp-MartinDias.2';
+			package: 'FuelProgressUpdateBenchmarks' with: 'FuelProgressUpdateBenchmarks-MartinDias.12';
+			package: 'FuelBenchmarksSRP' with: 'FuelBenchmarksSRP-MartinDias.4';
+			package: 'FuelBenchmarksEsAndEm' with: 'FuelBenchmarksEsAndEm-MartinDias.4';
+			package: 'SRP' with: 'SRP-MartinDias.12';
+			package: 'EsAndEm' with: 'EsAndEm-cwp.15'.
+
+		spec 
+			package: 'FuelCommandLineHandler' with: 'FuelCommandLineHandler-MarcusDenker.24';
+			package: 'FuelSystem-FileRegistry' with: 'FuelSystem-FileRegistry-EstebanLorenzano.3'; 
+			package: 'FuelTools-Debugger' with: 'FuelTools-Debugger-MarcusDenker.9' ]
diff --git a/...LHookPrimitiveCluster.class/instance/serialize%2Fmaterialize/clusterSerializeStepWith_.st b/...LHookPrimitiveCluster.class/instance/serialize%2Fmaterialize/clusterSerializeStepWith_.st
@@ -1,4 +1,4 @@
 clusterSerializeStepWith: aSerialization
 
 	super clusterSerializeStepWith: aSerialization.
-	aSerialization encoder encodeReferenceTo: theClass.	
+	aSerialization encoder encodeReferenceToClusterObjectClass: theClass.	
diff --git a/...form.package/FLPharo11Platform.class/class/private-extensions-methodcontext/tempNamed_.st b/...form.package/FLPharo11Platform.class/class/private-extensions-methodcontext/tempNamed_.st
@@ -4,4 +4,4 @@ tempNamed: aName
 	index := self tempNames indexOf: aName.
 	^ self closure 
 		ifNil: [ self tempAt: index ]
-		ifNotNil: [ :closure | closure at: index ]
+		ifNotNilDo: [ :closure | closure at: index ]
diff --git a/...bstitutionTest.class/instance/running/testSubstituteCharacterInPresenceOfSomeCharacter.st b/...bstitutionTest.class/instance/running/testSubstituteCharacterInPresenceOfSomeCharacter.st
@@ -0,0 +1,4 @@
+testSubstituteCharacterInPresenceOfSomeCharacter
+	"See issues #209 and #217"
+
+	self testSubstitute: Character inPresenceOf: $c
diff --git a/...eSubstitutionTest.class/instance/running/testSubstituteTrueInPresenceOfTheTrueInstance.st b/...eSubstitutionTest.class/instance/running/testSubstituteTrueInPresenceOfTheTrueInstance.st
@@ -0,0 +1,4 @@
+testSubstituteTrueInPresenceOfTheTrueInstance
+	"See issues #209 and #217"
+
+	self testSubstitute: True inPresenceOf: true
diff --git a/...leSubstitutionTest.class/instance/running/testSubstituteUndefinedObjectInPresenceOfNil.st b/...leSubstitutionTest.class/instance/running/testSubstituteUndefinedObjectInPresenceOfNil.st
@@ -0,0 +1,4 @@
+testSubstituteUndefinedObjectInPresenceOfNil
+	"See issues #209 and #217"
+
+	self testSubstitute: UndefinedObject inPresenceOf: nil
diff --git a/...ackage/FLPluggableSubstitutionTest.class/instance/running/testSubstitute_inPresenceOf_.st b/...ackage/FLPluggableSubstitutionTest.class/instance/running/testSubstitute_inPresenceOf_.st
@@ -0,0 +1,9 @@
+testSubstitute: anObject inPresenceOf: anotherObject
+
+	| result |
+	self analyzer when: [:x | x == anObject ] substituteBy: [:x | 424242 ].
+
+	result := self resultOfSerializeAndMaterialize: {anObject. anotherObject}.
+
+	self assert: result first equals: 424242.
+	self assert: result second equals: anotherObject.
diff --git a/Nautilus.package/AbstractNautilusUI.class/definition.st b/Nautilus.package/AbstractNautilusUI.class/definition.st
@@ -1,5 +1,5 @@
 AbstractTool subclass: #AbstractNautilusUI
-	instanceVariableNames: 'model window sourceCodePanel fullDisplayedComment sourceCodeContainer shouldUpdateTitle contentSelection acceptor classCommentTextModel commentWidget sourceTextWidget sourceCodeSelectionInterval sourceTextModel'
+	instanceVariableNames: 'model window sourceCodePanel fullDisplayedComment sourceCodeContainer shouldUpdateTitle contentSelection acceptor classCommentTextModel commentWidget sourceTextWidget sourceCodeSelectionInterval sourceTextModel methodClassifier'
 	classVariableNames: 'NextFocusKey PackagesIconsCache PreviousFocusKey'
 	poolDictionaries: ''
 	category: 'Nautilus'
diff --git a/Nautilus.package/AbstractNautilusUI.class/instance/accessing/classifier.st b/Nautilus.package/AbstractNautilusUI.class/instance/accessing/classifier.st
diff --git a/...age/AbstractNautilusUI.class/instance/menus behavior/categorizeAllUncategorizedMethods.st b/...age/AbstractNautilusUI.class/instance/menus behavior/categorizeAllUncategorizedMethods.st
@@ -2,4 +2,4 @@ categorizeAllUncategorizedMethods
 	"Categorize methods by looking in parent classes for a method category."
 	self selectedClass ifNotNil: [ :aClass | | methods |
 		methods := aClass uncategorizedSelectors collect: [ :selector| aClass >> selector ].
-		self classifier classifyAll: methods ]
+		self model classifier classifyAll: methods ]
diff --git a/Nautilus.package/Nautilus.class/class/accessing/methodClassifierClass.st b/Nautilus.package/Nautilus.class/class/accessing/methodClassifierClass.st
@@ -0,0 +1,3 @@
+methodClassifierClass
+
+	^ MethodClassifierClass ifNil: [ MethodClassifierClass := MethodClassifier ]
diff --git a/Nautilus.package/Nautilus.class/class/accessing/methodClassifierClass_.st b/Nautilus.package/Nautilus.class/class/accessing/methodClassifierClass_.st
@@ -0,0 +1,3 @@
+methodClassifierClass: aClass
+
+	 MethodClassifierClass := aClass
diff --git a/Nautilus.package/Nautilus.class/definition.st b/Nautilus.package/Nautilus.class/definition.st
@@ -1,5 +1,5 @@
 Object subclass: #Nautilus
-	instanceVariableNames: 'announcer browsedEnvironment browsingHistory plugins selectedCategory selectedClass selectedGroup selectedMethod selectedPackage showCategories showComment sortHierarchically showInstance showHierarchy ui'
-	classVariableNames: 'PluginClasses SortHierarchically'
+	instanceVariableNames: 'announcer browsedEnvironment browsingHistory plugins selectedCategory selectedClass selectedGroup selectedMethod selectedPackage showCategories showComment sortHierarchically showInstance showHierarchy ui methodClassifier'
+	classVariableNames: 'MethodClassifierClass PluginClasses SortHierarchically'
 	poolDictionaries: ''
 	category: 'Nautilus'
diff --git a/Nautilus.package/Nautilus.class/instance/accessing/classifier.st b/Nautilus.package/Nautilus.class/instance/accessing/classifier.st
@@ -0,0 +1,2 @@
+classifier
+	^ methodClassifier ifNil: [ methodClassifier := self class methodClassifierClass new ]
diff --git a/Nautilus.package/Nautilus.class/instance/accessing/classifier_.st b/Nautilus.package/Nautilus.class/instance/accessing/classifier_.st
@@ -0,0 +1,2 @@
+classifier: aMethodClassifier
+	methodClassifier := aMethodClassifier
diff --git a/...s/instance/pharo - scripts/script60099.st → ...s/instance/pharo - scripts/script60100.st b/...s/instance/pharo - scripts/script60099.st → ...s/instance/pharo - scripts/script60100.st
@@ -1,4 +1,4 @@
-script60099
+script60100
 
 	^ 'AST-Core-TheIntegrator.426.mcz
 AST-Tests-Core-TheIntegrator.99.mcz
@@ -203,7 +203,7 @@ Multilingual-TextConversion-TheIntegrator.83.mcz
 Multilingual-TextConverterOtherLanguages-TheIntegrator.4.mcz
 NECompletion-TheIntegrator.251.mcz
 NECompletion-Tests-TheIntegrator.10.mcz
-Nautilus-TheIntegrator.1264.mcz
+Nautilus-TheIntegrator.1265.mcz
 Nautilus-GroupManager-TheIntegrator.20.mcz
 Nautilus-GroupManagerUI-TheIntegrator.33.mcz
 Nautilus-Tests-TheIntegrator.37.mcz

diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60099.st b/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60099.st
diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60100.st b/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60100.st
@@ -0,0 +1,9 @@
+update60100
+	"self new update60100"
+	self withUpdateLog: '18545 Update Fuel
+	https://pharo.fogbugz.com/f/cases/18545
+
+18535 Nautilus should be open to support different method categorizer
+	https://pharo.fogbugz.com/f/cases/18535'.
+	self loadTogether: self script60100 merge: false.
+	self loadConfiguration: 'Fuel' version: '2.1.6'.self flushCaches.
diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st b/ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st
@@ -1,15 +1,6 @@
 commentForCurrentUpdate
- ^ '18538 remove dead code in UI Manager
-	https://pharo.fogbugz.com/f/cases/18538
+ ^ '18545 Update Fuel
+	https://pharo.fogbugz.com/f/cases/18545
 
-18540 Improve method level icon for #flag:
-	https://pharo.fogbugz.com/f/cases/18540
-
-18542 update dependencies of System-Support
-	https://pharo.fogbugz.com/f/cases/18542
-
-18543 update dependencies of SessionManager
-	https://pharo.fogbugz.com/f/cases/18543
-
-18528 RPackageNameTest resets SystemAnnouncer without restoring subscriptions
-	https://pharo.fogbugz.com/f/cases/18528'
+18535 Nautilus should be open to support different method categorizer
+	https://pharo.fogbugz.com/f/cases/18535'