switched to new Roassal repository

OpenPonk · Oct 26, 2023 · 946a437 · 946a437
1 parent c203ac6
commit 946a437
Show file tree

Hide file tree

Showing 156 changed files with 164 additions and 5,018 deletions.
diff --git a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st
@@ -16,17 +16,15 @@ BaselineOfOpenPonk >> baseline: spec [
 		self externalProjectsBaseline: spec.
 		self internalProjectsBaseline: spec.
 		spec
-			package: 'OpenPonk-Roassal3'
-			with: [ spec preLoadDoIt: #loadRoassal3 ];
+			package: 'OpenPonk-Roassal'
+			with: [ spec requires: #( 'Roassal' 'RoassalExporters' ) ];
 			package: 'OpenPonk-Core' with: [
 				spec requires:
-						#( 'Magritte' 'Mocketry' 'XMLParser' 'XPath' 'NeoJSON' 'OpenPonk-Roassal3' ) ];
+						#( 'Magritte' 'Mocketry' 'XMLParser' 'XPath' 'NeoJSON' 'OpenPonk-Roassal' ) ];
 			package: 'OpenPonk-Morphic';
 			package: 'OpenPonk-Spec' with: [
-				spec
-					requires:
-						#( 'NewTools' 'Magritte' 'SynchronizedLinks' 'OpenPonk-Morphic' );
-					preLoadDoIt: #loadPetitParserAndRoassal3 ].
+				spec requires:
+						#( 'NewTools' 'Magritte' 'SynchronizedLinks' 'OpenPonk-Morphic' ) ].
 		spec
 			group: 'default'
 			with: #( 'OpenPonk-Core' 'OpenPonk-Morphic' 'OpenPonk-Spec' ) ]
@@ -56,7 +54,18 @@ BaselineOfOpenPonk >> externalProjectsBaseline: spec [
 
 	spec
 		baseline: 'NeoJSON'
-		with: [ spec repository: 'github://svenvc/NeoJSON:b05162a' ]
+		with: [ spec repository: 'github://svenvc/NeoJSON:b05162a' ].
+
+	spec baseline: 'Roassal' with: [
+		spec
+			repository: 'github://pharo-graphics/Roassal:b508334';
+			loads: #Full;
+			preLoadDoIt: #removeOldRoassal3 ].
+
+	spec
+		baseline: 'RoassalExporters'
+		with: [
+		spec repository: 'github://pharo-graphics/RoassalExporters:v1.01' ]
 ]
 
 { #category : #baselines }
@@ -87,35 +96,62 @@ BaselineOfOpenPonk >> loadPetitParser [
 ]
 
 { #category : #baselines }
-BaselineOfOpenPonk >> loadPetitParserAndRoassal3 [
+BaselineOfOpenPonk >> loadPetitParserAndRoassal [
 
 	"PetitParser is not needed by core OP. It is needed by BormEditor, but due to Pharo bug https://github.com/pharo-project/pharo/issues/9913 it must be always loaded before Roassal in Pharo 10"
 
 	self
 		loadPetitParser;
-		loadRoassal3
+		loadRoassal
 ]
 
 { #category : #baselines }
-BaselineOfOpenPonk >> loadRoassal3 [
+BaselineOfOpenPonk >> loadRoassal [
 	"Roassal3 needs to be loaded this way because different version of it is already included in Pharo 10+"
 
-	| exporters |
-	Smalltalk at: #BaselineOfRoassal3Exporters ifPresent: [ ^ self ].
+	| exporters layouts |
+
+	Smalltalk at: #BaselineOfRoassalExporters ifPresent: [ ^ self ].
+
+	layouts := Metacello new.
+	layouts
+		baseline: 'RoassalLayouts';
+		repository: 'github://pharo-graphics/RoassalLayouts:136a902';
+		lock;
+		onConflictUseLoaded.
 
 	exporters := Metacello new.
 	exporters
-		baseline: 'Roassal3Exporters';
-		repository: 'github://ObjectProfile/Roassal3Exporters:6c61b1f';
+		baseline: 'RoassalExporters';
+		repository: 'github://pharo-graphics/RoassalExporters:v1.01';
 		lock;
 		onConflictUseLoaded.
+
 	[
 	Metacello new
-		baseline: 'Roassal3';
-		repository: 'github://ObjectProfile/Roassal3:v1.03';
+		baseline: 'Roassal';
+		repository: 'github://pharo-graphics/Roassal:b508334';
 		lock;
 		load: #Full ]
 		on: MCMergeOrLoadWarning
 		do: [ :warning | warning load ].
+
+	layouts load.
 	exporters load
 ]
+
+{ #category : #baselines }
+BaselineOfOpenPonk >> removeOldRoassal3 [
+
+	#( Roassal3 Numeric ) do: [ :eachName | self removePackage: eachName ]
+]
+
+{ #category : #baselines }
+BaselineOfOpenPonk >> removePackage: aPackageName [
+
+	| regExp packages |
+	regExp := '*' , aPackageName , '*'.
+	packages := RPackageOrganizer default packages select: [ :each |
+		            regExp match: each name ].
+	packages do: [ :each | each removeFromSystem ]
+]
diff --git a/.../OpenPonk-Roassal3/Announcer.extension.st → ...y/OpenPonk-Roassal/Announcer.extension.st b/.../OpenPonk-Roassal3/Announcer.extension.st → ...y/OpenPonk-Roassal/Announcer.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Announcer }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Announcer >> suspendAllOf: anObject while: aBlock [
 
 	| originalSubscriptions result |

diff --git a/...tory/OpenPonk-Roassal3/Color.extension.st → ...itory/OpenPonk-Roassal/Color.extension.st b/...tory/OpenPonk-Roassal3/Color.extension.st → ...itory/OpenPonk-Roassal/Color.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Color }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Color >> withTransparencyAsWhite [
 
 	^ self class

diff --git a/...tory/OpenPonk-Roassal3/Float.extension.st → ...itory/OpenPonk-Roassal/Float.extension.st b/...tory/OpenPonk-Roassal3/Float.extension.st → ...itory/OpenPonk-Roassal/Float.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Float }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Float >> closeTo: num absolutePrecision: aPrecision [
 
 	"Tell whether the receiver and arguments are close from each other given a absolute precision"

diff --git a/...y/OpenPonk-Roassal3/GEllipse.extension.st → ...ry/OpenPonk-Roassal/GEllipse.extension.st b/...y/OpenPonk-Roassal3/GEllipse.extension.st → ...ry/OpenPonk-Roassal/GEllipse.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GEllipse }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GEllipse >> bottom [
 
 	^ coVertex y max: center y + center y - coVertex y
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GEllipse >> left [
 
 	^ vertex x min: center x + center x - vertex x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GEllipse >> right [
 
 	^ vertex x max: center x + center x - vertex x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GEllipse >> top [
 
 	^ coVertex y min: center y + center y - coVertex y

diff --git a/...ory/OpenPonk-Roassal3/GPoint.extension.st → ...tory/OpenPonk-Roassal/GPoint.extension.st b/...ory/OpenPonk-Roassal3/GPoint.extension.st → ...tory/OpenPonk-Roassal/GPoint.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GPoint }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPoint >> bottom [
 
 	^ self y
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPoint >> left [
 
 	^ self x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPoint >> right [
 
 	^ self x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPoint >> top [
 
 	^ self y

diff --git a/...y/OpenPonk-Roassal3/GPolygon.extension.st → ...ry/OpenPonk-Roassal/GPolygon.extension.st b/...y/OpenPonk-Roassal3/GPolygon.extension.st → ...ry/OpenPonk-Roassal/GPolygon.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GPolygon }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPolygon >> bottom [
 
 	^ self encompassingRectangle bottom
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPolygon >> left [
 
 	^ self encompassingRectangle left
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPolygon >> right [
 
 	^ self encompassingRectangle right
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GPolygon >> top [
 
 	^ self encompassingRectangle top

diff --git a/...OpenPonk-Roassal3/GRectangle.extension.st → .../OpenPonk-Roassal/GRectangle.extension.st b/...OpenPonk-Roassal3/GRectangle.extension.st → .../OpenPonk-Roassal/GRectangle.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GRectangle }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GRectangle >> bottom [
 
 	^ (self vertices at: 3) y
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GRectangle >> left [
 
 	^ (self vertices at: 1) x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GRectangle >> right [
 
 	^ (self vertices at: 3) x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GRectangle >> top [
 
 	^ (self vertices at: 1) y

diff --git a/...y/OpenPonk-Roassal3/GSegment.extension.st → ...ry/OpenPonk-Roassal/GSegment.extension.st b/...y/OpenPonk-Roassal3/GSegment.extension.st → ...ry/OpenPonk-Roassal/GSegment.extension.st
@@ -1,24 +1,24 @@
 Extension { #name : #GSegment }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GSegment >> bottom [
 
 	^ v1 y max: v2 y
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GSegment >> left [
 
 	^ v1 x min: v2 x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GSegment >> right [
 
 	^ v1 x max: v2 x
 ]
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 GSegment >> top [
 
 	^ v1 y min: v2 y

diff --git a/...ory/OpenPonk-Roassal3/Number.extension.st → ...tory/OpenPonk-Roassal/Number.extension.st b/...ory/OpenPonk-Roassal3/Number.extension.st → ...tory/OpenPonk-Roassal/Number.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Number }
 
-{ #category : #'*OpenPonk-Roassal3' }
+{ #category : #'*OpenPonk-Roassal' }
 Number >> closeTo: num absolutePrecision: aPrecision [
 	"are these two numbers close?"
 

diff --git a/...tractDraggableControlPointHandle.class.st → ...tractDraggableControlPointHandle.class.st b/...tractDraggableControlPointHandle.class.st → ...tractDraggableControlPointHandle.class.st
@@ -6,7 +6,7 @@ Class {
 		'line',
 		'shape'
 	],
-	#category : #'OpenPonk-Roassal3-Polyline'
+	#category : #'OpenPonk-Roassal-Polyline'
 }
 
 { #category : #accessing }

diff --git a/...l3/OPRSAcceptDenyFeedbackBuilder.class.st → ...al/OPRSAcceptDenyFeedbackBuilder.class.st b/...l3/OPRSAcceptDenyFeedbackBuilder.class.st → ...al/OPRSAcceptDenyFeedbackBuilder.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'feedback'
 	],
-	#category : #'OpenPonk-Roassal3-CreationFeedback'
+	#category : #'OpenPonk-Roassal-CreationFeedback'
 }
 
 { #category : #'as yet unclassified' }

diff --git a/.../OpenPonk-Roassal3/OPRSAdornment.class.st → ...y/OpenPonk-Roassal/OPRSAdornment.class.st b/.../OpenPonk-Roassal3/OPRSAdornment.class.st → ...y/OpenPonk-Roassal/OPRSAdornment.class.st
@@ -7,7 +7,7 @@ Class {
 		'shape',
 		'padding'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #'instance creation' }

diff --git a/...nk-Roassal3/OPRSAdornmentBuilder.class.st → ...onk-Roassal/OPRSAdornmentBuilder.class.st b/...nk-Roassal3/OPRSAdornmentBuilder.class.st → ...onk-Roassal/OPRSAdornmentBuilder.class.st
@@ -8,7 +8,7 @@ Class {
 		'verticalLocation',
 		'horizontalLocation'
 	],
-	#category : #'OpenPonk-Roassal3-Interactions'
+	#category : #'OpenPonk-Roassal-Interactions'
 }
 
 { #category : #adding }

diff --git a/...nk-Roassal3/OPRSAnchorConstraint.class.st → ...onk-Roassal/OPRSAnchorConstraint.class.st b/...nk-Roassal3/OPRSAnchorConstraint.class.st → ...onk-Roassal/OPRSAnchorConstraint.class.st
@@ -11,7 +11,7 @@ Class {
 		'positionReference',
 		'alwaysShowGuideLine'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #building }

diff --git a/...AnchorConstraintBalanceReference.class.st → ...AnchorConstraintBalanceReference.class.st b/...AnchorConstraintBalanceReference.class.st → ...AnchorConstraintBalanceReference.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'balance'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #'instance creation' }

diff --git a/...orConstraintEndDistanceReference.class.st → ...orConstraintEndDistanceReference.class.st b/...orConstraintEndDistanceReference.class.st → ...orConstraintEndDistanceReference.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSAnchorConstraintEndDistanceReference,
 	#superclass : #OPRSAnchorConstraintFixedDistanceReference,
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #'as yet unclassified' }

diff --git a/...ConstraintFixedDistanceReference.class.st → ...ConstraintFixedDistanceReference.class.st b/...ConstraintFixedDistanceReference.class.st → ...ConstraintFixedDistanceReference.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'distance'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #accessing }

diff --git a/...OPRSAnchorConstraintNearestPoint.class.st → ...OPRSAnchorConstraintNearestPoint.class.st b/...OPRSAnchorConstraintNearestPoint.class.st → ...OPRSAnchorConstraintNearestPoint.class.st
@@ -7,7 +7,7 @@ Class {
 		'previousSegmentsLength',
 		'lineLength'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #calculated }

diff --git a/...l3/OPRSAnchorConstraintReference.class.st → ...al/OPRSAnchorConstraintReference.class.st b/...l3/OPRSAnchorConstraintReference.class.st → ...al/OPRSAnchorConstraintReference.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSAnchorConstraintReference,
 	#superclass : #RSObject,
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #'as yet unclassified' }

diff --git a/...sal3/OPRSAnchorConstraintSegment.class.st → ...ssal/OPRSAnchorConstraintSegment.class.st b/...sal3/OPRSAnchorConstraintSegment.class.st → ...ssal/OPRSAnchorConstraintSegment.class.st
diff --git a/...ConstraintStartDistanceReference.class.st → ...ConstraintStartDistanceReference.class.st b/...ConstraintStartDistanceReference.class.st → ...ConstraintStartDistanceReference.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OPRSAnchorConstraintStartDistanceReference,
 	#superclass : #OPRSAnchorConstraintFixedDistanceReference,
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #'as yet unclassified' }

diff --git a/...sal3/OPRSAnchorConstraintUpdater.class.st → ...ssal/OPRSAnchorConstraintUpdater.class.st b/...sal3/OPRSAnchorConstraintUpdater.class.st → ...ssal/OPRSAnchorConstraintUpdater.class.st
@@ -14,7 +14,7 @@ Class {
 		'extraDistance',
 		'positionReference'
 	],
-	#category : #'OpenPonk-Roassal3-AnchorConstraint'
+	#category : #'OpenPonk-Roassal-AnchorConstraint'
 }
 
 { #category : #building }