Skip to content

Commit 7820f30

Browse files
Gabriel-DarbordGabriel-Darbord
authored
Merge branch 'development' into 722-MooseGroup-and-Collection-API-tries-to-be-too-clever
2 parents 96f326c + 08b6c3b commit 7820f30

8 files changed

+129
-6
lines changed

‎src/Famix-Java-Entities/FamixJavaClass.class.st

+11
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,17 @@ FamixJavaClass >> methodsWithoutSutbsAndConstructors [
173173
each isStub not and: [each isConstructor not]]) asSet
174174
]
175175

176+
{ #category : #printing }
177+
FamixJavaClass >> mooseNameOn: aStream [
178+
179+
self typeContainer ifNotNil: [ :parent |
180+
parent mooseNameOn: aStream.
181+
self isInnerClass
182+
ifTrue: [ aStream nextPut: $$ ]
183+
ifFalse: [ aStream nextPutAll: '::' ] ].
184+
self name ifNotNil: [ :n | aStream nextPutAll: n ]
185+
]
186+
176187
{ #category : #'Famix-Extensions' }
177188
FamixJavaClass >> structuralChildren [
178189
^ (OrderedCollection withAll: self methods), self attributes

‎src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ FamixStImplicitVariable >> isSuper [
5656
^ self name == #super
5757
]
5858

59-
{ #category : #testing }
59+
{ #category : #printing }
6060
FamixStImplicitVariable >> mooseNameOn: stream [
6161
| parent |
6262
parent := self parentBehaviouralEntity.

‎src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ FamixStLocalVariable class >> annotation [
4646
^ self
4747
]
4848

49-
{ #category : #accessing }
49+
{ #category : #printing }
5050
FamixStLocalVariable >> mooseNameOn: stream [
5151
| parent |
5252
parent := self parentBehaviouralEntity.

‎src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ FamixStParameter class >> annotation [
4646
^ self
4747
]
4848

49-
{ #category : #accessing }
49+
{ #category : #printing }
5050
FamixStParameter >> mooseNameOn: stream [
5151
| parent |
5252
parent := self parentBehaviouralEntity.

‎src/Famix-Traits/FamixTEnumValue.trait.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ FamixTEnumValue >> isEnumValue [
6666
^ true
6767
]
6868

69-
{ #category : #accessing }
69+
{ #category : #printing }
7070
FamixTEnumValue >> mooseNameOn: aStream [
7171
(self belongsTo isNotNil and: [ self belongsTo name isNotNil ])
7272
ifTrue: [ self belongsTo mooseNameOn: aStream.

‎src/Famix-Traits/FamixTType.trait.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ FamixTType >> isType [
8484
^ true
8585
]
8686

87-
{ #category : #accessing }
87+
{ #category : #printing }
8888
FamixTType >> mooseNameOn: aStream [
8989
self typeContainer
9090
ifNotNil: [ :parent |

‎src/Moose-Core/MooseGroup.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ MooseGroup >> mooseDescription [
127127
ifNotNil: [ :model | model mooseDescriptionFor: self class ]
128128
]
129129

130-
{ #category : #accessing }
130+
{ #category : #printing }
131131
MooseGroup >> mooseNameOn: aStream [
132132
"Hook to customize the rendered text of an entity. Do not specialize mooseName, but change/specialize this method if necessary."
133133
aStream

‎src/Moose-Core/MooseIcons.class.st

+112
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,118 @@ MooseIcons class >> famixPackageGroup [
813813
offset: 0 @ 0 ]
814814
]
815815

816+
{ #category : #'icon creation' }
817+
MooseIcons class >> famixTagBookmark [
818+
819+
<mooseIcon>
820+
^ self icons at: #famixTagBookmark ifAbsentPut: [
821+
Form
822+
extent: 25 @ 11
823+
depth: 32
824+
fromArray:
825+
#( 0 0 4278190080 4278190080 4278190080 4278190080 4278190080
826+
4278190080 4278190080 4278190080 4278190080 4278190080
827+
4278190080 4278190080 4278190080 4278190080 4278190080
828+
4278190080 4278190080 4278190080 4278190080 4278190080
829+
4278190080 0 0 0 0 4278190080 4293980400 4293980400
830+
4293980400 4293980400 4293980400 4293980400 4293980400
831+
4293980400 4293980400 4293980400 4293980400 4293980400
832+
4293980400 4293980400 4293980400 4293980400 4293980400
833+
4278190080 4278190080 0 0 0 0 0 4278190080 4293980400
834+
4293980400 4293980400 4293980400 4293980400 4293980400
835+
4293980400 4293980400 4293980400 4293980400 4293980400
836+
4293980400 4293980400 4293980400 4293980400 4293980400
837+
4278190080 4278190080 0 0 0 0 0 0 4278190080 4293980400
838+
4293980400 4293980400 4293980400 4293980400 4293980400
839+
4293980400 4293980400 4293980400 4293980400 4293980400
840+
4293980400 4293980400 4293980400 4293980400 4278190080
841+
4278190080 0 0 0 0 0 0 0 4278190080 4293980400 4293980400
842+
4293980400 4293980400 4293980400 4293980400 4293980400
843+
4293980400 4293980400 4293980400 4293980400 4293980400
844+
4293980400 4293980400 4278190080 4278190080 0 0 0 0 0 0 0 0 4278190080
845+
4293980400 4293980400 4293980400 4293980400 4293980400
846+
4293980400 4293980400 4293980400 4293980400 4293980400
847+
4293980400 4293980400 4293980400 4278190080 4278190080
848+
0 0 0 0 0 0 0 0 0 4278190080 4293980400 4293980400 4293980400
849+
4293980400 4293980400 4293980400 4293980400 4293980400
850+
4293980400 4293980400 4293980400 4293980400 4293980400
851+
4293980400 4278190080 4278190080 0 0 0 0 0 0 0 0 4278190080
852+
4293980400 4293980400 4293980400 4293980400 4293980400
853+
4293980400 4293980400 4293980400 4293980400 4293980400
854+
4293980400 4293980400 4293980400 4293980400 4293980400
855+
4278190080 4278190080 0 0 0 0 0 0 0 4278190080 4293980400
856+
4293980400 4293980400 4293980400 4293980400 4293980400
857+
4293980400 4293980400 4293980400 4293980400 4293980400
858+
4293980400 4293980400 4293980400 4293980400 4293980400
859+
4278190080 4278190080 0 0 0 0 0 0 4278190080 4293980400
860+
4293980400 4293980400 4293980400 4293980400 4293980400
861+
4293980400 4293980400 4293980400 4293980400 4293980400
862+
4293980400 4293980400 4293980400 4293980400 4293980400
863+
4293980400 4278190080 4278190080 0 0 0 0 0 4278190080
864+
4278190080 4278190080 4278190080 4278190080 4278190080
865+
4278190080 4278190080 4278190080 4278190080 4278190080
866+
4278190080 4278190080 4278190080 4278190080 4278190080
867+
4278190080 4278190080 4278190080 4278190080 4278190080
868+
0 0 )
869+
offset: 0 @ 0 ]
870+
]
871+
872+
{ #category : #'icon creation' }
873+
MooseIcons class >> famixTagLabel [
874+
875+
<mooseIcon>
876+
^ self icons at: #famixTagLabel ifAbsentPut: [
877+
Form
878+
extent: 25 @ 11
879+
depth: 32
880+
fromArray:
881+
#( 0 0 4278190080 4278190080 4278190080 4278190080 4278190080
882+
4278190080 4278190080 4278190080 4278190080 4278190080
883+
4278190080 4278190080 4278190080 4278190080 4278190080
884+
4278190080 4278190080 0 0 0 0 0 0 0 0 4278190080 4293980400
885+
4293980400 4293980400 4293980400 4293980400 4293980400
886+
4293980400 4293980400 4293980400 4293980400 4293980400
887+
4293980400 4293980400 4293980400 4293980400 4278190080
888+
4278190080 0 0 0 0 0 0 0 4278190080 4293980400 4293980400
889+
4293980400 4293980400 4293980400 4293980400 4293980400
890+
4293980400 4293980400 4293980400 4293980400 4293980400
891+
4293980400 4293980400 4293980400 4293980400 4278190080
892+
4278190080 0 0 0 0 0 0 4278190080 4293980400 4293980400
893+
4293980400 4293980400 4293980400 4293980400 4293980400
894+
4293980400 4293980400 4293980400 4293980400 4293980400
895+
4293980400 4278190080 4293980400 4293980400 4293980400
896+
4278190080 4278190080 0 0 0 0 0 4278190080 4293980400
897+
4293980400 4293980400 4293980400 4293980400 4293980400
898+
4293980400 4293980400 4293980400 4293980400 4293980400
899+
4293980400 4278190080 0 4278190080 4293980400 4293980400
900+
4293980400 4278190080 4278190080 0 0 0 0 4278190080
901+
4293980400 4293980400 4293980400 4293980400 4293980400
902+
4293980400 4293980400 4293980400 4293980400 4293980400
903+
4293980400 4278190080 0 0 0 4278190080 4293980400 4293980400
904+
4293980400 4278190080 0 0 0 0 4278190080 4293980400
905+
4293980400 4293980400 4293980400 4293980400 4293980400
906+
4293980400 4293980400 4293980400 4293980400 4293980400
907+
4293980400 4278190080 0 4278190080 4293980400 4293980400
908+
4293980400 4278190080 4278190080 0 0 0 0 4278190080
909+
4293980400 4293980400 4293980400 4293980400 4293980400
910+
4293980400 4293980400 4293980400 4293980400 4293980400
911+
4293980400 4293980400 4293980400 4278190080 4293980400
912+
4293980400 4293980400 4278190080 4278190080 0 0 0 0 0 4278190080
913+
4293980400 4293980400 4293980400 4293980400 4293980400
914+
4293980400 4293980400 4293980400 4293980400 4293980400
915+
4293980400 4293980400 4293980400 4293980400 4293980400
916+
4293980400 4278190080 4278190080 0 0 0 0 0 0 4278190080
917+
4293980400 4293980400 4293980400 4293980400 4293980400
918+
4293980400 4293980400 4293980400 4293980400 4293980400
919+
4293980400 4293980400 4293980400 4293980400 4293980400
920+
4278190080 4278190080 0 0 0 0 0 0 0 4278190080 4278190080
921+
4278190080 4278190080 4278190080 4278190080 4278190080
922+
4278190080 4278190080 4278190080 4278190080 4278190080
923+
4278190080 4278190080 4278190080 4278190080 4278190080
924+
0 0 0 0 0 0 )
925+
offset: 0 @ 0 ]
926+
]
927+
816928
{ #category : #utilities }
817929
MooseIcons class >> icons [
818930

0 commit comments

Comments
 (0)