40297

14210 Replace Announcer>>#on:send:to:s senders in Komitter https://pharo.fogbugz.com/f/cases/14210 14197 Little Morphic Package Reorganization https://pharo.fogbugz.com/f/cases/14197 14198 Time>>print24 prints nanos, though it claims not to https://pharo.fogbugz.com/f/cases/14198 14211 Replace Announcer>>#on:send:to:s senders in Manifest-CriticBrowser https://pharo.fogbugz.com/f/cases/14211 http://files.pharo.org/image/40/40297.zip
pharo-project · Oct 10, 2014 · b2faf4d · b2faf4d
1 parent b3267a7
commit b2faf4d
Show file tree

Hide file tree

Showing 38 changed files with 392 additions and 22 deletions.
diff --git a/Kernel.package/Time.class/instance/printing/print24_on_.st b/Kernel.package/Time.class/instance/printing/print24_on_.st
@@ -1,5 +1,21 @@
 print24: hr24 on: aStream 
  	"Format is 'hh:mm:ss' or 'h:mm:ss am' "
 
- 	self print24: hr24 showSeconds: true on: aStream 
-
+ 	| h m s |
+	h := self hour. m := self minute. s := self second.
+	hr24
+		ifTrue: [ 
+			h < 10 ifTrue: [ aStream nextPut: $0 ].
+			h printOn: aStream ]
+		ifFalse: [ 
+			h > 12
+				ifTrue: [ h - 12 printOn: aStream ]
+				ifFalse: [
+					h < 1
+						ifTrue: [ 12 printOn: aStream ]
+						ifFalse: [ h printOn: aStream ] ] ].
+	aStream nextPutAll: (m < 10 ifTrue: [ ':0' ] ifFalse: [ ':' ]).
+	m printOn: aStream.
+	aStream nextPutAll: (s < 10 ifTrue: [ ':0' ] ifFalse: [ ':' ]).
+	s printOn: aStream.
+	hr24 ifFalse: [ aStream nextPutAll: (h < 12 ifTrue: [ ' am' ] ifFalse: [ ' pm' ]) ]
diff --git a/Kernel.package/Time.class/instance/printing/print24_showSeconds_on_.st b/Kernel.package/Time.class/instance/printing/print24_showSeconds_on_.st
@@ -1,5 +1,5 @@
 print24: hr24 showSeconds: showSeconds on: aStream 
-	"Format is 'hh:mm:ss' or 'h:mm:ss am'  or, if showSeconds is false, 'hh:mm' or 'h:mm am'"
+	"Format is 'hh:mm:ss.nnnnnnnnn' or 'h:mm:ss.nnnnnnnnn am'  or, if showSeconds is false, 'hh:mm' or 'h:mm am'"
 
 	| h m s |
 	h := self hour. m := self minute. s := self second.

diff --git a/KernelTests.package/TimeTest.class/instance/tests printing/testPrint24withNanos.st b/KernelTests.package/TimeTest.class/instance/tests printing/testPrint24withNanos.st
@@ -0,0 +1,2 @@
+testPrint24withNanos
+	self assert: '12:34:56.1' asTime print24 = '12:34:56'
diff --git a/Komitter.package/Komitter.class/instance/announcement/registerToAnnouncements.st b/Komitter.package/Komitter.class/instance/announcement/registerToAnnouncements.st
@@ -1,10 +1,10 @@
 registerToAnnouncements
 
 	SystemAnnouncer uniqueInstance weak	
-		on: MCPackageModified send: #mcPackageModified: to: self;
-		on: ClassAdded, ClassModifiedClassDefinition, ClassRenamed, ClassCommented send: #classModified: to: self;
-		on: ClassRepackaged send: #classMoved: to: self;
-		on: ClassRemoved send: #classRemoved: to: self;
-		on: MethodAdded, MethodModified, MethodRecategorized send: #methodModified: to: self;
-		on: MethodRepackaged send: #methodMoved: to: self;
-		on: MethodRemoved send: #methodRemoved: to: self
+		when: MCPackageModified send: #mcPackageModified: to: self;
+		when: ClassAdded, ClassModifiedClassDefinition, ClassRenamed, ClassCommented send: #classModified: to: self;
+		when: ClassRepackaged send: #classMoved: to: self;
+		when: ClassRemoved send: #classRemoved: to: self;
+		when: MethodAdded, MethodModified, MethodRecategorized send: #methodModified: to: self;
+		when: MethodRepackaged send: #methodMoved: to: self;
+		when: MethodRemoved send: #methodRemoved: to: self
diff --git a/...owser.package/CriticBrowser.class/instance/system annoucements/registerToAnnouncements.st b/...owser.package/CriticBrowser.class/instance/system annoucements/registerToAnnouncements.st
@@ -1,7 +1,7 @@
 registerToAnnouncements
 
 	SystemAnnouncer uniqueInstance weak
-		on: ClassModifiedClassDefinition send: #classModified: to: self;
-		on: MethodModified send: #methodModified: to: self;
-		on: MethodRemoved send: #methodRemoved: to: self.
-	self window window announcer on: WindowClosed send: #onWindowClosed to: self.	
+		when: ClassModifiedClassDefinition send: #classModified: to: self;
+		when: MethodModified send: #methodModified: to: self;
+		when: MethodRemoved send: #methodRemoved: to: self.
+	self window window announcer when: WindowClosed send: #onWindowClosed to: self.	
diff --git a/...ckage/AColorSelectorMorph.class/README.md → ...ckage/AColorSelectorMorph.class/README.md b/...ckage/AColorSelectorMorph.class/README.md → ...ckage/AColorSelectorMorph.class/README.md
diff --git a/...e/AColorSelectorMorph.class/definition.st → ...e/AColorSelectorMorph.class/definition.st b/...e/AColorSelectorMorph.class/definition.st → ...e/AColorSelectorMorph.class/definition.st
@@ -2,4 +2,4 @@ BracketSliderMorph subclass: #AColorSelectorMorph
 	instanceVariableNames: ''
 	classVariableNames: ''
 	poolDictionaries: ''
-	category: 'Morphic-Widgets-Scrolling'
+	category: 'Morphic-Widgets-ColorPicker'
diff --git a/...rMorph.class/instance/accessing/color_.st → ...rMorph.class/instance/accessing/color_.st b/...rMorph.class/instance/accessing/color_.st → ...rMorph.class/instance/accessing/color_.st
diff --git a/...orMorph.class/instance/drawing/drawOn_.st → ...orMorph.class/instance/drawing/drawOn_.st b/...orMorph.class/instance/drawing/drawOn_.st → ...orMorph.class/instance/drawing/drawOn_.st
diff --git a/...ass/instance/initialization/initialize.st → ...ass/instance/initialization/initialize.st b/...ass/instance/initialization/initialize.st → ...ass/instance/initialization/initialize.st
diff --git a/...Morph.class/instance/private/hatchForm.st → ...Morph.class/instance/private/hatchForm.st b/...Morph.class/instance/private/hatchForm.st → ...Morph.class/instance/private/hatchForm.st
diff --git a/...ass/instance/protocol/defaultFillStyle.st → ...ass/instance/protocol/defaultFillStyle.st b/...ass/instance/protocol/defaultFillStyle.st → ...ass/instance/protocol/defaultFillStyle.st
diff --git a/.../instance/visual properties/fillStyle_.st → .../instance/visual properties/fillStyle_.st b/.../instance/visual properties/fillStyle_.st → .../instance/visual properties/fillStyle_.st
diff --git a/...ckage/HColorSelectorMorph.class/README.md → ...ckage/HColorSelectorMorph.class/README.md b/...ckage/HColorSelectorMorph.class/README.md → ...ckage/HColorSelectorMorph.class/README.md
diff --git a/...e/HColorSelectorMorph.class/definition.st → ...e/HColorSelectorMorph.class/definition.st b/...e/HColorSelectorMorph.class/definition.st → ...e/HColorSelectorMorph.class/definition.st
@@ -2,4 +2,4 @@ BracketSliderMorph subclass: #HColorSelectorMorph
 	instanceVariableNames: ''
 	classVariableNames: ''
 	poolDictionaries: ''
-	category: 'Morphic-Widgets-Scrolling'
+	category: 'Morphic-Widgets-ColorPicker'
diff --git a/...rMorph.class/instance/accessing/color_.st → ...rMorph.class/instance/accessing/color_.st b/...rMorph.class/instance/accessing/color_.st → ...rMorph.class/instance/accessing/color_.st
diff --git a/...ass/instance/protocol/defaultFillStyle.st → ...ass/instance/protocol/defaultFillStyle.st b/...ass/instance/protocol/defaultFillStyle.st → ...ass/instance/protocol/defaultFillStyle.st
diff --git a/...tResizerMorph/instance/adoptPaneColor_.st → ...class/instance/actions/adoptPaneColor_.st b/...tResizerMorph/instance/adoptPaneColor_.st → ...class/instance/actions/adoptPaneColor_.st
diff --git a/...esizerMorph/instance/handlesMouseOver_.st → ...tance/event handling/handlesMouseOver_.st b/...esizerMorph/instance/handlesMouseOver_.st → ...tance/event handling/handlesMouseOver_.st
diff --git a/...tractResizerMorph/instance/mouseEnter_.st → ...ss/instance/event handling/mouseEnter_.st b/...tractResizerMorph/instance/mouseEnter_.st → ...ss/instance/event handling/mouseEnter_.st
diff --git a/...tractResizerMorph/instance/mouseLeave_.st → ...ss/instance/event handling/mouseLeave_.st b/...tractResizerMorph/instance/mouseLeave_.st → ...ss/instance/event handling/mouseLeave_.st
diff --git a/...AbstractResizerMorph/instance/mouseUp_.st → ...class/instance/event handling/mouseUp_.st b/...AbstractResizerMorph/instance/mouseUp_.st → ...class/instance/event handling/mouseUp_.st
diff --git a/...stractResizerMorph/instance/shouldDraw.st → ...orph.class/instance/testing/shouldDraw.st b/...stractResizerMorph/instance/shouldDraw.st → ...orph.class/instance/testing/shouldDraw.st
diff --git a/...ance/shouldInvalidateOnMouseTransition.st → ...ting/shouldInvalidateOnMouseTransition.st b/...ance/shouldInvalidateOnMouseTransition.st → ...ting/shouldInvalidateOnMouseTransition.st
diff --git a/...mLeftGripMorph/instance/containsPoint_.st → ....class/instance/testing/containsPoint_.st b/...mLeftGripMorph/instance/containsPoint_.st → ....class/instance/testing/containsPoint_.st
diff --git a/.../BottomRightGripMorph/instance/drawOn_.st → ...ipMorph.class/instance/drawing/drawOn_.st b/.../BottomRightGripMorph/instance/drawOn_.st → ...ipMorph.class/instance/drawing/drawOn_.st
diff --git a/...RightGripMorph/instance/containsPoint_.st → ....class/instance/testing/containsPoint_.st b/...RightGripMorph/instance/containsPoint_.st → ....class/instance/testing/containsPoint_.st
diff --git a/...sion/TopLeftGripMorph/instance/drawOn_.st → ...ipMorph.class/instance/drawing/drawOn_.st b/...sion/TopLeftGripMorph/instance/drawOn_.st → ...ipMorph.class/instance/drawing/drawOn_.st
diff --git a/...pLeftGripMorph/instance/containsPoint_.st → ....class/instance/testing/containsPoint_.st b/...pLeftGripMorph/instance/containsPoint_.st → ....class/instance/testing/containsPoint_.st
diff --git a/...ion/TopRightGripMorph/instance/drawOn_.st → ...ipMorph.class/instance/drawing/drawOn_.st b/...ion/TopRightGripMorph/instance/drawOn_.st → ...ipMorph.class/instance/drawing/drawOn_.st
diff --git a/...RightGripMorph/instance/containsPoint_.st → ....class/instance/testing/containsPoint_.st b/...RightGripMorph/instance/containsPoint_.st → ....class/instance/testing/containsPoint_.st
diff --git a/...nstance/as yet unclassified/mouseDown_.st → ...ass/instance/event handling/mouseDown_.st b/...nstance/as yet unclassified/mouseDown_.st → ...ass/instance/event handling/mouseDown_.st
diff --git a/...nstance/as yet unclassified/mouseMove_.st → ...ass/instance/event handling/mouseMove_.st b/...nstance/as yet unclassified/mouseMove_.st → ...ass/instance/event handling/mouseMove_.st
diff --git a/...ce/as yet unclassified/normalFillStyle.st → ...h.class/instance/style/normalFillStyle.st b/...ce/as yet unclassified/normalFillStyle.st → ...h.class/instance/style/normalFillStyle.st
diff --git a/...e/as yet unclassified/pressedFillStyle.st → ....class/instance/style/pressedFillStyle.st b/...e/as yet unclassified/pressedFillStyle.st → ....class/instance/style/pressedFillStyle.st