From bacecce5b18b9156b1fb020fbe3e10f19790ecae Mon Sep 17 00:00:00 2001 From: Jan Bliznicenko Date: Wed, 25 Oct 2023 09:16:12 +0200 Subject: [PATCH] switched to new Roassal repository --- .../BaselineOfOpenPonk.class.st | 35 ++++++++++++------ .../Announcer.extension.st | 2 +- .../Color.extension.st | 2 +- .../Float.extension.st | 2 +- .../GEllipse.extension.st | 8 ++-- .../GPoint.extension.st | 8 ++-- .../GPolygon.extension.st | 8 ++-- .../GRectangle.extension.st | 8 ++-- .../GSegment.extension.st | 8 ++-- .../Number.extension.st | 2 +- ...stractDraggableControlPointHandle.class.st | 2 +- .../OPRSAcceptDenyFeedbackBuilder.class.st | 2 +- .../OPRSAdornment.class.st | 2 +- .../OPRSAdornmentBuilder.class.st | 2 +- .../OPRSAnchorConstraint.class.st | 2 +- ...SAnchorConstraintBalanceReference.class.st | 2 +- ...horConstraintEndDistanceReference.class.st | 2 +- ...rConstraintFixedDistanceReference.class.st | 2 +- .../OPRSAnchorConstraintNearestPoint.class.st | 2 +- .../OPRSAnchorConstraintReference.class.st | 2 +- .../OPRSAnchorConstraintSegment.class.st | Bin 5109 -> 5108 bytes ...rConstraintStartDistanceReference.class.st | 2 +- .../OPRSAnchorConstraintUpdater.class.st | 2 +- .../OPRSBezier.class.st | 2 +- .../OPRSBezier.extension.st | 0 .../OPRSCanvasADFeedback.class.st | 2 +- .../OPRSConditionallyDraggable.class.st | 2 +- .../OPRSControlConfiguration.class.st | 2 +- .../OPRSControlPointCreatorHandle.class.st | 2 +- .../OPRSCustomScaleCamSetter.class.st | 2 +- .../OPRSDragFromSelectionEnd.class.st | 2 +- .../OPRSDragFromSelectionStart.class.st | 2 +- .../OPRSDraggableCPController.class.st | 2 +- .../OPRSDraggableControlPointHandle.class.st | 2 +- .../OPRSDraggableControlPoints.class.st | 2 +- .../OPRSDraggedControlPointsEvent.class.st | 2 +- .../OPRSEmptyMarker.class.st | 2 +- .../OPRSEmptyMarkerBuilder.class.st | 2 +- .../OPRSEmptyShapeProxy.class.st | 2 +- ...PRSKeyNavigationCanvasInteraction.class.st | 2 +- .../OPRSLabeled.class.st | 2 +- .../OPRSLineADFeedback.class.st | 2 +- .../OPRSMarkerBuilder.class.st | 2 +- .../OPRSNoInteraction.class.st | 2 +- .../OPRSNodeADFeedback.class.st | 2 +- .../OPRSOrthogonalBorderAttachPoint.class.st | 2 +- .../OPRSPolyline.class.st | 2 +- .../OPRSRemoveable.class.st | 2 +- .../OPRSResizable.class.st | 2 +- .../OPRSResize.class.st | 2 +- .../OPRSSelectable.class.st | 2 +- .../OPRSSelectableCanvas.class.st | 2 +- .../OPRSSelectionDraggable.class.st | 2 +- .../OPRSSelectionDraggableBorder.class.st | 2 +- ...nDraggableContainedShapesProvider.class.st | 2 +- ...tionDraggableCustomShapesProvider.class.st | 2 +- ...ctionDraggableInnerShapesProvider.class.st | 2 +- ...ionDraggableNoInnerShapesProvider.class.st | 2 +- ...eSmallerOverlappingShapesProvider.class.st | 2 +- .../OPRSSelectionEndEvent.class.st | 2 +- .../OPRSZoomableCanvasInteraction.class.st | 2 +- ...tangleDragAlignmentHorizontalLine.class.st | 2 +- .../OPRectangleDragAlignmentLine.class.st | 2 +- ...ectangleDragAlignmentVerticalLine.class.st | 2 +- .../Point.extension.st | 2 +- ...tractControlCanvasInteraction.extension.st | 2 +- .../RSAbstractControlPointsLine.extension.st | 2 +- .../RSAbstractLine.extension.st | 4 +- .../RSAthensMorph.extension.st | 2 +- .../RSBorderColoringComposite.class.st | 2 +- .../RSBoundingShape.extension.st | 4 +- .../RSCanvas.extension.st | 6 +-- .../RSComposite.extension.st | 2 +- .../RSControlConfiguration.extension.st | 4 +- .../RSEvent.extension.st | 4 +- .../RSMarker.extension.st | 2 +- .../RSObjectWithProperty.extension.st | 4 +- .../RSShape.extension.st | 12 +++--- .../Rectangle.extension.st | 14 +++---- repository/OpenPonk-Roassal/package.st | 1 + repository/OpenPonk-Roassal3/package.st | 1 - 81 files changed, 133 insertions(+), 122 deletions(-) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/Announcer.extension.st (91%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/Color.extension.st (84%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/Float.extension.st (91%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/GEllipse.extension.st (68%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/GPoint.extension.st (50%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/GPolygon.extension.st (63%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/GRectangle.extension.st (61%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/GSegment.extension.st (56%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/Number.extension.st (88%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAbstractDraggableControlPointHandle.class.st (96%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAcceptDenyFeedbackBuilder.class.st (96%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAdornment.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAdornmentBuilder.class.st (97%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAnchorConstraint.class.st (99%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAnchorConstraintBalanceReference.class.st (96%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAnchorConstraintEndDistanceReference.class.st (94%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAnchorConstraintFixedDistanceReference.class.st (97%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAnchorConstraintNearestPoint.class.st (97%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAnchorConstraintReference.class.st (93%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAnchorConstraintSegment.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAnchorConstraintStartDistanceReference.class.st (94%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSAnchorConstraintUpdater.class.st (99%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSBezier.class.st (93%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSBezier.extension.st (100%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSCanvasADFeedback.class.st (84%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSConditionallyDraggable.class.st (93%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSControlConfiguration.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSControlPointCreatorHandle.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSCustomScaleCamSetter.class.st (96%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSDragFromSelectionEnd.class.st (64%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSDragFromSelectionStart.class.st (64%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSDraggableCPController.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSDraggableControlPointHandle.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSDraggableControlPoints.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSDraggedControlPointsEvent.class.st (67%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSEmptyMarker.class.st (85%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSEmptyMarkerBuilder.class.st (87%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSEmptyShapeProxy.class.st (93%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSKeyNavigationCanvasInteraction.class.st (91%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSLabeled.class.st (96%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSLineADFeedback.class.st (94%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSMarkerBuilder.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSNoInteraction.class.st (76%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSNodeADFeedback.class.st (94%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSOrthogonalBorderAttachPoint.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSPolyline.class.st (79%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSRemoveable.class.st (96%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSResizable.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSResize.class.st (93%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectable.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectableCanvas.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectionDraggable.class.st (99%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectionDraggableBorder.class.st (99%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectionDraggableContainedShapesProvider.class.st (92%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectionDraggableCustomShapesProvider.class.st (94%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectionDraggableInnerShapesProvider.class.st (82%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectionDraggableNoInnerShapesProvider.class.st (84%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectionDraggableSmallerOverlappingShapesProvider.class.st (93%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSSelectionEndEvent.class.st (87%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRSZoomableCanvasInteraction.class.st (95%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRectangleDragAlignmentHorizontalLine.class.st (90%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRectangleDragAlignmentLine.class.st (97%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/OPRectangleDragAlignmentVerticalLine.class.st (91%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/Point.extension.st (84%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSAbstractControlCanvasInteraction.extension.st (95%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSAbstractControlPointsLine.extension.st (85%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSAbstractLine.extension.st (75%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSAthensMorph.extension.st (82%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSBorderColoringComposite.class.st (98%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSBoundingShape.extension.st (84%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSCanvas.extension.st (82%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSComposite.extension.st (83%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSControlConfiguration.extension.st (68%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSEvent.extension.st (80%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSMarker.extension.st (84%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSObjectWithProperty.extension.st (73%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/RSShape.extension.st (79%) rename repository/{OpenPonk-Roassal3 => OpenPonk-Roassal}/Rectangle.extension.st (91%) create mode 100644 repository/OpenPonk-Roassal/package.st delete mode 100644 repository/OpenPonk-Roassal3/package.st diff --git a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st index a5add2ab..8899f4bd 100644 --- a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st +++ b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st @@ -16,8 +16,8 @@ BaselineOfOpenPonk >> baseline: spec [ self externalProjectsBaseline: spec. self internalProjectsBaseline: spec. spec - package: 'OpenPonk-Roassal3' - with: [ spec preLoadDoIt: #loadRoassal3 ]; + package: 'OpenPonk-Roassal' + with: [ spec preLoadDoIt: #loadRoassal ]; package: 'OpenPonk-Core' with: [ spec requires: #( 'Magritte' 'Mocketry' 'XMLParser' 'XPath' 'NeoJSON' 'OpenPonk-Roassal3' ) ]; @@ -26,7 +26,7 @@ BaselineOfOpenPonk >> baseline: spec [ spec requires: #( 'NewTools' 'Magritte' 'SynchronizedLinks' 'OpenPonk-Morphic' ); - preLoadDoIt: #loadPetitParserAndRoassal3 ]. + preLoadDoIt: #loadPetitParserAndRoassal ]. spec group: 'default' with: #( 'OpenPonk-Core' 'OpenPonk-Morphic' 'OpenPonk-Spec' ) ] @@ -87,35 +87,46 @@ 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 ] diff --git a/repository/OpenPonk-Roassal3/Announcer.extension.st b/repository/OpenPonk-Roassal/Announcer.extension.st similarity index 91% rename from repository/OpenPonk-Roassal3/Announcer.extension.st rename to repository/OpenPonk-Roassal/Announcer.extension.st index 9a186f35..8264216e 100644 --- a/repository/OpenPonk-Roassal3/Announcer.extension.st +++ b/repository/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/repository/OpenPonk-Roassal3/Color.extension.st b/repository/OpenPonk-Roassal/Color.extension.st similarity index 84% rename from repository/OpenPonk-Roassal3/Color.extension.st rename to repository/OpenPonk-Roassal/Color.extension.st index 1f3450a5..d4f63930 100644 --- a/repository/OpenPonk-Roassal3/Color.extension.st +++ b/repository/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/repository/OpenPonk-Roassal3/Float.extension.st b/repository/OpenPonk-Roassal/Float.extension.st similarity index 91% rename from repository/OpenPonk-Roassal3/Float.extension.st rename to repository/OpenPonk-Roassal/Float.extension.st index 526f7299..5fbfbede 100644 --- a/repository/OpenPonk-Roassal3/Float.extension.st +++ b/repository/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/repository/OpenPonk-Roassal3/GEllipse.extension.st b/repository/OpenPonk-Roassal/GEllipse.extension.st similarity index 68% rename from repository/OpenPonk-Roassal3/GEllipse.extension.st rename to repository/OpenPonk-Roassal/GEllipse.extension.st index 46b83cba..4b4c68ac 100644 --- a/repository/OpenPonk-Roassal3/GEllipse.extension.st +++ b/repository/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/repository/OpenPonk-Roassal3/GPoint.extension.st b/repository/OpenPonk-Roassal/GPoint.extension.st similarity index 50% rename from repository/OpenPonk-Roassal3/GPoint.extension.st rename to repository/OpenPonk-Roassal/GPoint.extension.st index 5f3016ea..659dbeb0 100644 --- a/repository/OpenPonk-Roassal3/GPoint.extension.st +++ b/repository/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/repository/OpenPonk-Roassal3/GPolygon.extension.st b/repository/OpenPonk-Roassal/GPolygon.extension.st similarity index 63% rename from repository/OpenPonk-Roassal3/GPolygon.extension.st rename to repository/OpenPonk-Roassal/GPolygon.extension.st index 93dfa7d9..96b6b109 100644 --- a/repository/OpenPonk-Roassal3/GPolygon.extension.st +++ b/repository/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/repository/OpenPonk-Roassal3/GRectangle.extension.st b/repository/OpenPonk-Roassal/GRectangle.extension.st similarity index 61% rename from repository/OpenPonk-Roassal3/GRectangle.extension.st rename to repository/OpenPonk-Roassal/GRectangle.extension.st index 0660e53c..d90d6ad4 100644 --- a/repository/OpenPonk-Roassal3/GRectangle.extension.st +++ b/repository/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/repository/OpenPonk-Roassal3/GSegment.extension.st b/repository/OpenPonk-Roassal/GSegment.extension.st similarity index 56% rename from repository/OpenPonk-Roassal3/GSegment.extension.st rename to repository/OpenPonk-Roassal/GSegment.extension.st index 13156259..b4174507 100644 --- a/repository/OpenPonk-Roassal3/GSegment.extension.st +++ b/repository/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/repository/OpenPonk-Roassal3/Number.extension.st b/repository/OpenPonk-Roassal/Number.extension.st similarity index 88% rename from repository/OpenPonk-Roassal3/Number.extension.st rename to repository/OpenPonk-Roassal/Number.extension.st index ff9509d5..ed3e22b2 100644 --- a/repository/OpenPonk-Roassal3/Number.extension.st +++ b/repository/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/repository/OpenPonk-Roassal3/OPRSAbstractDraggableControlPointHandle.class.st b/repository/OpenPonk-Roassal/OPRSAbstractDraggableControlPointHandle.class.st similarity index 96% rename from repository/OpenPonk-Roassal3/OPRSAbstractDraggableControlPointHandle.class.st rename to repository/OpenPonk-Roassal/OPRSAbstractDraggableControlPointHandle.class.st index 6e083d27..3d36b4f9 100644 --- a/repository/OpenPonk-Roassal3/OPRSAbstractDraggableControlPointHandle.class.st +++ b/repository/OpenPonk-Roassal/OPRSAbstractDraggableControlPointHandle.class.st @@ -6,7 +6,7 @@ Class { 'line', 'shape' ], - #category : #'OpenPonk-Roassal3-Polyline' + #category : #'OpenPonk-Roassal-Polyline' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSAcceptDenyFeedbackBuilder.class.st b/repository/OpenPonk-Roassal/OPRSAcceptDenyFeedbackBuilder.class.st similarity index 96% rename from repository/OpenPonk-Roassal3/OPRSAcceptDenyFeedbackBuilder.class.st rename to repository/OpenPonk-Roassal/OPRSAcceptDenyFeedbackBuilder.class.st index 79521509..cc73ac3c 100644 --- a/repository/OpenPonk-Roassal3/OPRSAcceptDenyFeedbackBuilder.class.st +++ b/repository/OpenPonk-Roassal/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/repository/OpenPonk-Roassal3/OPRSAdornment.class.st b/repository/OpenPonk-Roassal/OPRSAdornment.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSAdornment.class.st rename to repository/OpenPonk-Roassal/OPRSAdornment.class.st index 3c5b8b15..eeffd457 100644 --- a/repository/OpenPonk-Roassal3/OPRSAdornment.class.st +++ b/repository/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/repository/OpenPonk-Roassal3/OPRSAdornmentBuilder.class.st b/repository/OpenPonk-Roassal/OPRSAdornmentBuilder.class.st similarity index 97% rename from repository/OpenPonk-Roassal3/OPRSAdornmentBuilder.class.st rename to repository/OpenPonk-Roassal/OPRSAdornmentBuilder.class.st index a8bb9651..9d2a9b60 100644 --- a/repository/OpenPonk-Roassal3/OPRSAdornmentBuilder.class.st +++ b/repository/OpenPonk-Roassal/OPRSAdornmentBuilder.class.st @@ -8,7 +8,7 @@ Class { 'verticalLocation', 'horizontalLocation' ], - #category : #'OpenPonk-Roassal3-Interactions' + #category : #'OpenPonk-Roassal-Interactions' } { #category : #adding } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraint.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st similarity index 99% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraint.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st index 02102470..4a87a405 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraint.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraint.class.st @@ -11,7 +11,7 @@ Class { 'positionReference', 'alwaysShowGuideLine' ], - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #building } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintBalanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintBalanceReference.class.st similarity index 96% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintBalanceReference.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintBalanceReference.class.st index 1d174f9c..705eb106 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintBalanceReference.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintBalanceReference.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'balance' ], - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #'instance creation' } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintEndDistanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintEndDistanceReference.class.st similarity index 94% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintEndDistanceReference.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintEndDistanceReference.class.st index fcb4db73..124c4f97 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintEndDistanceReference.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintEndDistanceReference.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/repository/OpenPonk-Roassal3/OPRSAnchorConstraintFixedDistanceReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintFixedDistanceReference.class.st similarity index 97% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintFixedDistanceReference.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintFixedDistanceReference.class.st index 7e741e65..99383719 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintFixedDistanceReference.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintFixedDistanceReference.class.st @@ -4,7 +4,7 @@ Class { #instVars : [ 'distance' ], - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintNearestPoint.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintNearestPoint.class.st similarity index 97% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintNearestPoint.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintNearestPoint.class.st index 14e1af9d..c71704fc 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintNearestPoint.class.st +++ b/repository/OpenPonk-Roassal/OPRSAnchorConstraintNearestPoint.class.st @@ -7,7 +7,7 @@ Class { 'previousSegmentsLength', 'lineLength' ], - #category : #'OpenPonk-Roassal3-AnchorConstraint' + #category : #'OpenPonk-Roassal-AnchorConstraint' } { #category : #calculated } diff --git a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintReference.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintReference.class.st similarity index 93% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintReference.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintReference.class.st index 3c7169a8..3777fb00 100644 --- a/repository/OpenPonk-Roassal3/OPRSAnchorConstraintReference.class.st +++ b/repository/OpenPonk-Roassal/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/repository/OpenPonk-Roassal3/OPRSAnchorConstraintSegment.class.st b/repository/OpenPonk-Roassal/OPRSAnchorConstraintSegment.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/OPRSAnchorConstraintSegment.class.st rename to repository/OpenPonk-Roassal/OPRSAnchorConstraintSegment.class.st index 3650c1ed6b84c78a930c406c6501e105202c4c94..7ef9a37443e3a4bb25009cad8c5a0ba764e618c8 100644 GIT binary patch delta 10 RcmeyW{zZMl> closeTo: aPoint absolutePrecision: aPrecision [ ^ (x closeTo: aPoint x absolutePrecision: aPrecision) and: [ diff --git a/repository/OpenPonk-Roassal3/RSAbstractControlCanvasInteraction.extension.st b/repository/OpenPonk-Roassal/RSAbstractControlCanvasInteraction.extension.st similarity index 95% rename from repository/OpenPonk-Roassal3/RSAbstractControlCanvasInteraction.extension.st rename to repository/OpenPonk-Roassal/RSAbstractControlCanvasInteraction.extension.st index 341302de..544f73ef 100644 --- a/repository/OpenPonk-Roassal3/RSAbstractControlCanvasInteraction.extension.st +++ b/repository/OpenPonk-Roassal/RSAbstractControlCanvasInteraction.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSAbstractControlCanvasInteraction } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAbstractControlCanvasInteraction >> correctRectangle: rectangle camera: camera [ | visibleRectangle correctX correctY | diff --git a/repository/OpenPonk-Roassal3/RSAbstractControlPointsLine.extension.st b/repository/OpenPonk-Roassal/RSAbstractControlPointsLine.extension.st similarity index 85% rename from repository/OpenPonk-Roassal3/RSAbstractControlPointsLine.extension.st rename to repository/OpenPonk-Roassal/RSAbstractControlPointsLine.extension.st index 6bc9cd83..2106b3bc 100644 --- a/repository/OpenPonk-Roassal3/RSAbstractControlPointsLine.extension.st +++ b/repository/OpenPonk-Roassal/RSAbstractControlPointsLine.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSAbstractControlPointsLine } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAbstractControlPointsLine >> innerControlPoints: aCollection [ self controlPoints: { self controlPoints first } , aCollection diff --git a/repository/OpenPonk-Roassal3/RSAbstractLine.extension.st b/repository/OpenPonk-Roassal/RSAbstractLine.extension.st similarity index 75% rename from repository/OpenPonk-Roassal3/RSAbstractLine.extension.st rename to repository/OpenPonk-Roassal/RSAbstractLine.extension.st index 4ba70231..7c9f37df 100644 --- a/repository/OpenPonk-Roassal3/RSAbstractLine.extension.st +++ b/repository/OpenPonk-Roassal/RSAbstractLine.extension.st @@ -1,12 +1,12 @@ Extension { #name : #RSAbstractLine } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAbstractLine >> innerControlPoints [ ^ self controlPoints copyFrom: 2 to: self controlPoints size - 1 ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAbstractLine >> labels [ ^ self propertyAt: #OPLabels ifAbsentPut: [ Dictionary new ] diff --git a/repository/OpenPonk-Roassal3/RSAthensMorph.extension.st b/repository/OpenPonk-Roassal/RSAthensMorph.extension.st similarity index 82% rename from repository/OpenPonk-Roassal3/RSAthensMorph.extension.st rename to repository/OpenPonk-Roassal/RSAthensMorph.extension.st index 5e07770f..ef16564f 100644 --- a/repository/OpenPonk-Roassal3/RSAthensMorph.extension.st +++ b/repository/OpenPonk-Roassal/RSAthensMorph.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSAthensMorph } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSAthensMorph >> resetShapeBeingDragged [ eventBeginingDragging ifNil: [ ^ self ]. diff --git a/repository/OpenPonk-Roassal3/RSBorderColoringComposite.class.st b/repository/OpenPonk-Roassal/RSBorderColoringComposite.class.st similarity index 98% rename from repository/OpenPonk-Roassal3/RSBorderColoringComposite.class.st rename to repository/OpenPonk-Roassal/RSBorderColoringComposite.class.st index dcf347d2..03fc267f 100644 --- a/repository/OpenPonk-Roassal3/RSBorderColoringComposite.class.st +++ b/repository/OpenPonk-Roassal/RSBorderColoringComposite.class.st @@ -5,7 +5,7 @@ Class { 'shapesToUseBorderColor', 'borderColoredShapesColorBlock' ], - #category : #'OpenPonk-Roassal3-Markers' + #category : #'OpenPonk-Roassal-Markers' } { #category : #accessing } diff --git a/repository/OpenPonk-Roassal3/RSBoundingShape.extension.st b/repository/OpenPonk-Roassal/RSBoundingShape.extension.st similarity index 84% rename from repository/OpenPonk-Roassal3/RSBoundingShape.extension.st rename to repository/OpenPonk-Roassal/RSBoundingShape.extension.st index b5447d37..65e2c456 100644 --- a/repository/OpenPonk-Roassal3/RSBoundingShape.extension.st +++ b/repository/OpenPonk-Roassal/RSBoundingShape.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSBoundingShape } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSBoundingShape >> element [ self @@ -9,7 +9,7 @@ RSBoundingShape >> element [ ^ self ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSBoundingShape >> elementOn: aModel [ self diff --git a/repository/OpenPonk-Roassal3/RSCanvas.extension.st b/repository/OpenPonk-Roassal/RSCanvas.extension.st similarity index 82% rename from repository/OpenPonk-Roassal3/RSCanvas.extension.st rename to repository/OpenPonk-Roassal/RSCanvas.extension.st index 9a52deb7..cd30234f 100644 --- a/repository/OpenPonk-Roassal3/RSCanvas.extension.st +++ b/repository/OpenPonk-Roassal/RSCanvas.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSCanvas } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSCanvas >> elements [ self @@ -9,13 +9,13 @@ RSCanvas >> elements [ ^ self nodes ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSCanvas >> isSelectable [ ^ false ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSCanvas >> shapesWithActionForPosition: aPositionInSpace [ | result | diff --git a/repository/OpenPonk-Roassal3/RSComposite.extension.st b/repository/OpenPonk-Roassal/RSComposite.extension.st similarity index 83% rename from repository/OpenPonk-Roassal3/RSComposite.extension.st rename to repository/OpenPonk-Roassal/RSComposite.extension.st index 4f5c24b1..97e5dc7e 100644 --- a/repository/OpenPonk-Roassal3/RSComposite.extension.st +++ b/repository/OpenPonk-Roassal/RSComposite.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSComposite } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSComposite >> isOrComposesOf: aShape [ ^ (super isOrComposesOf: aShape) or: [ diff --git a/repository/OpenPonk-Roassal3/RSControlConfiguration.extension.st b/repository/OpenPonk-Roassal/RSControlConfiguration.extension.st similarity index 68% rename from repository/OpenPonk-Roassal3/RSControlConfiguration.extension.st rename to repository/OpenPonk-Roassal/RSControlConfiguration.extension.st index f258aabd..476827d0 100644 --- a/repository/OpenPonk-Roassal3/RSControlConfiguration.extension.st +++ b/repository/OpenPonk-Roassal/RSControlConfiguration.extension.st @@ -1,12 +1,12 @@ Extension { #name : #RSControlConfiguration } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSControlConfiguration >> hasZoomableAnimation [ ^ true ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSControlConfiguration >> keepCameraOnContent [ ^ true diff --git a/repository/OpenPonk-Roassal3/RSEvent.extension.st b/repository/OpenPonk-Roassal/RSEvent.extension.st similarity index 80% rename from repository/OpenPonk-Roassal3/RSEvent.extension.st rename to repository/OpenPonk-Roassal/RSEvent.extension.st index 16f2393b..e1ade092 100644 --- a/repository/OpenPonk-Roassal3/RSEvent.extension.st +++ b/repository/OpenPonk-Roassal/RSEvent.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSEvent } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSEvent >> element [ self @@ -9,7 +9,7 @@ RSEvent >> element [ ^ self shape ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSEvent >> view [ self diff --git a/repository/OpenPonk-Roassal3/RSMarker.extension.st b/repository/OpenPonk-Roassal/RSMarker.extension.st similarity index 84% rename from repository/OpenPonk-Roassal3/RSMarker.extension.st rename to repository/OpenPonk-Roassal/RSMarker.extension.st index c4d50841..fe526901 100644 --- a/repository/OpenPonk-Roassal3/RSMarker.extension.st +++ b/repository/OpenPonk-Roassal/RSMarker.extension.st @@ -1,6 +1,6 @@ Extension { #name : #RSMarker } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSMarker >> asEmptyMarker [ self shape color: Color white. diff --git a/repository/OpenPonk-Roassal3/RSObjectWithProperty.extension.st b/repository/OpenPonk-Roassal/RSObjectWithProperty.extension.st similarity index 73% rename from repository/OpenPonk-Roassal3/RSObjectWithProperty.extension.st rename to repository/OpenPonk-Roassal/RSObjectWithProperty.extension.st index 309f6ce4..c6ee3f94 100644 --- a/repository/OpenPonk-Roassal3/RSObjectWithProperty.extension.st +++ b/repository/OpenPonk-Roassal/RSObjectWithProperty.extension.st @@ -1,12 +1,12 @@ Extension { #name : #RSObjectWithProperty } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSObjectWithProperty >> isOrComposesOf: aShape [ ^ self = aShape ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSObjectWithProperty >> isSelectionDraggable [ ^ self hasProperty: OPRSSelectionDraggable diff --git a/repository/OpenPonk-Roassal3/RSShape.extension.st b/repository/OpenPonk-Roassal/RSShape.extension.st similarity index 79% rename from repository/OpenPonk-Roassal3/RSShape.extension.st rename to repository/OpenPonk-Roassal/RSShape.extension.st index 88c6423c..c8f9123a 100644 --- a/repository/OpenPonk-Roassal3/RSShape.extension.st +++ b/repository/OpenPonk-Roassal/RSShape.extension.st @@ -1,12 +1,12 @@ Extension { #name : #RSShape } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> asEmptyMarker [ ^ self asMarker asEmptyMarker ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> isElement [ self @@ -15,13 +15,13 @@ RSShape >> isElement [ ^ self isNode ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> isSelectable [ ^ self hasProperty: OPRSSelectable ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> isSelected [ ^ self canvas @@ -30,7 +30,7 @@ RSShape >> isSelected [ currentCanvas selectedShapes includes: self ] ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> shapeWithActionForPosition: position [ self canvas @@ -42,7 +42,7 @@ RSShape >> shapeWithActionForPosition: position [ ifFalse: [ nil ] ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } RSShape >> view [ self diff --git a/repository/OpenPonk-Roassal3/Rectangle.extension.st b/repository/OpenPonk-Roassal/Rectangle.extension.st similarity index 91% rename from repository/OpenPonk-Roassal3/Rectangle.extension.st rename to repository/OpenPonk-Roassal/Rectangle.extension.st index a462a7af..8604cf23 100644 --- a/repository/OpenPonk-Roassal3/Rectangle.extension.st +++ b/repository/OpenPonk-Roassal/Rectangle.extension.st @@ -1,18 +1,18 @@ Extension { #name : #Rectangle } -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> floatCenterX [ ^ origin x + corner x / 2.0 ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> floatCenterY [ ^ origin y + corner y / 2.0 ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> horizontalAlignmentLinesTo: otherRectangle margin: margin [ ^ self @@ -21,7 +21,7 @@ Rectangle >> horizontalAlignmentLinesTo: otherRectangle margin: margin [ in: margin ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> possibleHorizontalAlignmentLinesTo: otherRectangle [ ^ Array @@ -44,7 +44,7 @@ Rectangle >> possibleHorizontalAlignmentLinesTo: otherRectangle [ comparedSecond: otherRectangle bottomRight) ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> possibleVerticalAlignmentLinesTo: otherRectangle [ ^ Array @@ -66,7 +66,7 @@ Rectangle >> possibleVerticalAlignmentLinesTo: otherRectangle [ comparedSecond: otherRectangle bottomRight) ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> selectAlignmentLinesFrom: alignmentLines in: margin [ | best | @@ -85,7 +85,7 @@ Rectangle >> selectAlignmentLinesFrom: alignmentLines in: margin [ ^ best ] -{ #category : #'*OpenPonk-Roassal3' } +{ #category : #'*OpenPonk-Roassal' } Rectangle >> verticalAlignmentLinesTo: otherRectangle margin: margin [ ^ self diff --git a/repository/OpenPonk-Roassal/package.st b/repository/OpenPonk-Roassal/package.st new file mode 100644 index 00000000..5155cf64 --- /dev/null +++ b/repository/OpenPonk-Roassal/package.st @@ -0,0 +1 @@ +Package { #name : #'OpenPonk-Roassal' } diff --git a/repository/OpenPonk-Roassal3/package.st b/repository/OpenPonk-Roassal3/package.st deleted file mode 100644 index 1effae7b..00000000 --- a/repository/OpenPonk-Roassal3/package.st +++ /dev/null @@ -1 +0,0 @@ -Package { #name : #'OpenPonk-Roassal3' }