From 538d1c334714e62c9f28b35fcf149476c1d7f9fc Mon Sep 17 00:00:00 2001 From: Haruko Schmidt Date: Fri, 12 Jul 2024 18:24:35 +0200 Subject: [PATCH] refactoring --- .../SPBLabel.class/instance/asForm.st | 8 ++--- .../SPBLabel.class/instance/hash.st | 2 +- .../SPBLabel.class/methodProperties.json | 4 +-- .../class/RecentGitHubBoards..st | 2 +- .../class/RecentGitHubBoards.st | 3 +- .../class/RecentLocalBoards.st | 3 +- .../class/changeRecentGitHubBoards..st | 2 +- .../class/changeRecentLocalBoards..st | 2 +- .../class/minExtentHorizontal.st | 2 +- .../class/minExtentVertical.st | 2 +- .../class/minHighButton.st | 4 +++ .../buildLocalBoardCommonActionsSpecWith..st | 17 +++++---- .../buildLocalBoardPanelSpecWith.withName..st | 2 +- .../instance/buildLocalBoardsListChildren.st | 4 +-- .../instance/buildLocalBoardsListSpecWith..st | 12 +++---- .../instance/buildMainLayoutPanelSpecWith..st | 16 ++++----- .../buildRecentGitHubBoardsChildren.st | 4 +-- .../buildRecentGitHubBoardsSpecWith..st | 10 +++--- .../buildRecentLocalBoardsChildren.st | 4 +-- .../buildRecentLocalBoardsSpecWith..st | 10 +++--- .../instance/contentPanelChildren.st | 7 ++-- .../methodProperties.json | 35 ++++++++++--------- 22 files changed, 81 insertions(+), 74 deletions(-) create mode 100644 Squello-Core.package/SPBLandingPage.class/class/minHighButton.st diff --git a/Squello-Core.package/SPBLabel.class/instance/asForm.st b/Squello-Core.package/SPBLabel.class/instance/asForm.st index b4cff481..c368582f 100644 --- a/Squello-Core.package/SPBLabel.class/instance/asForm.st +++ b/Squello-Core.package/SPBLabel.class/instance/asForm.st @@ -6,7 +6,7 @@ asForm collect: [:i | self color pixelValueForDepth: self formDepth]. ^ Form - extent: self extent - depth: self formDepth - fromArray: array - offset: 0@0. \ No newline at end of file + extent: self extent + depth: self formDepth + fromArray: array + offset: 0@0. \ No newline at end of file diff --git a/Squello-Core.package/SPBLabel.class/instance/hash.st b/Squello-Core.package/SPBLabel.class/instance/hash.st index 084945a2..c2ceaf45 100644 --- a/Squello-Core.package/SPBLabel.class/instance/hash.st +++ b/Squello-Core.package/SPBLabel.class/instance/hash.st @@ -1,5 +1,5 @@ comparing hash - "Answer an integer value that is related to the identity of the receiver." + ^ self id hash. \ No newline at end of file diff --git a/Squello-Core.package/SPBLabel.class/methodProperties.json b/Squello-Core.package/SPBLabel.class/methodProperties.json index 2d390769..256518f4 100644 --- a/Squello-Core.package/SPBLabel.class/methodProperties.json +++ b/Squello-Core.package/SPBLabel.class/methodProperties.json @@ -4,7 +4,7 @@ "newWithName:id:color:" : "FP 5/23/2024 10:08" }, "instance" : { "=" : "jh 7/31/2022 13:05", - "asForm" : "tk 8/2/2022 23:37", + "asForm" : "Haru 7/12/2024 18:12", "asJson" : "AH 7/7/2024 17:01", "asMorph" : "AH 6/22/2024 15:56", "asString" : "lo 6/5/2022 14:49", @@ -12,7 +12,7 @@ "color:" : "lo 5/23/2022 16:52", "extent" : "lo 8/1/2022 13:50", "formDepth" : "lo 6/6/2022 12:20", - "hash" : "LW 7/14/2022 11:11", + "hash" : "Haru 7/12/2024 18:17", "id" : "lo 5/16/2022 22:01", "id:" : "tk 8/2/2022 23:45", "isLabel" : "lo 8/1/2022 14:52", diff --git a/Squello-Core.package/SPBLandingPage.class/class/RecentGitHubBoards..st b/Squello-Core.package/SPBLandingPage.class/class/RecentGitHubBoards..st index 644d2360..c9287ec0 100644 --- a/Squello-Core.package/SPBLandingPage.class/class/RecentGitHubBoards..st +++ b/Squello-Core.package/SPBLandingPage.class/class/RecentGitHubBoards..st @@ -1,6 +1,6 @@ accessing RecentGitHubBoards: anOrderedCollection -"an orderedCollection of dictionarys, every dictionary has name, url, reponame of the githubboard that it repesents" + "an orderedCollection of dictionarys, every dictionary has name, url, reponame of the githubboard that it repesents" ^ RecentGitHubBoards := anOrderedCollection. diff --git a/Squello-Core.package/SPBLandingPage.class/class/RecentGitHubBoards.st b/Squello-Core.package/SPBLandingPage.class/class/RecentGitHubBoards.st index d7df7e8b..3a842696 100644 --- a/Squello-Core.package/SPBLandingPage.class/class/RecentGitHubBoards.st +++ b/Squello-Core.package/SPBLandingPage.class/class/RecentGitHubBoards.st @@ -1,5 +1,6 @@ accessing RecentGitHubBoards - RecentGitHubBoards ifNil: [RecentGitHubBoards := OrderedCollection new.]. + RecentGitHubBoards + ifNil: [RecentGitHubBoards := OrderedCollection new.]. ^ RecentGitHubBoards \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/class/RecentLocalBoards.st b/Squello-Core.package/SPBLandingPage.class/class/RecentLocalBoards.st index 95b4a689..8efcbd90 100644 --- a/Squello-Core.package/SPBLandingPage.class/class/RecentLocalBoards.st +++ b/Squello-Core.package/SPBLandingPage.class/class/RecentLocalBoards.st @@ -1,5 +1,6 @@ accessing RecentLocalBoards - RecentLocalBoards ifNil: [RecentLocalBoards := OrderedCollection new.]. + RecentLocalBoards + ifNil: [RecentLocalBoards := OrderedCollection new.]. ^ RecentLocalBoards \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/class/changeRecentGitHubBoards..st b/Squello-Core.package/SPBLandingPage.class/class/changeRecentGitHubBoards..st index 34887587..eaed3521 100644 --- a/Squello-Core.package/SPBLandingPage.class/class/changeRecentGitHubBoards..st +++ b/Squello-Core.package/SPBLandingPage.class/class/changeRecentGitHubBoards..st @@ -1,7 +1,7 @@ recentboards changeRecentGitHubBoards: lastGitHubBoard - self RecentGitHubBoards removeAllSuchThat: [:each| each = lastGitHubBoard]. + self RecentGitHubBoards removeAllSuchThat: [:aRecentGitHubBoard| aRecentGitHubBoard = lastGitHubBoard]. self RecentGitHubBoards addFirst: lastGitHubBoard. (self RecentGitHubBoards size > self numberOfRecentGitHubBoards) diff --git a/Squello-Core.package/SPBLandingPage.class/class/changeRecentLocalBoards..st b/Squello-Core.package/SPBLandingPage.class/class/changeRecentLocalBoards..st index 424dbf62..a3263eb1 100644 --- a/Squello-Core.package/SPBLandingPage.class/class/changeRecentLocalBoards..st +++ b/Squello-Core.package/SPBLandingPage.class/class/changeRecentLocalBoards..st @@ -1,7 +1,7 @@ recentboards changeRecentLocalBoards: lastLocalBoard - self RecentLocalBoards removeAllSuchThat: [:each| each = lastLocalBoard]. + self RecentLocalBoards removeAllSuchThat: [:aRecentLocalBoard| aRecentLocalBoard = lastLocalBoard]. self RecentLocalBoards addFirst: lastLocalBoard. (self RecentLocalBoards size > self numberOfRecentLocalBoards) diff --git a/Squello-Core.package/SPBLandingPage.class/class/minExtentHorizontal.st b/Squello-Core.package/SPBLandingPage.class/class/minExtentHorizontal.st index 08356213..eca7f077 100644 --- a/Squello-Core.package/SPBLandingPage.class/class/minExtentHorizontal.st +++ b/Squello-Core.package/SPBLandingPage.class/class/minExtentHorizontal.st @@ -1,4 +1,4 @@ toolbuilder minExtentHorizontal - ^ 500 \ No newline at end of file + ^ 500. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/class/minExtentVertical.st b/Squello-Core.package/SPBLandingPage.class/class/minExtentVertical.st index 2cad4918..c153e43f 100644 --- a/Squello-Core.package/SPBLandingPage.class/class/minExtentVertical.st +++ b/Squello-Core.package/SPBLandingPage.class/class/minExtentVertical.st @@ -1,4 +1,4 @@ toolbuilder minExtentVertical - ^ 200 \ No newline at end of file + ^ 200. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/class/minHighButton.st b/Squello-Core.package/SPBLandingPage.class/class/minHighButton.st new file mode 100644 index 00000000..d43126cf --- /dev/null +++ b/Squello-Core.package/SPBLandingPage.class/class/minHighButton.st @@ -0,0 +1,4 @@ +toolbuilder +minHighButton + + ^ 50. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardCommonActionsSpecWith..st b/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardCommonActionsSpecWith..st index 2879c406..43a4b8e6 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardCommonActionsSpecWith..st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardCommonActionsSpecWith..st @@ -2,12 +2,11 @@ toolbuilder-manage panel buildLocalBoardCommonActionsSpecWith: aBuilder ^ aBuilder pluggablePanelSpec new - model: self; - children: { - self buildDeleteAllLocalBoardsButtonSpecWith: self usedBuilder. - self buildNewLocalBoardButtonSpecWith: self usedBuilder - }; - layout: #horizontal; - verticalResizing: #shrinkWrap; - yourself. - \ No newline at end of file + model: self; + children: { + self buildDeleteAllLocalBoardsButtonSpecWith: self usedBuilder. + self buildNewLocalBoardButtonSpecWith: self usedBuilder + }; + layout: #horizontal; + verticalResizing: #shrinkWrap; + yourself. diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardPanelSpecWith.withName..st b/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardPanelSpecWith.withName..st index 936123c5..01d377b7 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardPanelSpecWith.withName..st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardPanelSpecWith.withName..st @@ -5,7 +5,7 @@ buildLocalBoardPanelSpecWith: aBuilder withName: aName model: self; layout: #horizontal; horizontalResizing: #rigid; - minimumHeight: (50px); + minimumHeight: (self class minHighButton px); children: { self buildOpenLocalBoardButtonSpecWith: aBuilder withBoardName: aName. self buildRenameLocalBoardButtonSpecWith: aBuilder withBoardName: aName. diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardsListChildren.st b/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardsListChildren.st index 015023d8..371208a2 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardsListChildren.st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardsListChildren.st @@ -1,6 +1,6 @@ toolbuilder-manage panel buildLocalBoardsListChildren - ^ ( SPBBoardSaver defaultSaver boards keys collect: - [:aString | self buildLocalBoardPanelSpecWith: self usedBuilder withName: aString] ) asOrderedCollection. + ^ ( SPBBoardSaver defaultSaver boards keys + collect: [:aString | self buildLocalBoardPanelSpecWith: self usedBuilder withName: aString] ) asOrderedCollection. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardsListSpecWith..st b/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardsListSpecWith..st index 894d1ad8..d747961a 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardsListSpecWith..st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildLocalBoardsListSpecWith..st @@ -2,9 +2,9 @@ toolbuilder-manage panel buildLocalBoardsListSpecWith: aBuilder ^ aBuilder pluggableScrollPaneSpec new - model: self; - vScrollBarPolicy: #always; - children: self buildLocalBoardsListChildren; - layout: #vertical; - yourself. - \ No newline at end of file + model: self; + vScrollBarPolicy: #always; + children: self buildLocalBoardsListChildren; + layout: #vertical; + yourself. + \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildMainLayoutPanelSpecWith..st b/Squello-Core.package/SPBLandingPage.class/instance/buildMainLayoutPanelSpecWith..st index 9bf98802..0deeb405 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildMainLayoutPanelSpecWith..st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildMainLayoutPanelSpecWith..st @@ -2,11 +2,11 @@ toolbuilder buildMainLayoutPanelSpecWith: aBuilder ^ aBuilder pluggablePanelSpec new - model: self; - frame: (0@0 corner: 1@1); - children: { - self buildSidebarSpecWith: aBuilder. - self buildContentPanelSpecWith: aBuilder. - }; - layout: #horizontal; - yourself. \ No newline at end of file + model: self; + frame: (0@0 corner: 1@1); + children: { + self buildSidebarSpecWith: aBuilder. + self buildContentPanelSpecWith: aBuilder. + }; + layout: #horizontal; + yourself. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentGitHubBoardsChildren.st b/Squello-Core.package/SPBLandingPage.class/instance/buildRecentGitHubBoardsChildren.st index ff26e060..a54de435 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentGitHubBoardsChildren.st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildRecentGitHubBoardsChildren.st @@ -1,5 +1,5 @@ toolbuilder-recent boards buildRecentGitHubBoardsChildren - ^ ( self class RecentGitHubBoards collect: - [:aDictionary | self buildRecentGitHubBoardsButtonSpecWith: self usedBuilder withBoardInfo: aDictionary] )asOrderedCollection. \ No newline at end of file + ^ ( self class RecentGitHubBoards + collect: [:aDictionary | self buildRecentGitHubBoardsButtonSpecWith: self usedBuilder withBoardInfo: aDictionary] )asOrderedCollection. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentGitHubBoardsSpecWith..st b/Squello-Core.package/SPBLandingPage.class/instance/buildRecentGitHubBoardsSpecWith..st index dc113b00..4de4356a 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentGitHubBoardsSpecWith..st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildRecentGitHubBoardsSpecWith..st @@ -2,8 +2,8 @@ toolbuilder-recent boards buildRecentGitHubBoardsSpecWith: aBuilder ^ aBuilder pluggablePanelSpec new - name: #RecentGitHubBoards; - model: self; - children: self buildRecentGitHubBoardsChildren; - layout: #horizontal; - yourself. \ No newline at end of file + name: #RecentGitHubBoards; + model: self; + children: self buildRecentGitHubBoardsChildren; + layout: #horizontal; + yourself. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentLocalBoardsChildren.st b/Squello-Core.package/SPBLandingPage.class/instance/buildRecentLocalBoardsChildren.st index 06db9d48..8dd996a2 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentLocalBoardsChildren.st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildRecentLocalBoardsChildren.st @@ -1,5 +1,5 @@ toolbuilder-recent boards buildRecentLocalBoardsChildren - ^ ( self class RecentLocalBoards collect: - [:aString | self buildRecentLocalBoardsButtonSpecWith: self usedBuilder withName: aString] ) asOrderedCollection. \ No newline at end of file + ^ ( self class RecentLocalBoards + collect: [:aString | self buildRecentLocalBoardsButtonSpecWith: self usedBuilder withName: aString] ) asOrderedCollection. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentLocalBoardsSpecWith..st b/Squello-Core.package/SPBLandingPage.class/instance/buildRecentLocalBoardsSpecWith..st index b799cfc7..d2d6839e 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentLocalBoardsSpecWith..st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildRecentLocalBoardsSpecWith..st @@ -2,8 +2,8 @@ toolbuilder-recent boards buildRecentLocalBoardsSpecWith: aBuilder ^ aBuilder pluggablePanelSpec new - name: #RecentLocalBoards; - model: self; - children: self buildRecentLocalBoardsChildren; - layout: #horizontal; - yourself. \ No newline at end of file + name: #RecentLocalBoards; + model: self; + children: self buildRecentLocalBoardsChildren; + layout: #horizontal; + yourself. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/contentPanelChildren.st b/Squello-Core.package/SPBLandingPage.class/instance/contentPanelChildren.st index 32a81f9e..42ff00da 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/contentPanelChildren.st +++ b/Squello-Core.package/SPBLandingPage.class/instance/contentPanelChildren.st @@ -1,7 +1,8 @@ toolbuilder contentPanelChildren - self lastSidebarPart ifNil: [^ {}]. - (self contentSpecDict includesKey: self lastSidebarPart) ifTrue: - [^ (self contentSpecDict at: self lastSidebarPart) collect: [:each| each buildWith: self usedBuilder]]. + self lastSidebarPart + ifNil: [^ {}]. + (self contentSpecDict includesKey: self lastSidebarPart) + ifTrue: [^ (self contentSpecDict at: self lastSidebarPart) collect: [:each| each buildWith: self usedBuilder]]. ^ {}. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/methodProperties.json b/Squello-Core.package/SPBLandingPage.class/methodProperties.json index 6b0f786b..097e2036 100644 --- a/Squello-Core.package/SPBLandingPage.class/methodProperties.json +++ b/Squello-Core.package/SPBLandingPage.class/methodProperties.json @@ -1,13 +1,14 @@ { "class" : { - "RecentGitHubBoards" : "FP 6/10/2024 15:33", - "RecentGitHubBoards:" : "FP 6/10/2024 15:29", - "RecentLocalBoards" : "FP 6/10/2024 15:33", + "RecentGitHubBoards" : "Haru 7/12/2024 18:17", + "RecentGitHubBoards:" : "Haru 7/12/2024 18:18", + "RecentLocalBoards" : "Haru 7/12/2024 18:18", "RecentLocalBoards:" : "Haru 6/9/2024 13:42", - "changeRecentGitHubBoards:" : "FP 6/20/2024 12:16", - "changeRecentLocalBoards:" : "FP 6/20/2024 12:17", - "minExtentHorizontal" : "Haru 7/12/2024 17:40", - "minExtentVertical" : "Haru 7/12/2024 17:42", + "changeRecentGitHubBoards:" : "Haru 7/12/2024 18:23", + "changeRecentLocalBoards:" : "Haru 7/12/2024 18:23", + "minExtentHorizontal" : "Haru 7/12/2024 18:11", + "minExtentVertical" : "Haru 7/12/2024 18:11", + "minHighButton" : "Haru 7/12/2024 18:11", "numberOfRecentGitHubBoards" : "Haru 6/8/2024 12:38", "numberOfRecentLocalBoards" : "Haru 6/8/2024 12:37", "open" : "Haru 6/1/2024 12:28", @@ -17,26 +18,26 @@ "buildContentPanelSpecWith:" : "FP 6/13/2024 13:46", "buildDeleteAllLocalBoardsButtonSpecWith:" : "FP 6/20/2024 18:23", "buildDeleteLocalBoardButtonSpecWith:withBoardName:" : "FP 6/20/2024 18:12", - "buildLocalBoardCommonActionsSpecWith:" : "FP 6/20/2024 16:44", + "buildLocalBoardCommonActionsSpecWith:" : "Haru 7/12/2024 18:09", "buildLocalBoardNameSpecWith:withBoardName:" : "Haru 7/7/2024 18:52", - "buildLocalBoardPanelSpecWith:withName:" : "FP 6/20/2024 18:25", - "buildLocalBoardsListChildren" : "FP 6/13/2024 11:43", - "buildLocalBoardsListSpecWith:" : "FP 6/20/2024 16:36", - "buildMainLayoutPanelSpecWith:" : "FP 6/20/2024 16:45", + "buildLocalBoardPanelSpecWith:withName:" : "Haru 7/12/2024 18:04", + "buildLocalBoardsListChildren" : "Haru 7/12/2024 18:04", + "buildLocalBoardsListSpecWith:" : "Haru 7/12/2024 18:09", + "buildMainLayoutPanelSpecWith:" : "Haru 7/12/2024 18:06", "buildManageLocalBoardPanelSpecWith:" : "FP 6/20/2024 18:13", "buildNewLocalBoardButtonSpecWith:" : "FP 6/20/2024 18:24", "buildOpenButtonSpecWith:" : "FP 6/20/2024 16:46", "buildOpenLocalBoardButtonSpecWith:withBoardName:" : "FP 6/20/2024 18:12", "buildRecentGitHubBoardsButtonSpecWith:withBoardInfo:" : "FP 6/20/2024 16:46", - "buildRecentGitHubBoardsChildren" : "FP 6/13/2024 10:57", - "buildRecentGitHubBoardsSpecWith:" : "FP 6/20/2024 16:47", + "buildRecentGitHubBoardsChildren" : "Haru 7/12/2024 18:10", + "buildRecentGitHubBoardsSpecWith:" : "Haru 7/12/2024 18:10", "buildRecentLocalBoardsButtonSpecWith:withName:" : "FP 6/20/2024 16:50", - "buildRecentLocalBoardsChildren" : "FP 6/13/2024 10:56", - "buildRecentLocalBoardsSpecWith:" : "FP 6/20/2024 16:47", + "buildRecentLocalBoardsChildren" : "Haru 7/12/2024 18:10", + "buildRecentLocalBoardsSpecWith:" : "Haru 7/12/2024 18:10", "buildRenameLocalBoardButtonSpecWith:withBoardName:" : "FP 6/20/2024 18:12", "buildSidebarSpecWith:" : "FP 6/10/2024 14:36", "buildWith:" : "Haru 7/12/2024 17:43", - "contentPanelChildren" : "FP 6/11/2024 12:13", + "contentPanelChildren" : "Haru 7/12/2024 18:08", "contentPanels" : "FP 6/13/2024 11:19", "contentSpecDict" : "Haru 7/12/2024 17:56", "deleteAllLocal" : "FP 6/20/2024 17:20",