added methodIgnore; browse-menu-entry in method-list-browsers; update in full-class-brwsr; more on revisions; better compare with repository
--- a/BrowserView.st Wed Dec 13 17:26:41 1995 +0100
+++ b/BrowserView.st Wed Dec 13 17:53:04 1995 +0100
@@ -1771,31 +1771,36 @@
self warn:'could not extract source from repository'.
^ self
].
- comparedSource := aStream contents.
+ comparedSource := aStream contents asString.
aStream close.
self busyLabel:'generating current source ...' with:nil.
aStream := '' writeStream.
currentClass fileOutOn:aStream withTimeStamp:false.
- currentSource := aStream contents.
+ currentSource := aStream contents asString.
aStream close.
self busyLabel:'comparing ...' with:nil.
- thisRevString := currentClass revision.
- thisRevString isNil ifTrue:[
- thisRevString := 'no revision'
+
+ comparedSource = currentSource ifTrue:[
+ self information:'versions are identical'.
+ ] ifFalse:[
+ thisRevString := currentClass revision.
+ thisRevString isNil ifTrue:[
+ thisRevString := 'no revision'
+ ].
+ v := DiffTextView
+ openOn:currentSource label:'current (' , thisRevString , ')'
+ and:comparedSource label:'repository (' , revString , ')'.
+ v label:'comparing ' , currentClass name.
].
- v := DiffTextView
- openOn:currentSource label:'current (' , thisRevString , ')'
- and:comparedSource label:'repository (' , revString , ')'.
- v label:'comparing ' , currentClass name.
self normalLabel.
]
]
"Created: 14.11.1995 / 16:43:15 / cg"
- "Modified: 13.12.1995 / 16:45:14 / cg"
+ "Modified: 13.12.1995 / 17:33:19 / cg"
!
classCreateSourceContainerFor:aClass
@@ -4323,6 +4328,15 @@
"Modified: 23.11.1995 / 14:12:15 / cg"
!
+methodMakeIgnored
+ "make the current method be invisible.
+ EXPERIMENTAL"
+
+ self methodPrivacy:#ignored
+
+ "Created: 13.12.1995 / 13:59:59 / cg"
+!
+
methodMakePrivate
"make the current method private.
EXPERIMENTAL"
@@ -4371,6 +4385,7 @@
'make private'
'make protected'
'make public'
+ 'make ignored'
).
selectors := #(
methodInspect
@@ -4380,6 +4395,7 @@
methodMakePrivate
methodMakeProtected
methodMakePublic
+ methodMakeIgnored
)
] ifFalse:[
@@ -4586,6 +4602,9 @@
currentMethod isPublic ifTrue:[
m disable:#methodMakePublic
].
+ currentMethod isIgnored ifTrue:[
+ m disable:#methodMakeIgnored
+ ].
].
currentMethod notNil ifTrue:[
(currentMethod code notNil
@@ -4599,7 +4618,7 @@
^ m
"Created: 23.11.1995 / 12:02:29 / cg"
- "Modified: 13.12.1995 / 10:58:40 / cg"
+ "Modified: 13.12.1995 / 14:00:52 / cg"
!
methodMove
@@ -4672,14 +4691,16 @@
EXPERIMENTAL"
self checkMethodSelected ifFalse:[^ self].
- currentMethod isPublic ifFalse:[
- currentMethod privacy:how.
+
+ (how == currentMethod privacy ) "currentMethod isPublic" ifFalse:[
+ currentMethod privacy:how.
"/ actualClass updateRevisionString.
- actualClass addChangeRecordForMethodPrivacy:currentMethod.
- self updateMethodListWithScroll:false keepSelection:true.
+ actualClass addChangeRecordForMethodPrivacy:currentMethod.
+ self updateMethodListWithScroll:false keepSelection:true.
]
"Created: 29.10.1995 / 20:00:00 / cg"
+ "Modified: 13.12.1995 / 14:28:20 / cg"
!
methodRemove
@@ -6407,6 +6428,6 @@
!BrowserView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.71 1995-12-13 16:23:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.72 1995-12-13 16:53:04 cg Exp $'
! !
BrowserView initialize!
--- a/BrwsrView.st Wed Dec 13 17:26:41 1995 +0100
+++ b/BrwsrView.st Wed Dec 13 17:53:04 1995 +0100
@@ -1771,31 +1771,36 @@
self warn:'could not extract source from repository'.
^ self
].
- comparedSource := aStream contents.
+ comparedSource := aStream contents asString.
aStream close.
self busyLabel:'generating current source ...' with:nil.
aStream := '' writeStream.
currentClass fileOutOn:aStream withTimeStamp:false.
- currentSource := aStream contents.
+ currentSource := aStream contents asString.
aStream close.
self busyLabel:'comparing ...' with:nil.
- thisRevString := currentClass revision.
- thisRevString isNil ifTrue:[
- thisRevString := 'no revision'
+
+ comparedSource = currentSource ifTrue:[
+ self information:'versions are identical'.
+ ] ifFalse:[
+ thisRevString := currentClass revision.
+ thisRevString isNil ifTrue:[
+ thisRevString := 'no revision'
+ ].
+ v := DiffTextView
+ openOn:currentSource label:'current (' , thisRevString , ')'
+ and:comparedSource label:'repository (' , revString , ')'.
+ v label:'comparing ' , currentClass name.
].
- v := DiffTextView
- openOn:currentSource label:'current (' , thisRevString , ')'
- and:comparedSource label:'repository (' , revString , ')'.
- v label:'comparing ' , currentClass name.
self normalLabel.
]
]
"Created: 14.11.1995 / 16:43:15 / cg"
- "Modified: 13.12.1995 / 16:45:14 / cg"
+ "Modified: 13.12.1995 / 17:33:19 / cg"
!
classCreateSourceContainerFor:aClass
@@ -4323,6 +4328,15 @@
"Modified: 23.11.1995 / 14:12:15 / cg"
!
+methodMakeIgnored
+ "make the current method be invisible.
+ EXPERIMENTAL"
+
+ self methodPrivacy:#ignored
+
+ "Created: 13.12.1995 / 13:59:59 / cg"
+!
+
methodMakePrivate
"make the current method private.
EXPERIMENTAL"
@@ -4371,6 +4385,7 @@
'make private'
'make protected'
'make public'
+ 'make ignored'
).
selectors := #(
methodInspect
@@ -4380,6 +4395,7 @@
methodMakePrivate
methodMakeProtected
methodMakePublic
+ methodMakeIgnored
)
] ifFalse:[
@@ -4586,6 +4602,9 @@
currentMethod isPublic ifTrue:[
m disable:#methodMakePublic
].
+ currentMethod isIgnored ifTrue:[
+ m disable:#methodMakeIgnored
+ ].
].
currentMethod notNil ifTrue:[
(currentMethod code notNil
@@ -4599,7 +4618,7 @@
^ m
"Created: 23.11.1995 / 12:02:29 / cg"
- "Modified: 13.12.1995 / 10:58:40 / cg"
+ "Modified: 13.12.1995 / 14:00:52 / cg"
!
methodMove
@@ -4672,14 +4691,16 @@
EXPERIMENTAL"
self checkMethodSelected ifFalse:[^ self].
- currentMethod isPublic ifFalse:[
- currentMethod privacy:how.
+
+ (how == currentMethod privacy ) "currentMethod isPublic" ifFalse:[
+ currentMethod privacy:how.
"/ actualClass updateRevisionString.
- actualClass addChangeRecordForMethodPrivacy:currentMethod.
- self updateMethodListWithScroll:false keepSelection:true.
+ actualClass addChangeRecordForMethodPrivacy:currentMethod.
+ self updateMethodListWithScroll:false keepSelection:true.
]
"Created: 29.10.1995 / 20:00:00 / cg"
+ "Modified: 13.12.1995 / 14:28:20 / cg"
!
methodRemove
@@ -6407,6 +6428,6 @@
!BrowserView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Attic/BrwsrView.st,v 1.71 1995-12-13 16:23:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Attic/BrwsrView.st,v 1.72 1995-12-13 16:53:04 cg Exp $'
! !
BrowserView initialize!