From c872158fc1b8e0987e2b162882295fd4d5dc907e Mon Sep 17 00:00:00 2001 From: Nick Bessin Date: Thu, 27 May 2021 12:43:37 +0200 Subject: [PATCH 1/4] fixed position bug changed .json naming for saving animation --- .../instance/createStartInformation..st | 6 +++--- .../AnimationsEditor.class/instance/outputFileDirectory.st | 2 +- .../instance/writeJsonToFile.with..st | 2 +- .../AnimationsEditor.class/methodProperties.json | 6 +++--- .../instance/startInformationDictionary..st | 6 +++--- .../AnimationsEditorTest.class/methodProperties.json | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/createStartInformation..st b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/createStartInformation..st index cfff70c..93464c1 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/createStartInformation..st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/createStartInformation..st @@ -9,10 +9,10 @@ createStartInformation: aMorph with: #value -> aMorph rotationDegrees. Dictionary with: #name -> 'positionX' - with: #value -> aMorph x. + with: #value -> aMorph position x. Dictionary with: #name -> 'positionY' - with: #value -> aMorph y. + with: #value -> aMorph position y. Dictionary with: #name -> 'width' with: #value -> aMorph width. @@ -21,5 +21,5 @@ createStartInformation: aMorph with: #value -> aMorph height. Dictionary with: #name -> 'color' - with: #value -> aMorph color rgbTriplet. + with: #value -> aMorph color printHtmlString asSymbol. }. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/outputFileDirectory.st b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/outputFileDirectory.st index 3216a55..531003d 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/outputFileDirectory.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/outputFileDirectory.st @@ -1,5 +1,5 @@ saveJson outputFileDirectory - ^ UIManager default saveFilenameRequest: 'Please, enter file name.' initialAnswer: 'animation'. + ^ UIManager default saveFilenameRequest: 'Please, enter file name.' initialAnswer: 'animation.json'. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/writeJsonToFile.with..st b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/writeJsonToFile.with..st index 8608bdb..69577a7 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/writeJsonToFile.with..st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/writeJsonToFile.with..st @@ -2,6 +2,6 @@ saveJson writeJsonToFile: aJsonString with: aDirectory aDirectory ifNotNil: [ - FileDirectory default forceNewFileNamed: aDirectory, '.json' do: [:stream | + FileDirectory default forceNewFileNamed: aDirectory do: [:stream | stream nextPutAll: aJsonString]. ] \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json index 88f5187..1adc905 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json @@ -33,7 +33,7 @@ "createPositionPropertyFrom:" : "DM 8/6/2020 10:09", "createRotationPropertyFrom:" : "FH 5/13/2021 10:16", "createSizePropertyFrom:" : "DM 7/8/2020 14:29", - "createStartInformation:" : "MH 5/20/2021 11:24", + "createStartInformation:" : "NB 5/27/2021 12:37", "createStructure:with:" : "NB 5/13/2021 10:25", "defaultEmptyPanels" : "DM 8/7/2020 17:37", "defaultPropertyPanelPosition" : "DM 8/6/2020 10:38", @@ -62,7 +62,7 @@ "mainWindow" : "JIZ 6/3/2020 17:04", "mainWindow:" : "JIZ 6/3/2020 17:04", "morphTypes" : "LW 5/15/2021 14:00", - "outputFileDirectory" : "NB 5/21/2021 09:07", + "outputFileDirectory" : "NB 5/27/2021 12:38", "playAnimations" : "MH 5/10/2021 11:48", "propertiesDictionary" : "LW 5/15/2021 15:05", "propertyEditorPanel" : "DM 6/22/2020 01:27", @@ -89,4 +89,4 @@ "updateInformationText:" : "DM 8/4/2020 16:18", "windowReference" : "DM 8/4/2020 13:19", "windowReference:" : "DM 8/4/2020 13:19", - "writeJsonToFile:with:" : "NB 5/21/2021 08:39" } } + "writeJsonToFile:with:" : "NB 5/27/2021 12:38" } } diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/startInformationDictionary..st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/startInformationDictionary..st index a050fc1..b106750 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/startInformationDictionary..st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/startInformationDictionary..st @@ -8,10 +8,10 @@ startInformationDictionary: aMorph with: #value -> aMorph rotationDegrees. Dictionary with: #name -> 'positionX' - with: #value -> aMorph x. + with: #value -> aMorph position x. Dictionary with: #name -> 'positionY' - with: #value -> aMorph y. + with: #value -> aMorph position y. Dictionary with: #name -> 'width' with: #value -> aMorph width. @@ -20,6 +20,6 @@ startInformationDictionary: aMorph with: #value -> aMorph height. Dictionary with: #name -> 'color' - with: #value -> aMorph color rgbTriplet. + with: #value -> aMorph color printHtmlString asSymbol. }. \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json index 1705ea3..9f14e13 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json @@ -13,7 +13,7 @@ "setUp" : "NB 5/19/2021 10:25", "sizeFrameDictionary" : "MH 5/20/2021 11:19", "sizeTreeNode" : "LW 5/23/2021 12:30", - "startInformationDictionary:" : "MH 5/20/2021 11:22", + "startInformationDictionary:" : "NB 5/27/2021 12:38", "tearDown" : "LW 5/23/2021 12:30", "testAddColorFrame" : "MH 5/20/2021 11:15", "testAddMorphToJson" : "MH 5/20/2021 11:56", From 1ef389792b2db1ef815539677c8f3aeae068a32c Mon Sep 17 00:00:00 2001 From: Nick Bessin Date: Mon, 31 May 2021 08:02:57 +0200 Subject: [PATCH 2/4] delete test file --- .../AnimationsEditorTest.class/instance/tearDown.st | 2 +- .../instance/testWriteJsonToFile.st | 2 +- .../AnimationsEditorTest.class/methodProperties.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/tearDown.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/tearDown.st index d70822b..c4290cb 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/tearDown.st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/tearDown.st @@ -2,5 +2,5 @@ saveJson tearDown (self animationsEditorInstance propertyList second) targetMorph abandon. self animationsEditorInstance windowReference abandon. - + (FileDirectory default) deleteFileNamed: 'test.json'. \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testWriteJsonToFile.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testWriteJsonToFile.st index 05c02b8..c18f29e 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testWriteJsonToFile.st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testWriteJsonToFile.st @@ -3,6 +3,6 @@ testWriteJsonToFile | jsonString fileContent | jsonString := '{ "Test": { "id": "1"} }'. - self animationsEditorInstance writeJsonToFile: jsonString with: 'test'. + self animationsEditorInstance writeJsonToFile: jsonString with: 'test.json'. fileContent := (FileStream fileNamed: 'test.json') contents. self assert: fileContent isEmpty not. \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json index 9f14e13..09c560f 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json @@ -14,7 +14,7 @@ "sizeFrameDictionary" : "MH 5/20/2021 11:19", "sizeTreeNode" : "LW 5/23/2021 12:30", "startInformationDictionary:" : "NB 5/27/2021 12:38", - "tearDown" : "LW 5/23/2021 12:30", + "tearDown" : "NB 5/31/2021 07:58", "testAddColorFrame" : "MH 5/20/2021 11:15", "testAddMorphToJson" : "MH 5/20/2021 11:56", "testAddPositionFrame" : "MH 5/20/2021 11:16", @@ -50,4 +50,4 @@ "testTreeSpecWithNoMorph" : "DM 8/7/2020 18:59", "testTreeSpecWithOneMorph" : "DM 8/7/2020 18:59", "testTreeSpecWithOneMorphPosition" : "FH 5/13/2021 12:05", - "testWriteJsonToFile" : "NB 5/21/2021 09:08" } } + "testWriteJsonToFile" : "NB 5/27/2021 12:53" } } From 3915f1917ea5fad0acde515a4e45dc19c947fe09 Mon Sep 17 00:00:00 2001 From: lwenner <21086980+lwenner@users.noreply.github.com> Date: Mon, 31 May 2021 11:07:37 +0200 Subject: [PATCH 3/4] dropped support for 5.2, 5.1 --- .github/workflows/smalltalk-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/smalltalk-ci.yml b/.github/workflows/smalltalk-ci.yml index 7a02830..793de09 100644 --- a/.github/workflows/smalltalk-ci.yml +++ b/.github/workflows/smalltalk-ci.yml @@ -8,8 +8,6 @@ jobs: os: [ ubuntu-latest, macos-latest, windows-latest ] smalltalk: - Squeak64-5.3 - - Squeak64-5.2 - - Squeak64-5.1 - Squeak64-trunk runs-on: ${{ matrix.os }} name: ${{ matrix.smalltalk }} on ${{ matrix.os }} From cbc90e26ee43255d5aa74c5f68af5c645c0fdf6c Mon Sep 17 00:00:00 2001 From: Nick Bessin Date: Mon, 31 May 2021 13:03:22 +0200 Subject: [PATCH 4/4] fix teardown --- .../AnimationsEditorTest.class/instance/tearDown.st | 3 ++- .../instance/testWriteJsonToFile.st | 3 ++- .../AnimationsEditorTest.class/methodProperties.json | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/tearDown.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/tearDown.st index c4290cb..75416de 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/tearDown.st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/tearDown.st @@ -2,5 +2,6 @@ saveJson tearDown (self animationsEditorInstance propertyList second) targetMorph abandon. self animationsEditorInstance windowReference abandon. - (FileDirectory default) deleteFileNamed: 'test.json'. + super tearDown. + \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testWriteJsonToFile.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testWriteJsonToFile.st index c18f29e..8b846ff 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testWriteJsonToFile.st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testWriteJsonToFile.st @@ -5,4 +5,5 @@ testWriteJsonToFile jsonString := '{ "Test": { "id": "1"} }'. self animationsEditorInstance writeJsonToFile: jsonString with: 'test.json'. fileContent := (FileStream fileNamed: 'test.json') contents. - self assert: fileContent isEmpty not. \ No newline at end of file + self assert: fileContent isEmpty not. + (FileDirectory default) deleteFileNamed: 'test.json'. \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json index 09c560f..3a4afc5 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json @@ -14,7 +14,7 @@ "sizeFrameDictionary" : "MH 5/20/2021 11:19", "sizeTreeNode" : "LW 5/23/2021 12:30", "startInformationDictionary:" : "NB 5/27/2021 12:38", - "tearDown" : "NB 5/31/2021 07:58", + "tearDown" : "NB 5/31/2021 13:02", "testAddColorFrame" : "MH 5/20/2021 11:15", "testAddMorphToJson" : "MH 5/20/2021 11:56", "testAddPositionFrame" : "MH 5/20/2021 11:16", @@ -50,4 +50,4 @@ "testTreeSpecWithNoMorph" : "DM 8/7/2020 18:59", "testTreeSpecWithOneMorph" : "DM 8/7/2020 18:59", "testTreeSpecWithOneMorphPosition" : "FH 5/13/2021 12:05", - "testWriteJsonToFile" : "NB 5/27/2021 12:53" } } + "testWriteJsonToFile" : "NB 5/31/2021 13:02" } }