Merge branch 'dev' into 93-untrack-system-changes

hpi-swa-teaching · Jun 29, 2020 · 9e6d3f8 · 9e6d3f8
2 parents a1d4b41 + a0040c3
commit 9e6d3f8
Show file tree

Hide file tree

Showing 39 changed files with 151 additions and 77 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,4 @@ language: smalltalk
 sudo: false
 
 smalltalk:
-  - Squeak-trunk
+  - Squeak-trunk
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ChangesReloaded ![Build Status](https://github.com/hpi-swa-teaching/ChangesBrowser/workflows/CI/badge.svg?branch=dev) [![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/ChangesBrowser/badge.svg?branch=dev)](https://coveralls.io/github/hpi-swa-teaching/ChangesBrowser?branch=dev)
+# ChangesReloaded ![Build Status](https://github.com/hpi-swa-teaching/ChangesBrowser/workflows/CI/badge.svg?branch=dev)[![Coverage Status](https://coveralls.io/repos/github/hpi-swa-teaching/ChangesBrowser/badge.svg?branch=dev)](https://coveralls.io/github/hpi-swa-teaching/ChangesBrowser?branch=dev)
 
 ChangesReloaded is a project developed in context of SWT 2020 based on the ChangesBrowser project from 2017. It is supposed to simplify the old tool.
 

diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildChangeListSpecWith..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildChangeListSpecWith..st
diff --git a/...Reloaded-Core.package/CRBrowser.class/instance/buildSingleSelectionChangeListSpecWith..st b/...Reloaded-Core.package/CRBrowser.class/instance/buildSingleSelectionChangeListSpecWith..st
@@ -0,0 +1,8 @@
+building
+buildSingleSelectionChangeListSpecWith: aBuilder
+
+	^ aBuilder pluggableListSpec new
+		model: self;
+		list: #displayedChangeDescriptions;
+		getIndex: #changeListSelectionIndex;
+		setIndex: #changeListSelectionIndex:
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildWith..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildWith..st
@@ -9,11 +9,14 @@ buildWith: aBuilder
 			add: ((self buildButtonPanelSpecWith: aBuilder)
 				frame: self buttonsFrame;
 				yourself);
-			add: ((self buildChangeListSpecWith: aBuilder)
-				frame: self changeListFrame;
-				yourself);
 			add: ((self buildHistoryListSpecWith: aBuilder)
 				frame: self historyListFrame;
 				yourself);
+			add: ((self buildSingleSelectionChangeListSpecWith: aBuilder)
+				frame: self changeListFrame;
+				yourself);
+			add: ((self buildCodePaneWith: aBuilder)
+				frame: self codePaneFrame;
+				yourself);
 			yourself);
 		yourself)
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/changeListFrame.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/changeListFrame.st
@@ -5,4 +5,4 @@ changeListFrame
 		leftFraction: 0.5 offset: 0;
 		topFraction: 0 offset: self buttonHeight;
 		rightFraction: 1 offset: 0;
-		bottomFraction: 1 offset: 0
+		bottomFraction: 1 - self codePaneFraction offset: 0
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/changeListSelectionIndex..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/changeListSelectionIndex..st
@@ -0,0 +1,8 @@
+accessing
+changeListSelectionIndex: anInteger
+
+	changeListSelectionIndex := anInteger.
+	self displayedChangeListItems do: [:each | each isSelected: false].
+	self hasValidChangeListSelectionIndex
+		ifTrue: [(self displayedChangeListItems at: anInteger) isSelected: true].
+	self updateAfterChangeSelection
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/changeListSelectionIndex.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/changeListSelectionIndex.st
@@ -0,0 +1,4 @@
+accessing
+changeListSelectionIndex
+
+	^ changeListSelectionIndex
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/codePaneFraction.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/codePaneFraction.st
@@ -0,0 +1,4 @@
+building
+codePaneFraction
+
+	^ 0.45
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/codePaneFrame.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/codePaneFrame.st
@@ -0,0 +1,8 @@
+building
+codePaneFrame
+
+	^ LayoutFrame new
+		leftFraction: 0 offset: 0;
+		topFraction: 1 - self codePaneFraction offset: 0;
+		rightFraction: 1 offset: 0;
+		bottomFraction: 1 offset: 0
diff --git a/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/displayedChangeDescriptions.st b/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/displayedChangeDescriptions.st
@@ -1,6 +1,6 @@
 accessing
 displayedChangeDescriptions
 
-	^ self isHistoryListItemSelected
-		ifFalse: [OrderedCollection new]
+	^ self hasValidHistoryListSelectionIndex
+		ifFalse: [SortedCollection new]
 		ifTrue: [self selectedHistoryListItem changeDescriptions]
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/displayedChangeListItems.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/displayedChangeListItems.st
@@ -1,6 +1,6 @@
 accessing
 displayedChangeListItems
 
-	^ self isHistoryListItemSelected
-		ifFalse: [OrderedCollection new]
+	^ self hasValidHistoryListSelectionIndex
+		ifFalse: [SortedCollection new]
 		ifTrue: [self selectedHistoryListItem history]
diff --git a/...ChangesReloaded-Core.package/CRBrowser.class/instance/hasValidChangeListSelectionIndex.st b/...ChangesReloaded-Core.package/CRBrowser.class/instance/hasValidChangeListSelectionIndex.st
@@ -0,0 +1,5 @@
+accessing
+hasValidChangeListSelectionIndex
+
+	^ self hasValidHistoryListSelectionIndex
+		and: [self changeListSelectionIndex between: 1 and: self selectedHistoryListItem history size]
diff --git a/...ass/instance/isHistoryListItemSelected.st → ...ance/hasValidHistoryListSelectionIndex.st b/...ass/instance/isHistoryListItemSelected.st → ...ance/hasValidHistoryListSelectionIndex.st
@@ -1,4 +1,4 @@
 accessing
-isHistoryListItemSelected
+hasValidHistoryListSelectionIndex
 
 	^ self historyListSelectionIndex between: 1 and: self historyList size
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/historyListFrame.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/historyListFrame.st
@@ -5,4 +5,4 @@ historyListFrame
 		leftFraction: 0 offset: 0;
 		topFraction: 0 offset: self buttonHeight;
 		rightFraction: 0.5 offset: 0;
-		bottomFraction: 1 offset: 0
+		bottomFraction: 1 - self codePaneFraction offset: 0
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initialize.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initialize.st
@@ -1,5 +1,6 @@
 initializing
 initialize
 
+	self initializeHistoryList.
 	self historyListSelectionIndex: 0.
-	self initializeHistoryList
+	self changeListSelectionIndex: 0
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeHistoryList.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeHistoryList.st
@@ -7,5 +7,4 @@ initializeHistoryList
 						reject: [:each | self isInImage: each]) reversed].
 	self historyList: (self getHistoryListFrom: changeRecords).
 	self historyList do: [:each |
-		each history do: [:change |
-			change isSelected: true]]
+		each history first isSelected: true]
diff --git a/...gesReloaded-Core.package/CRBrowser.class/instance/isAnyDisplayedChangeListItemSelected.st b/...gesReloaded-Core.package/CRBrowser.class/instance/isAnyDisplayedChangeListItemSelected.st
@@ -0,0 +1,6 @@
+accessing
+isAnyDisplayedChangeListItemSelected
+
+	^ self hasValidHistoryListSelectionIndex
+		ifTrue: [self selectedHistoryListItem hasSelectedChangeListItem]
+		ifFalse: [false]
diff --git a/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/isChangeListItemSelectedAt..st b/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/isChangeListItemSelectedAt..st
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/refreshChangeList.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/refreshChangeList.st
@@ -0,0 +1,5 @@
+updating
+refreshChangeList
+
+	self changed: #displayedChangeDescriptions.
+	self refreshChangeListSelectionIndex
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/refreshChangeListItems.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/refreshChangeListItems.st
diff --git a/.../ChangesReloaded-Core.package/CRBrowser.class/instance/refreshChangeListSelectionIndex.st b/.../ChangesReloaded-Core.package/CRBrowser.class/instance/refreshChangeListSelectionIndex.st
@@ -0,0 +1,8 @@
+updating
+refreshChangeListSelectionIndex
+
+	self selectedDisplayedChangeListItems
+		ifEmpty: [self changeListSelectionIndex: 0]
+		ifNotEmpty: [self changeListSelectionIndex:
+			(self displayedChangeListItems indexOf:
+				self selectedDisplayedChangeListItems first)]
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/refreshHistoryList.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/refreshHistoryList.st
@@ -0,0 +1,4 @@
+updating
+refreshHistoryList
+
+	self changed: #historyDescriptions
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/refreshHistoryListItems.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/refreshHistoryListItems.st
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/repaintChangeListSelection.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/repaintChangeListSelection.st
@@ -0,0 +1,4 @@
+updating
+repaintChangeListSelection
+
+	self changed: #changeListSelectionIndex
diff --git a/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/repaintChangeListSelections.st b/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/repaintChangeListSelections.st
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedChangeListItems.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectedChangeListItems.st
@@ -2,6 +2,6 @@ accessing
 selectedChangeListItems
 
 	| selectedChanges |
-	selectedChanges := OrderedCollection new.
+	selectedChanges := SortedCollection new.
 	self historyList do: [:each | selectedChanges addAll: each selectedChangeListItems].
 	^ selectedChanges
diff --git a/...ChangesReloaded-Core.package/CRBrowser.class/instance/selectedDisplayedChangeListItems.st b/...ChangesReloaded-Core.package/CRBrowser.class/instance/selectedDisplayedChangeListItems.st
@@ -0,0 +1,6 @@
+accessing
+selectedDisplayedChangeListItems
+
+	^ self isAnyDisplayedChangeListItemSelected
+			ifTrue: [self selectedHistoryListItem selectedChangeListItems]
+			ifFalse: [SortedCollection new]
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterChangeSelection.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterChangeSelection.st
@@ -1,6 +1,7 @@
 updating
 updateAfterChangeSelection
 
-	self repaintChangeListSelections.
-	self refreshHistoryListItems.
-	self repaintHistoryListSelection
+	self repaintChangeListSelection.
+	self refreshHistoryList.
+	self repaintHistoryListSelection.
+	self updateCodePane
diff --git a/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterHistorySelection.st b/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterHistorySelection.st
@@ -1,5 +1,6 @@
 updating
 updateAfterHistorySelection
 
-	self refreshChangeListItems.
+	self refreshChangeList.
+	self repaintChangeListSelection.
 	self repaintHistoryListSelection
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateCodePane.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateCodePane.st
@@ -0,0 +1,7 @@
+updating
+updateCodePane
+
+	self selectedDisplayedChangeListItems
+		ifEmpty: [self contents: '']
+		ifNotEmpty: [self contents: self selectedDisplayedChangeListItems first string].
+	self contentsChanged
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/wantsOptionalButtons.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/wantsOptionalButtons.st
@@ -0,0 +1,4 @@
+building
+wantsOptionalButtons
+
+	^ false
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json
@@ -5,38 +5,47 @@
 	"instance" : {
 		"buildButtonPanelSpecWith:" : "mg 5/15/2020 09:24",
 		"buildButtonSpecsWith:" : "mg 5/14/2020 21:14",
-		"buildChangeListSpecWith:" : "gf 6/7/2020 13:32",
 		"buildHistoryListSpecWith:" : "SV 6/12/2020 19:57",
-		"buildWith:" : "gf 6/7/2020 11:46",
+		"buildSingleSelectionChangeListSpecWith:" : "SV 6/21/2020 12:54",
+		"buildWith:" : "SV 6/21/2020 13:07",
 		"buttonHeight" : "mg 5/11/2020 19:05",
 		"buttons" : "mg 6/15/2020 18:46",
 		"buttonsFrame" : "mg 5/11/2020 18:56",
-		"changeListFrame" : "gf 6/7/2020 11:42",
-		"displayedChangeDescriptions" : "SV 6/12/2020 21:38",
-		"displayedChangeListItems" : "SV 6/17/2020 11:29",
+		"changeListFrame" : "SV 6/21/2020 12:24",
+		"changeListSelectionIndex" : "SV 6/21/2020 12:53",
+		"changeListSelectionIndex:" : "SV 6/27/2020 19:34",
+		"codePaneFraction" : "SV 6/21/2020 12:23",
+		"codePaneFrame" : "SV 6/21/2020 12:23",
+		"displayedChangeDescriptions" : "SV 6/27/2020 19:34",
+		"displayedChangeListItems" : "SV 6/27/2020 19:34",
 		"extent" : "gf 5/8/2020 16:44",
 		"getHistoryListFrom:" : "mg 6/20/2020 10:14",
+		"hasValidChangeListSelectionIndex" : "SV 6/27/2020 19:34",
+		"hasValidHistoryListSelectionIndex" : "SV 6/27/2020 19:34",
 		"historyDescriptions" : "SV 6/12/2020 20:58",
 		"historyList" : "SV 6/12/2020 14:12",
 		"historyList:" : "SV 6/12/2020 22:00",
-		"historyListFrame" : "gf 6/7/2020 11:43",
+		"historyListFrame" : "SV 6/21/2020 12:24",
 		"historyListSelectionIndex" : "SV 6/12/2020 19:58",
-		"historyListSelectionIndex:" : "SV 6/12/2020 21:51",
-		"initialize" : "SV 6/12/2020 21:31",
-		"initializeHistoryList" : "SV 6/12/2020 22:19",
+		"historyListSelectionIndex:" : "SV 6/21/2020 13:35",
+		"initialize" : "SV 6/21/2020 13:10",
+		"initializeHistoryList" : "SV 6/22/2020 21:32",
 		"invertSelection" : "SV 6/12/2020 21:50",
-		"isChangeListItemSelectedAt:" : "gf 6/7/2020 13:34",
-		"isHistoryListItemSelected" : "SV 6/12/2020 20:56",
+		"isAnyDisplayedChangeListItemSelected" : "SV 6/27/2020 19:38",
 		"isInImage:" : "SV 5/20/2020 13:03",
 		"loadSelectedChanges" : "mg 6/20/2020 09:52",
-		"refreshChangeListItems" : "SV 6/12/2020 21:41",
-		"refreshHistoryListItems" : "SV 6/12/2020 21:44",
-		"repaintChangeListSelections" : "SV 6/12/2020 21:43",
+		"refreshChangeList" : "SV 6/27/2020 19:38",
+		"refreshChangeListSelectionIndex" : "SV 6/21/2020 14:04",
+		"refreshHistoryList" : "SV 6/27/2020 19:38",
+		"repaintChangeListSelection" : "SV 6/27/2020 19:48",
 		"repaintHistoryListSelection" : "SV 6/12/2020 21:41",
 		"retrieveChangeRecordsFromChangesFile" : "SV 6/12/2020 22:03",
-		"selectedChangeListItems" : "mg 6/20/2020 09:36",
+		"selectedChangeListItems" : "SV 6/27/2020 19:39",
+		"selectedDisplayedChangeListItems" : "SV 6/27/2020 19:38",
 		"selectedHistoryListItem" : "SV 6/12/2020 21:37",
 		"setChangeListItemSelectionAt:to:" : "SV 6/12/2020 21:51",
 		"switchToDetailedView" : "mg 5/14/2020 21:26",
-		"updateAfterChangeSelection" : "SV 6/12/2020 21:52",
-		"updateAfterHistorySelection" : "SV 6/12/2020 21:52" } }
+		"updateAfterChangeSelection" : "SV 6/27/2020 19:48",
+		"updateAfterHistorySelection" : "SV 6/27/2020 19:48",
+		"updateCodePane" : "SV 6/21/2020 13:16",
+		"wantsOptionalButtons" : "SV 6/21/2020 12:26" } }
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/properties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/properties.json
@@ -7,7 +7,8 @@
 	"commentStamp" : "SV 6/3/2020 10:26",
 	"instvars" : [
 		"historyList",
-		"historyListSelectionIndex" ],
+		"historyListSelectionIndex",
+		"changeListSelectionIndex" ],
 	"name" : "CRBrowser",
 	"pools" : [
 		 ],

diff --git a/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/description.st b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/description.st
@@ -1,11 +1,13 @@
 accessing
 description
 
-	| description numberOfSelectedChangeListItems numberOfChangeListItems prefix |
+	| description prefix |
+	prefix := self hasSelectedChangeListItem
+		ifTrue: [| indexOfSelectedChangeListItem |
+			indexOfSelectedChangeListItem := self history indexOf: self selectedChangeListItems first.
+			indexOfSelectedChangeListItem > 1
+				ifTrue: [(indexOfSelectedChangeListItem - 1) asString , ' omitted:']
+				ifFalse: ['Latest:']]
+		ifFalse: ['Ignored:'].
 	description := self className , ' ' , self selector.
-	numberOfSelectedChangeListItems := (self history select: [:each | each isSelected]) size.
-	numberOfChangeListItems := self history size.
-	numberOfSelectedChangeListItems = numberOfChangeListItems
-		ifFalse: [prefix := '[' , numberOfSelectedChangeListItems , '/' , numberOfChangeListItems , ']']
-		ifTrue: [prefix := '[all]'].
 	^ prefix , ' ' , description
diff --git a/...hangesReloaded-Core.package/CRHistoryListItem.class/instance/hasSelectedChangeListItem.st b/...hangesReloaded-Core.package/CRHistoryListItem.class/instance/hasSelectedChangeListItem.st
@@ -0,0 +1,6 @@
+accessing
+hasSelectedChangeListItem
+
+	^ self history
+		ifEmpty: [false]
+		ifNotEmpty: [self history anySatisfy: [:each | each isSelected]]
diff --git a/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/methodProperties.json
@@ -9,7 +9,8 @@
 		"changeDescriptions" : "SV 6/12/2020 20:48",
 		"className" : "gf 6/17/2020 14:33",
 		"className:" : "gf 6/17/2020 14:36",
-		"description" : "gf 6/17/2020 14:34",
+		"description" : "SV 6/22/2020 21:26",
+		"hasSelectedChangeListItem" : "SV 6/22/2020 21:08",
 		"history" : "SV 6/12/2020 13:46",
 		"history:" : "gf 6/15/2020 23:34",
 		"initialize" : "mg 6/20/2020 09:55",

diff --git a/...ges/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testLoadSelectedChanges.st b/...ges/ChangesReloaded-Tests.package/CRBrowserTest.class/instance/testLoadSelectedChanges.st
diff --git a/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json b/packages/ChangesReloaded-Tests.package/CRBrowserTest.class/methodProperties.json
@@ -8,5 +8,4 @@
 		"createChangeRecordMethod" : "SV 6/10/2020 10:13",
 		"createDummyChangeListItems:withSelection:" : "SV 6/3/2020 10:28",
 		"setUp" : "uh 5/23/2020 14:50",
-		"testBuildingChangesBrowser" : "uh 5/23/2020 15:31",
-		"testLoadSelectedChanges" : "mg 6/15/2020 18:59" } }
+		"testBuildingChangesBrowser" : "uh 5/23/2020 15:31" } }