Merge pull request #20 from moosetechnology/19-merge-isCBSetter-and-isSetter

Replacing isCBSetter by isSetter
Fix #20

Author: anneetien

Moose-Blueprint-Models-Tests/CBPojoTest.class.st

@@ -101,6 +101,7 @@ CBPojoTest >> setUp [
 	getter := model newMethodNamed: 'getAttribute()'.
 	setter := (model newMethodNamed: 'setAttribute()')
 		          parameters: { (model newParameterNamed: 'anObject') };
+					declaredType: (FamixJavaPrimitiveType new name: 'void')
 		          yourself.
 
 	self defineAccesses.
@@ -121,5 +122,5 @@ CBPojoTest >> testIsGetter [
 { #category : 'tests' }
 CBPojoTest >> testIsSetter [
 
-	self assert: setter isCBSetter
+	self assert: setter isSetter
 ]

Moose-Blueprint-Models/CBAccessorsModel.class.st

@@ -91,7 +91,7 @@ CBAccessorsModel >> isLazyInitializer [
 { #category : 'testing' }
 CBAccessorsModel >> isSetter [
 
-	^ entity isCBSetter
+	^ entity isSetter
 ]
 
 { #category : 'accessing' }

Moose-Blueprint-Models/CBMethodModel.class.st

@@ -205,7 +205,7 @@ CBMethodModel >> isAbstractAndReimplemented [
 { #category : 'properties - boolean' }
 CBMethodModel >> isCBAccessor [
 
-	(entity isCBGetter or: [ entity isCBSetter ]) ifTrue: [ ^ #accessor ].
+	(entity isCBGetter or: [ entity isSetter ]) ifTrue: [ ^ #accessor ].
 	^ nil
 ]
 

Moose-Blueprint-Models/FamixJavaAttribute.extension.st

@@ -6,7 +6,7 @@ FamixJavaAttribute >> cbAccessors [
 	^ (self incomingAccesses collectAsSet: [ :each | each source ])
 		  select: [ :each |
 			  each isCBGetter or: [
-				  each isCBSetter or: [ each isLazyInitializer ] ] ]
+				  each isSetter or: [ each isLazyInitializer ] ] ]
 ]
 
 { #category : '*Moose-Blueprint-Models' }

Moose-Blueprint-Models/FamixJavaMethod.extension.st

@@ -26,6 +26,7 @@ FamixJavaMethod >> isCBInitializer [
 FamixJavaMethod >> isCBSetter [
 
 	| hasSelfAccess |
+self deprecated: 'please use isSetter'  transformWith:  '`@receiver isCBSetter -> `@receiver isSetter '.
 	self isSetter ifTrue: [ ^ true ].
 
 	hasSelfAccess := self accesses anySatisfy: [ :each |

Moose-Blueprint-Models/FamixStAttribute.extension.st

@@ -6,7 +6,7 @@ FamixStAttribute >> cbAccessors [
 	^ (self incomingAccesses collectAsSet: [ :each | each source ])
 		  select: [ :each |
 			  each isCBGetter or: [
-				  each isCBSetter or: [ each isLazyInitializer ] ] ]
+				  each isSetter or: [ each isLazyInitializer ] ] ]
 ]
 
 { #category : '*Moose-Blueprint-Models' }

Moose-Blueprint-Models/FamixTMethod.extension.st

@@ -32,7 +32,7 @@ FamixTMethod >> inSameClassAs: aMethod [
 { #category : '*Moose-Blueprint-Models' }
 FamixTMethod >> isCBAccessor [
 
-	^ self isCBSetter or: [ self isCBGetter ]
+	^ self isSetter or: [ self isCBGetter ]
 ]
 
 { #category : '*Moose-Blueprint-Models' }