Merge pull request #32 from hpi-swa-teaching/refactoring

Refactoring
hpi-swa-teaching · Jul 6, 2024 · d242ef9 · d242ef9
2 parents 250bfe3 + 7969f20
commit d242ef9
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 126 deletions.
diff --git a/src/SqueakKara-Core/SKEnvironment.class.st b/src/SqueakKara-Core/SKEnvironment.class.st
@@ -150,16 +150,15 @@ SKEnvironment >> grid: anObject [
 
 {
 	#category : #initialization,
-	#'squeak_changestamp' : 'JJG 7/1/2024 16:28'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:48'
 }
 SKEnvironment >> initializeObjects [
-
 
 	self workspace: (SKWorkspace newWithKara: self kara).
 	self executer: (SKExecuter new).
 	(self executer kara) kara: self kara.
 	self executeControls: SKExecuteControls new.
-	executeControls environment: self.
+	self executeControls environment: self.
 
 	self setSystemWindow.
 	self systemWindow openInHand

diff --git a/src/SqueakKara-Core/SKExecuteControls.class.st b/src/SqueakKara-Core/SKExecuteControls.class.st
@@ -42,34 +42,30 @@ SKExecuteControls >> actionStop [
 
 {
 	#category : #widgets,
-	#'squeak_changestamp' : 'JJG 7/1/2024 14:57'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:26'
 }
 SKExecuteControls >> addAllWidgets [
 
-	| verticalSpace|
-
 	self buttonRun: self buildButtonRun.
 	self sliderSpeed: self buildSliderSpeed.
 	self buttonStop: self buildButtonStop.
 	self buttonRunSetTexture: self runTextureFilename.
 	self buttonStopSetTexture.
-	verticalSpace := self addWidgetCentered: self buttonRun atXPosition: self widgetMargin.
-	verticalSpace := self addWidgetCentered: self sliderSpeed atXPosition: verticalSpace + self widgetMargin.
-	verticalSpace := self addWidgetCentered: self buttonStop atXPosition: verticalSpace + self widgetMargin
+	self positionWidgets
 ]
 
 {
 	#category : #widgets,
-	#'squeak_changestamp' : 'JJG 7/1/2024 14:57'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:24'
 }
 SKExecuteControls >> addWidgetCentered: aWidget atXPosition: aXValue [ 
 
 	|verticalCenter widgetCenter|
 
 	self addMorph: aWidget.
-	verticalCenter := (self extent y)/2.
-	widgetCenter := (aWidget extent y)/2.
-	aWidget position: (aXValue @ (verticalCenter-widgetCenter)).
+	verticalCenter := (self extent y) / 2.
+	widgetCenter := (aWidget extent y) / 2.
+	aWidget position: (aXValue @ (verticalCenter - widgetCenter)).
 
 	^ aXValue + aWidget extent x
 ]
@@ -100,12 +96,12 @@ SKExecuteControls >> buildButtonStop [
 
 {
 	#category : #widgets,
-	#'squeak_changestamp' : 'JJG 7/1/2024 14:58'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:24'
 }
 SKExecuteControls >> buildSliderSpeed [
 
 	^ SimpleSliderMorph new
-		bounds: (0@0 extent: 100@20);
+		bounds: (0 @ 0 extent: 100 @ 20);
 		minVal: 0;
 		maxVal: 50;
 		setNumericValue: 25;
@@ -169,7 +165,7 @@ SKExecuteControls >> buttonStopSetTexture [
 ]
 
 {
-	#category : #widgets,
+	#category : #accessing,
 	#'squeak_changestamp' : 'JJG 7/1/2024 14:59'
 }
 SKExecuteControls >> defaultBounds [
@@ -214,18 +210,18 @@ SKExecuteControls >> getTexture: aFilename [
 ]
 
 {
-	#category : #widgets,
-	#'squeak_changestamp' : 'JJG 7/1/2024 14:59'
+	#category : #initialization,
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:32'
 }
 SKExecuteControls >> initialize [
 
 	super initialize.
-	self bounds: self defaultBounds.
-	self color: Color lightGreen lighter.
-	self borderWidth: 1 px.
-	self borderColor: Color lightGray.
-	self addAllWidgets.
-	self openInWorld
+	self bounds: self defaultBounds;
+		color: SKStylesheet primaryColor;
+		borderWidth: 1 px;
+		borderColor: SKStylesheet secondaryColor;
+		addAllWidgets;
+		openInWorld
 ]
 
 {
@@ -237,6 +233,19 @@ SKExecuteControls >> pauseTextureFilename [
 	^ 'pause.png'
 ]
 
+{
+	#category : #widgets,
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:26'
+}
+SKExecuteControls >> positionWidgets [
+
+	| verticalSpace|
+
+	verticalSpace := self addWidgetCentered: self buttonRun atXPosition: self widgetMargin.
+	verticalSpace := self addWidgetCentered: self sliderSpeed atXPosition: verticalSpace + self widgetMargin.
+	verticalSpace := self addWidgetCentered: self buttonStop atXPosition: verticalSpace + self widgetMargin
+]
+
 {
 	#category : #texture,
 	#'squeak_changestamp' : 'JJG 7/1/2024 14:59'

diff --git a/src/SqueakKara-Core/SKExecuter.class.st b/src/SqueakKara-Core/SKExecuter.class.st
@@ -134,14 +134,13 @@ SKExecuter >> process: anObject [
 
 {
 	#category : #execution,
-	#'squeak_changestamp' : 'EB 6/22/2024 14:10'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:52'
 }
 SKExecuter >> resumeExecution [
 
-	(self process isTerminated not) ifTrue: [
+	(self process isTerminated) ifFalse: [
 		self state: #running.
-		self process resume.
-	]
+		self process resume.]
 ]
 
 {
@@ -164,18 +163,18 @@ SKExecuter >> speed: aSpeed [
 
 {
 	#category : #accessing,
-	#'squeak_changestamp' : 'EB 6/22/2024 14:08'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:49'
 }
 SKExecuter >> state [
 
-	(self process isNil) ifTrue: [
+	(self process isNil) 
+	ifTrue: [
 		self state: #terminated
-	]
+		]
 	ifFalse: [
 		(self process isTerminated) ifTrue: [
-		self state: #terminated
-		]
-	].
+		self state: #terminated]
+		].
 	^ state
 ]
 
@@ -210,21 +209,23 @@ SKExecuter >> stepTime [
 
 {
 	#category : #execution,
-	#'squeak_changestamp' : 'EB 6/22/2024 14:09'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:47'
 }
 SKExecuter >> suspendExecution [
 
 	((self process isTerminated not) and: (self process isSuspended not)) ifTrue: [
 		self state: #suspended.
-		process suspend.
+		self process suspend.
 	].
 ]
 
 {
 	#category : #execution,
-	#'squeak_changestamp' : 'EB 6/22/2024 14:34'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:54'
 }
 SKExecuter >> terminate [
 
-	(self state = #terminated) ifFalse: [self process terminate. self state: #terminated]
+	(self state = #terminated) ifFalse: [
+		self process terminate. 
+		self state: #terminated]
 ]
diff --git a/src/SqueakKara-Core/SKGrid.class.st b/src/SqueakKara-Core/SKGrid.class.st
@@ -14,21 +14,6 @@ Class {
 	#'squeak_changestamp' : 'JJG 7/1/2024 15:48'
 }
 
-{
-	#category : #'instance creation',
-	#'squeak_changestamp' : 'NR 7/5/2024 12:01'
-}
-SKGrid class >> newWithChallenge: aNumber [
-
-	"comment stating purpose of message"
-
-
-
-
-
-
-]
-
 {
 	#category : #'instance creation',
 	#'squeak_changestamp' : 'JJG 6/5/2024 17:29'

diff --git a/src/SqueakKara-Core/SKKara.class.st b/src/SqueakKara-Core/SKKara.class.st
@@ -13,36 +13,36 @@ Class {
 
 {
 	#category : #turning,
-	#'squeak_changestamp' : 'jt 6/11/2024 12:44'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:57'
 }
 SKKara >> convertAngleToDirection: angle [
 
-	| AngleToDirection |
+	| angleToDirection |
 
-	AngleToDirection := Dictionary newFrom: {
+	angleToDirection := Dictionary newFrom: {
 		0 -> SKDirection above.
 	      90 -> SKDirection right.
 		180 -> SKDirection below.
 		270 -> SKDirection left.}.
 
-	^ AngleToDirection at: angle
+	^ angleToDirection at: angle
 ]
 
 {
 	#category : #turning,
-	#'squeak_changestamp' : 'jt 6/11/2024 13:22'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:58'
 }
 SKKara >> convertDirectionToAngle: direction [
 
-	| DirectionToAngle |
+	| directionToAngle |
 
-	DirectionToAngle := Dictionary newFrom: {
+	directionToAngle := Dictionary newFrom: {
 		SKDirection above -> 0.
 	      SKDirection right -> 90.
 		SKDirection below -> 180.
 		SKDirection left -> 270.}.
 
-	^ DirectionToAngle at: direction
+	^ directionToAngle at: direction
 ]
 
 {

diff --git a/src/SqueakKara-Core/SKWorkspace.class.st b/src/SqueakKara-Core/SKWorkspace.class.st
@@ -13,11 +13,11 @@ Class {
 
 {
 	#category : #'as yet unclassified',
-	#'squeak_changestamp' : 'KD 6/12/2024 18:43'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:17'
 }
 SKWorkspace class >> newWithKara: aKara [
 
-	^self basicNew initializeWithKara: aKara.
+	^ self basicNew initializeWithKara: aKara.
 ]
 
 {

diff --git a/src/SqueakKara/SKEnvironment.class.st b/src/SqueakKara/SKEnvironment.class.st
@@ -150,16 +150,15 @@ SKEnvironment >> grid: anObject [
 
 {
 	#category : #initialization,
-	#'squeak_changestamp' : 'JJG 7/1/2024 16:28'
+	#'squeak_changestamp' : 'JJG 7/6/2024 17:48'
 }
 SKEnvironment >> initializeObjects [
-
 
 	self workspace: (SKWorkspace newWithKara: self kara).
 	self executer: (SKExecuter new).
 	(self executer kara) kara: self kara.
 	self executeControls: SKExecuteControls new.
-	executeControls environment: self.
+	self executeControls environment: self.
 
 	self setSystemWindow.
 	self systemWindow openInHand