From bf4e5f3d2ae8f8dab94d533c9a94dc4a118be0d3 Mon Sep 17 00:00:00 2001 From: Offray Luna Date: Fri, 3 Jul 2020 18:53:15 -0500 Subject: [PATCH] Branching from Santiago's improvements. --- .../ConfigurationOfGrafoscopio.class.st | 104 +----------------- repository/Grafoscopio/FileUtils.class.st | 2 +- .../Grafoscopio/FontAwesomeIcons.class.st | 2 +- repository/Grafoscopio/GfUIHelpers.class.st | 2 +- repository/Grafoscopio/GfWorldMenu.class.st | 2 +- .../Grafoscopio/GrafoscopioDocs.class.st | 2 +- .../Grafoscopio/GrafoscopioNode.class.st | 14 +-- .../Grafoscopio/GrafoscopioNodeTest.class.st | 2 +- .../GrafoscopioNotebookTest.class.st | 2 +- .../Grafoscopio/ManifestGrafoscopio.class.st | 2 +- repository/Grafoscopio/MendaIcons.class.st | 2 +- repository/Grafoscopio/MindMap.class.st | 2 +- 12 files changed, 18 insertions(+), 120 deletions(-) diff --git a/repository/ConfigurationOfGrafoscopio/ConfigurationOfGrafoscopio.class.st b/repository/ConfigurationOfGrafoscopio/ConfigurationOfGrafoscopio.class.st index 9ef954c..803f32e 100644 --- a/repository/ConfigurationOfGrafoscopio/ConfigurationOfGrafoscopio.class.st +++ b/repository/ConfigurationOfGrafoscopio/ConfigurationOfGrafoscopio.class.st @@ -13,7 +13,7 @@ Class { #classVars : [ 'LastVersionLoad' ], - #category : 'ConfigurationOfGrafoscopio' + #category : #ConfigurationOfGrafoscopio } { #category : #'development support' } @@ -468,50 +468,6 @@ ConfigurationOfGrafoscopio >> baseline132: spec [ group: 'Extended' with: #('Core') ]. ] -{ #category : #baselines } -ConfigurationOfGrafoscopio >> baseline133: spec [ - - spec - for: #common - do: [ spec blessing: #baseline. - spec - repository: 'http://smalltalkhub.com/Offray/Grafoscopio'; - package: #'Grafoscopio-Utils'. - spec - project: 'Ston' - with: [ spec - className: #ConfigurationOfSton; - versionString: #bleedingEdge; - repository: 'http://ss3.gemstone.com/ss/STON' ]; - project: 'Roassal2' - with: [ spec - className: #ConfigurationOfRoassal2; - versionString: #stable; - repository: 'http://smalltalkhub.com/mc/ObjectProfile/Roassal2/main/' ]; - project: 'WebBrowser' - with: [ spec - className: #ConfigurationOfWebBrowser; - versionString: #stable; - repository: 'http://smalltalkhub.com/TorstenBergmann/WebBrowser' ]; - baseline: #TaskitShell - with: [ spec repository: 'github://sbragagnolo/taskit:master/' ]; - package: 'Spec-Glamour' - with: [ spec - repository: 'http://smalltalkhub.com/mc/jfabry/Playground/main/' ]; - project: 'Fossil' - with: [ spec - className: #ConfigurationOfFossil; - versionString: #stable; - repository: 'http://smalltalkhub.com/mc/Offray/Fossil/main' ]. - spec - package: #Grafoscopio - with: [ spec requires: #('Ston' 'Spec-Glamour' 'Fossil' 'TaskitShell') ]. - spec - group: 'Core' - with: #('Grafoscopio-Utils' 'Roassal2' 'Grafoscopio'); - group: 'Extended' with: #('Core') ] -] - { #category : #baselines } ConfigurationOfGrafoscopio >> baseline1_0: spec [ @@ -698,43 +654,6 @@ ConfigurationOfGrafoscopio >> baseline1_3: spec [ group: 'Extended' with: #('Core') ]. ] -{ #category : #baselines } -ConfigurationOfGrafoscopio >> baseline200: spec [ - "protocol: #baselines" - - - spec - for: #common - do: [ spec blessing: #baseline. - spec - repository: 'http://smalltalkhub.com/Offray/Grafoscopio'; - package: #'Grafoscopio-Utils'. - spec - baseline: #Roassal3 - with: [ spec repository: 'github://ObjectProfile/Roassal3/src' ]; - project: 'WebBrowser' - with: [ spec - className: #ConfigurationOfWebBrowser; - versionString: #stable; - repository: 'http://smalltalkhub.com/TorstenBergmann/WebBrowser' ]; - baseline: #TaskItShell - with: [ spec repository: 'github://sbragagnolo/taskit:master/' ]; - baseline: #Pillar - with: [ spec repository: 'github://pillar-markup/pillar/' ]; - project: 'Fossil' - with: [ spec - className: #ConfigurationOfFossil; - versionString: #stable; - repository: 'http://smalltalkhub.com/mc/Offray/Fossil/main' ]. - spec - package: #Grafoscopio - with: [ spec requires: #('TaskItShell' 'Fossil' 'Pillar') ]. - spec - group: 'Core' - with: #('Grafoscopio-Utils' 'Roassal3' 'Grafoscopio'); - group: 'Extended' with: #('Core') ] -] - { #category : #accessing } ConfigurationOfGrafoscopio >> customProjectAttributes [ "Edit to return a collection of any custom attributes e.g. for conditional loading: Array with: #'Condition1' with: #'Condition2. @@ -773,7 +692,7 @@ ConfigurationOfGrafoscopio >> project [ ConfigurationOfGrafoscopio >> stable: spec [ - spec for: #'common' version: '1.5.5'. + spec for: #'common' version: '1.5.4'. ] @@ -1286,25 +1205,6 @@ ConfigurationOfGrafoscopio >> version154: spec [ package: 'Spec-Glamour' with: 'Spec-Glamour-johanfabry.2'.] ] -{ #category : #versions } -ConfigurationOfGrafoscopio >> version155: spec [ - - - spec for: #'common' do: [ - spec - blessing: #'stable'; - description: 'version 1.5.5'; - author: 'Offray Luna'. - spec - project: 'Fossil' with: #stable; - project: 'Roassal2' with: #stable; - project: 'WebBrowser' with: #stable. - spec - package: #'Grafoscopio-Utils' with: 'Grafoscopio-Utils-OffrayLuna.36'; - package: #Grafoscopio with: 'Grafoscopio-Offray.365'; - package: 'Spec-Glamour' with: 'Spec-Glamour-johanfabry.2'.] -] - { #category : #versions } ConfigurationOfGrafoscopio >> version15: spec [ diff --git a/repository/Grafoscopio/FileUtils.class.st b/repository/Grafoscopio/FileUtils.class.st index 411aa0d..f32a7b8 100644 --- a/repository/Grafoscopio/FileUtils.class.st +++ b/repository/Grafoscopio/FileUtils.class.st @@ -4,7 +4,7 @@ I provide some convenience functionality to work with files. Class { #name : #FileUtils, #superclass : #Object, - #category : #'Grafoscopio-Model' + #category : 'Grafoscopio-Model' } { #category : #utilities } diff --git a/repository/Grafoscopio/FontAwesomeIcons.class.st b/repository/Grafoscopio/FontAwesomeIcons.class.st index b8d6107..089875f 100644 --- a/repository/Grafoscopio/FontAwesomeIcons.class.st +++ b/repository/Grafoscopio/FontAwesomeIcons.class.st @@ -32,7 +32,7 @@ Class { #classVars : [ 'Current' ], - #category : #'Grafoscopio-UI' + #category : 'Grafoscopio-UI' } { #category : #'accessing - icons' } diff --git a/repository/Grafoscopio/GfUIHelpers.class.st b/repository/Grafoscopio/GfUIHelpers.class.st index fdabe45..0be3b69 100644 --- a/repository/Grafoscopio/GfUIHelpers.class.st +++ b/repository/Grafoscopio/GfUIHelpers.class.st @@ -24,7 +24,7 @@ Class { 'recentNotebooks', 'helpMenu' ], - #category : #'Grafoscopio-UI' + #category : 'Grafoscopio-UI' } { #category : #adding } diff --git a/repository/Grafoscopio/GfWorldMenu.class.st b/repository/Grafoscopio/GfWorldMenu.class.st index bc3f452..96046e9 100644 --- a/repository/Grafoscopio/GfWorldMenu.class.st +++ b/repository/Grafoscopio/GfWorldMenu.class.st @@ -7,7 +7,7 @@ Class { #classInstVars : [ 'recentNotebooks' ], - #category : #'Grafoscopio-UI' + #category : 'Grafoscopio-UI' } { #category : #'world menu' } diff --git a/repository/Grafoscopio/GrafoscopioDocs.class.st b/repository/Grafoscopio/GrafoscopioDocs.class.st index 05d8797..c5c0d5d 100644 --- a/repository/Grafoscopio/GrafoscopioDocs.class.st +++ b/repository/Grafoscopio/GrafoscopioDocs.class.st @@ -4,7 +4,7 @@ I define the documentation for the Grafoscopio package. Class { #name : #GrafoscopioDocs, #superclass : #GrafoscopioDocumentation, - #category : #Grafoscopio + #category : 'Grafoscopio' } { #category : #operation } diff --git a/repository/Grafoscopio/GrafoscopioNode.class.st b/repository/Grafoscopio/GrafoscopioNode.class.st index 86dc3e6..c0fa557 100644 --- a/repository/Grafoscopio/GrafoscopioNode.class.st +++ b/repository/Grafoscopio/GrafoscopioNode.class.st @@ -32,7 +32,7 @@ Class { #classInstVars : [ 'clipboard' ], - #category : #'Grafoscopio-Model' + #category : 'Grafoscopio-Model' } { #category : #utility } @@ -978,14 +978,12 @@ GrafoscopioNode >> root [ { #category : #operation } GrafoscopioNode >> sanitizeDefaultLink [ | defaultLink sanitized protocol | - defaultLink := self lastLink. - protocol := 'docutopia://'. - sanitized := (defaultLink beginsWith: protocol) - ifTrue: [ defaultLink - copyReplaceAll: protocol - with: 'https://docutopia.tupale.co/' ] - ifFalse: [ defaultLink ]. + defaultLink := self links last. + protocol := 'docutopia://'. + (defaultLink beginsWith: protocol ) + ifTrue: [ sanitized := defaultLink copyReplaceAll: protocol with: 'https://docutopia.tupale.co/' ]. ^ sanitized + ] { #category : #accessing } diff --git a/repository/Grafoscopio/GrafoscopioNodeTest.class.st b/repository/Grafoscopio/GrafoscopioNodeTest.class.st index f86983c..a54b2ba 100644 --- a/repository/Grafoscopio/GrafoscopioNodeTest.class.st +++ b/repository/Grafoscopio/GrafoscopioNodeTest.class.st @@ -4,7 +4,7 @@ I test the main functionality of the GrafoscopioNode class. Class { #name : #GrafoscopioNodeTest, #superclass : #TestCase, - #category : #'Grafoscopio-Model' + #category : 'Grafoscopio-Model' } { #category : #tests } diff --git a/repository/Grafoscopio/GrafoscopioNotebookTest.class.st b/repository/Grafoscopio/GrafoscopioNotebookTest.class.st index 3ddee46..3a42310 100644 --- a/repository/Grafoscopio/GrafoscopioNotebookTest.class.st +++ b/repository/Grafoscopio/GrafoscopioNotebookTest.class.st @@ -4,5 +4,5 @@ I test the main functionality of the GrafoscopioNode class. Class { #name : #GrafoscopioNotebookTest, #superclass : #TestCase, - #category : #'Grafoscopio-UI' + #category : 'Grafoscopio-UI' } diff --git a/repository/Grafoscopio/ManifestGrafoscopio.class.st b/repository/Grafoscopio/ManifestGrafoscopio.class.st index eb8aeb2..351fdee 100644 --- a/repository/Grafoscopio/ManifestGrafoscopio.class.st +++ b/repository/Grafoscopio/ManifestGrafoscopio.class.st @@ -4,7 +4,7 @@ I store metadata for this package. These meta data are used by other tools such Class { #name : #ManifestGrafoscopio, #superclass : #PackageManifest, - #category : #Grafoscopio + #category : 'Grafoscopio' } { #category : #'code-critics' } diff --git a/repository/Grafoscopio/MendaIcons.class.st b/repository/Grafoscopio/MendaIcons.class.st index d5b11a2..8b45bf4 100644 --- a/repository/Grafoscopio/MendaIcons.class.st +++ b/repository/Grafoscopio/MendaIcons.class.st @@ -29,7 +29,7 @@ Class { #classVars : [ 'Current' ], - #category : #'Grafoscopio-UI' + #category : 'Grafoscopio-UI' } { #category : #'instance creation' } diff --git a/repository/Grafoscopio/MindMap.class.st b/repository/Grafoscopio/MindMap.class.st index e37f9e0..74e9c78 100644 --- a/repository/Grafoscopio/MindMap.class.st +++ b/repository/Grafoscopio/MindMap.class.st @@ -6,7 +6,7 @@ to javascript enabled web presentations. Class { #name : #MindMap, #superclass : #Object, - #category : #'Grafoscopio-Model' + #category : 'Grafoscopio-Model' } { #category : #'as yet unclassified' }