Skip to content

Commit

Permalink
Pharo7 is more strict in extension methods so the get removed if save…
Browse files Browse the repository at this point in the history
…d. Fixed to be extension methods with just the name of the package
  • Loading branch information
noha committed Aug 21, 2018
1 parent 7df3a3d commit 073a001
Show file tree
Hide file tree
Showing 41 changed files with 51 additions and 52 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-description
*Magritte-Model
optionFor: anObject ifPresent: aBlock
aBlock value: (self cull: anObject)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-accessing
*Magritte-Model
label
"Answer a human-readable name of the receiving class. This implementation tries to be smart and return a nice label, unfortunately for a lot of classes this doesn't work well so subclasses might want to override this method and return soemthing more meaningfull to end-users."

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-dynopt
*Magritte-Model
maSelectMatching: aString
^ self select: [ :e | e asString startsWith: aString ]
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-description
*Magritte-Model
optionFor: anObject ifPresent: aBlock
self at: anObject ifPresent: aBlock
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-converting
*Magritte-Model
asFileSize
#( 'B' 'KB' 'MB' 'GB' 'TB' 'PB' 'EB' 'ZB' 'YB' )
inject: self
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-builder
builder
descriptionBuilder: aBuilderClass
self propertyAt: #descriptionBuilder put: aBuilderClass
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-builder
builder
descriptionBuilder
^self propertyAt: #descriptionBuilder ifAbsent: [ nil ]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-builder
builder
descriptionBuilders: aList
self descriptionBuilder: MAComposedDescriptionBuilder.
self propertyAt: #descriptionBuilders put: aList
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-builder
builder
descriptionBuilders
^self propertyAt: #descriptionBuilders ifAbsent: [ #() ]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-builder
builder
canExpand: aBoolean
" used to expand a relation description into a group "
^self propertyAt: #canExpand put: aBoolean
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-builder
builder
canExpand
" used to expand a relation description into a group "
^self propertyAt: #canExpand ifAbsent: [ self defaultCanExpand ]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-builder
builder
defaultCanExpand
" used to expand a relation description into a group "
self isVisible ifFalse: [ ^false ].
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
{
"category" : "Magritte-Model-Utility",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"super" : "Object",
"category" : "Magritte-Model-Utility",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [
"block",
"completionToObjectBlock",
"includesBlock" ],
"includesBlock"
],
"name" : "MADynamicOptions",
"pools" : [
],
"super" : "Object",
"type" : "normal" }
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-accessing
*Magritte-Model
descriptionContainer
"Return the default description container."
<magritteContainer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-builder
*Magritte-Model
magritteDescriptionBuilders
|builderPragmas container|
builderPragmas := Pragma allNamed: #magritteBuilder from: self class to: Object.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-accessing
*Magritte-Model
mementoClass
"Return a class to be used to remember or cache the receiver, namely a memento object."

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-model
*Magritte-Model
readUsing: aDescription
"Dispatch the read-access to the receiver using the accessor of aDescription."

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-actions
*Magritte-Model
uniqueActionSelectors

| descriptionPragmas selectors |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-model
*Magritte-Model
write: anObject using: aDescription
"Dispatch the write-access to the receiver of anObject using the accessor of aDescription."

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-model-testing
*Magritte-Model
matches: aString
aString isEmpty ifTrue: [ ^ true ].
^ (aString includesAnyOf: '*#')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-description
*Magritte-Model
optionFor: anObject ifPresent: aBlock
aBlock value: (anObject perform: self)
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-converting
*Magritte-Model
asAccessor
^ MANullAccessor new
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-accessing
*Magritte-Model
label
^ 'n/a'
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-model-accessing
*Magritte-Model
magritteDescription
^ MAContainer new
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClasses
^ Array with: MAContainerMorph
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClass
^ self defaultMorphClasses notEmpty
ifTrue: [ self defaultMorphClasses first ]
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClasses
^ Array new
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphColor
^ Color white
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-accessing
*Magritte-Morph
morphClass: aClass
^ self propertyAt: #morphClass put: aClass
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-accessing
*Magritte-Morph
morphClass
^ self propertyAt: #morphClass ifAbsent: [ self class defaultMorphClass ]
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-accessing
*Magritte-Morph
morphColor: aColor
^ self propertyAt: #morphColor put: aColor
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-accessing
*Magritte-Morph
morphColor
^ self propertyAt: #morphColor ifAbsent: [ self class defaultMorphColor ]
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClasses
^ Array with: MADirectoryMorph
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClasses
^ Array with: MATextMorph
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClasses
^ Array with: MAFileMorph
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClasses
^ Array with: MAMemoMorph
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClasses
^ Array with: MAMultiSelectListMorph
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClasses
^ Array
with: MASingleSelectListMorph
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-defaults
*Magritte-Morph
defaultMorphClasses
^ Array with: MAExternalEditorMorph with: MAInternalEditorMorph
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
*magritte-morph-converting
*Magritte-Morph
asMagritteMorph
^ self magritteDescription asMorphOn: self
6 changes: 3 additions & 3 deletions source/Magritte-Morph.package/monticello.meta/categories.st
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SystemOrganization addCategory: #'Magritte-Morph'!
SystemOrganization addCategory: 'Magritte-Morph-Model'!
SystemOrganization addCategory: 'Magritte-Morph-Morphs'!
SystemOrganization addCategory: 'Magritte-Morph-Report'!
SystemOrganization addCategory: #'Magritte-Morph-Model'!
SystemOrganization addCategory: #'Magritte-Morph-Morphs'!
SystemOrganization addCategory: #'Magritte-Morph-Report'!

0 comments on commit 073a001

Please sign in to comment.