Mercurial Mercurial > hg > stx-libbasic3 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged 1d1a2356a601 and b7066ff1c30f (branch default - CVS HEAD) jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 04 Sep 2013 09:44:03 +0100
branchjv
changeset 3397 2932425d1b5c
parent 3391 1d1a2356a601 (current diff)
parent 3396 b7066ff1c30f (diff)
child 3404 19809a3e1003
Merged 1d1a2356a601 and b7066ff1c30f (branch default - CVS HEAD)
AbstractSourceCodeManager.st file | annotate | diff | comparison | revisions
ChangeSet.st file | annotate | diff | comparison | revisions
MessageTracer.st file | annotate | diff | comparison | revisions
SourceCodeManagerUtilities.st file | annotate | diff | comparison | revisions
WrappedMethod.st file | annotate | diff | comparison | revisions 
--- a/AbstractSourceCodeManager.st	Wed Aug 28 10:49:44 2013 +0100
+++ b/AbstractSourceCodeManager.st	Wed Sep 04 09:44:03 2013 +0100
@@ -1244,11 +1244,15 @@
     "/ Done to avoid checking out from the repository using binaryRevision and sourcePosition
     "/
     aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
-        mthd makeLocalStringSource.
+        mthd package = aClass package ifTrue:[
+            mthd makeLocalStringSource.
+        ]
     ].
     aClass allPrivateClassesDo:[:eachPrivateClass |
         eachPrivateClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
-            mthd makeLocalStringSource.
+            mthd package = aClass package ifTrue:[
+                mthd makeLocalStringSource.
+            ].
         ]
     ].
 !
@@ -3817,11 +3821,11 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.315 2013-08-22 19:04:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.316 2013-09-03 23:36:33 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.315 2013-08-22 19:04:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.316 2013-09-03 23:36:33 cg Exp $'
 !
 
 version_HG
@@ -3830,7 +3834,7 @@
 !
 
 version_SVN
-    ^ '$Id: AbstractSourceCodeManager.st,v 1.315 2013-08-22 19:04:55 cg Exp $'
+    ^ '$Id: AbstractSourceCodeManager.st,v 1.316 2013-09-03 23:36:33 cg Exp $'
 ! !
 
 
--- a/ChangeSet.st	Wed Aug 28 10:49:44 2013 +0100
+++ b/ChangeSet.st	Wed Sep 04 09:44:03 2013 +0100
@@ -814,7 +814,7 @@
                                     ]
                                 ] ifFalse:[
                                     InvalidChangeChunkError 
-                                        raiseRequestErrorString:'unexpected change-chunk' 
+                                        raiseErrorString:'unexpected change-chunk' 
                                         "/ mayProceed:true.
                                 ]
                             ]
@@ -3849,7 +3849,7 @@
 !
 
 version_SVN
-    ^ '$Id: ChangeSet.st,v 1.234 2013-08-10 12:29:04 stefan Exp $'
+    ^ '$Id: ChangeSet.st,v 1.235 2013-08-30 11:19:22 cg Exp $'
 ! !
 
 !ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
@@ -4514,11 +4514,11 @@
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.234 2013-08-10 12:29:04 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.235 2013-08-30 11:19:22 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.234 2013-08-10 12:29:04 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.235 2013-08-30 11:19:22 cg Exp $'
 !
 
 version_HG
@@ -4527,6 +4527,6 @@
 !
 
 version_SVN
-    ^ '$Id: ChangeSet.st,v 1.234 2013-08-10 12:29:04 stefan Exp $'
+    ^ '$Id: ChangeSet.st,v 1.235 2013-08-30 11:19:22 cg Exp $'
 ! !
 
--- a/MessageTracer.st	Wed Aug 28 10:49:44 2013 +0100
+++ b/MessageTracer.st	Wed Sep 04 09:44:03 2013 +0100
@@ -2677,7 +2677,7 @@
     WrappedMethod autoload.     "/ just to make sure ...
 
     "
-     create a new (anonymous) subclass of the receivers class
+     create a new (anonymous) subclass of the receiver's class
      but only if not already being trapped.
     "
     orgClass := anObject class.
@@ -3448,7 +3448,7 @@
 !MessageTracer class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.126 2013-07-13 20:36:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.127 2013-08-29 09:52:30 cg Exp $'
 !
 
 version_HG
--- a/SourceCodeManagerUtilities.st	Wed Aug 28 10:49:44 2013 +0100
+++ b/SourceCodeManagerUtilities.st	Wed Sep 04 09:44:03 2013 +0100
@@ -3153,8 +3153,7 @@
 
     knownContainers := allPackageIDs collect:[:package | (package upTo:$:)] as:Set.
 
-    knownContainers := knownContainers asOrderedCollection.
-    knownContainers := knownContainers reject:[:module | module isBlank].
+    knownContainers := knownContainers asOrderedCollection reject:[:module | module isBlank].
     knownContainers sort.
 
     packageUpdater := [
@@ -3263,11 +3262,7 @@
                             box doAccept.
                             box okPressed.
                          ].
-        (DialogBox defaultOKButtonAtLeft) ifTrue:[
-            box addButton:component after:nil.
-        ] ifFalse:[
-            box addButton:component before:nil.
-        ].
+        box addButton:component.
     ].
     (AbortAllSignal isHandled) ifTrue:[
         component := Button label:'Cancel all'.
@@ -3275,11 +3270,7 @@
                             box hide.
                             AbortAllSignal raiseSignal.
                          ].
-        (DialogBox defaultOKButtonAtLeft) ifTrue:[
-            box addButton:component before:nil.
-        ] ifFalse:[
-            box addButton:component after:nil.
-        ].
+        box addButton:component before:nil.
     ].
 
     (YesToAllQuery notNil and:[YesToAllQuery isHandled]) ifTrue:[
@@ -3311,7 +3302,7 @@
         initialModule:'foo' initialPackage:'bar' initialFileName:'baz'        
     "
 
-    "Modified: / 23-08-2006 / 14:13:04 / cg"
+    "Modified: / 29-08-2013 / 12:26:04 / cg"
 !
 
 askForExistingRevision:boxText title:title class:aClass
@@ -3957,11 +3948,11 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.293 2013-08-22 13:54:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.294 2013-08-29 10:26:19 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.293 2013-08-22 13:54:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.294 2013-08-29 10:26:19 cg Exp $'
 !
 
 version_HG
--- a/WrappedMethod.st	Wed Aug 28 10:49:44 2013 +0100
+++ b/WrappedMethod.st	Wed Sep 04 09:44:03 2013 +0100
@@ -53,7 +53,7 @@
 !WrappedMethod class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/WrappedMethod.st,v 1.36 2013-08-02 09:02:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/WrappedMethod.st,v 1.37 2013-08-29 09:52:14 cg Exp $'
 !
 
 version_HG
@@ -207,7 +207,9 @@
 !
 
 programmingLanguage
-    ^ self originalMethod programmingLanguage
+    ^ (self originalMethod ? self mclass ? Smalltalk) programmingLanguage
+
+    "Modified: / 29-08-2013 / 10:59:20 / cg"
 !
 
 replaceOriginalMethodWith:aNewMethod
@@ -374,7 +376,12 @@
 !
 
 parse:parseSelector with:arg2 return:accessSelector or:valueIfNoSource
-    ^ self originalMethod parse:parseSelector with:arg2 return:accessSelector or:valueIfNoSource
+    |m|
+
+    (m := self originalMethod) notNil ifTrue:[
+        ^ m parse:parseSelector with:arg2 return:accessSelector or:valueIfNoSource
+    ].
+    ^ valueIfNoSource
 
     "Created: / 02-08-2013 / 10:57:02 / cg"
 !
@@ -408,6 +415,6 @@
 !
 
 version_SVN
-    ^ '$Id: WrappedMethod.st,v 1.36 2013-08-02 09:02:32 cg Exp $'
+    ^ '$Id: WrappedMethod.st,v 1.37 2013-08-29 09:52:14 cg Exp $'
 ! !
hg/stx-libbasic3