--- a/Diff2Tests.st Sat Mar 17 13:13:35 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-"
- COPYRIGHT (c) 2006 by eXept Software AG
- All Rights Reserved
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-"
-"{ Package: 'stx:libtool' }"
-
-TestCase subclass:#Diff2Tests
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Collections-Sequenceable-Diff2'
-!
-
-!Diff2Tests class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 2006 by eXept Software AG
- All Rights Reserved
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-"
-! !
-
-!Diff2Tests class methodsFor:'as yet unclassified'!
-
-isAbstract
-
- ^super isAbstract or: [ self name = #Diff2Tests ]
-
- "Modified: / 16-03-2012 / 20:11:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!Diff2Tests methodsFor:'as yet unclassified'!
-
-assertDiffWorksAsPatch: d
- | p f2 |
- p := d diff.
- f2 := p applyTo: d file1.
- self assert: f2 = d file2.
-
- "Modified: / 16-03-2012 / 18:25:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-diffClass
-
- self subclassResponsibility
-!
-
-sampleDiff: diffClass
- ^ diffClass new
- file1: #(The red brown fox jumped over the rolling log);
- file2: #(The brown spotted fox leaped over the rolling log).
-!
-
-testComm
- | c |
- c := (self sampleDiff: self diffClass) comm.
- self assert: c = {#common -> #(#The) . #different -> (#(#red) -> #()) . #common -> #(#brown) . #different -> (#() -> #(#spotted)) . #common -> #(#fox) . #different -> (#(#jumped) -> #(#leaped)) . #common -> #(#over #the #rolling #log)}.
-
- "Created: / 16-03-2012 / 18:22:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testCommPrefix
- | c |
- c := self diffClass new
- file1: #(d e f a b c);
- file2: #(a b c).
- c := c comm.
- self assert: c = {#different -> (#(d e f) -> #()) . #common -> #(a b c)}.
-
- "Created: / 16-03-2012 / 18:23:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testCommSuffix
- | c |
- c := self diffClass new
- file1: #(a b c d e f);
- file2: #(a b c).
- c := c comm.
- self assert: c = {#common -> #(a b c) . #different -> (#(d e f) -> #())}.
-
- "Created: / 16-03-2012 / 18:23:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testDiffIndices
- | p |
- p := (self sampleDiff: self diffClass) diffIndices.
- self assert: p = {(Diff2::Chunk offset: 2 length: 1)->(Diff2::Chunk offset: 2 length: 0) . (Diff2::Chunk offset: 4 length: 0)->(Diff2::Chunk offset: 3 length: 1) . (Diff2::Chunk offset: 5 length: 1)->(Diff2::Chunk offset: 5 length: 1)}.
-
- "Modified: / 16-03-2012 / 19:13:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testDiffPatch
- self assertDiffWorksAsPatch: (self sampleDiff: self diffClass).
-!
-
-testDiffSuffix
- self assertDiffWorksAsPatch: (self diffClass new
- file1: #(a b c d e f);
- file2: #(a b c)).
-!
-
-testLcs
- | lcs |
- lcs := (self sampleDiff: self diffClass) longestCommonSubsequence asArray.
- self assert: lcs = {1->1. 3->2. 4->4. 6->6. 7->7. 8->8. 9->9}.
-"({file1index:7, file2index:7, chain:{file1index:6, file2index:6, chain:{file1index:5, file2index:5, chain:{file1index:3, file2index:3, chain:{file1index:2, file2index:1, chain:{file1index:0, file2index:0, chain:{file1index:-1, file2index:-1, chain:null}}}}}}})"
-
- "Modified: / 16-03-2012 / 18:26:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcs2
- "Test case due to Levente Uzonyi."
- | lcs |
- lcs := (self diffClass new
- file1: 'acbcaca';
- file2: 'bcbcacb';
- longestCommonSubsequence) asArray.
- self assert: lcs = {2->2. 3->3. 4->4. 5->5. 6->6}.
-
- "Modified: / 16-03-2012 / 18:26:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcs2a
- "Same test as testLcs2, but with file1 and file2 switched."
- | lcs |
- lcs := (self diffClass new
- file1: 'bcbcacb';
- file2: 'acbcaca';
- longestCommonSubsequence) asArray.
- self assert: lcs = {2->2. 3->3. 4->4. 5->5. 6->6}.
-
- "Modified: / 16-03-2012 / 18:26:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcs2b
- "Based on testLcs2."
- | lcs |
- lcs := (self diffClass new
- file1: 'acba';
- file2: 'bcbb';
- longestCommonSubsequence) asArray.
- self assert: lcs = {2->2. 3->3}.
-
- "Modified: / 16-03-2012 / 18:26:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcsHM
- "Test case from Hunt & McIlroy 1976."
- | lcs |
- lcs := (self diffClass new
- file1: 'abcabba';
- file2: 'cbabac';
- longestCommonSubsequence) asArray.
- self assert: lcs = {3->1. 4->3. 5->4. 7->5}.
-
- "Modified: / 16-03-2012 / 18:26:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcsHMb
- "Test case from Hunt & McIlroy 1976, reversed."
- | lcs |
- lcs := (self diffClass new
- file1: 'cbabac';
- file2: 'abcabba';
- longestCommonSubsequence) asArray.
- self assert: lcs = {2->2. 3->4. 4->5. 5->7}.
-
- "Modified: / 16-03-2012 / 18:26:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!Diff2Tests methodsFor:'documentation'!
-
-copyright
-"
- Copyright (c) 2007-2012 Tony Garnock-Jones
-
- This code is based on Squeak's DiffMerge package
- written by Tony Garnock-Jones. Original project's web site:
-
- http://www.squeaksource.com/DiffMerge
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-"
-! !
-
-!Diff2Tests class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id: Diff2Tests.st 7929 2012-03-16 20:12:51Z vranyj1 $'
-! !
--- a/Diff2Tests_HuntMcilroy.st Sat Mar 17 13:13:35 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-"
- Copyright (c) 2007-2012 Tony Garnock-Jones
-
- This code is based on Squeak's DiffMerge package
- written by Tony Garnock-Jones. Original project's web site:
-
- http://www.squeaksource.com/DiffMerge
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-"
-"{ Package: 'stx:libtool' }"
-
-Diff2Tests subclass:#Diff2Tests_HuntMcilroy
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Collections-Sequenceable-Diff2'
-!
-
-!Diff2Tests_HuntMcilroy class methodsFor:'documentation'!
-
-copyright
-"
- Copyright (c) 2007-2012 Tony Garnock-Jones
-
- This code is based on Squeak's DiffMerge package
- written by Tony Garnock-Jones. Original project's web site:
-
- http://www.squeaksource.com/DiffMerge
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-"
-! !
-
-!Diff2Tests_HuntMcilroy methodsFor:'as yet unclassified'!
-
-diffClass
-
- ^Diff2 HuntMcilroy
-
- "Modified: / 16-03-2012 / 18:55:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!Diff2Tests_HuntMcilroy class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id: Diff2Tests_HuntMcilroy.st 7929 2012-03-16 20:12:51Z vranyj1 $'
-! !
--- a/Diff2Tests_MyersUkkonen.st Sat Mar 17 13:13:35 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-"
- Copyright (c) 2007-2012 Tony Garnock-Jones
-
- This code is based on Squeak's DiffMerge package
- written by Tony Garnock-Jones. Original project's web site:
-
- http://www.squeaksource.com/DiffMerge
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-"
-"{ Package: 'stx:libtool' }"
-
-Diff2Tests subclass:#Diff2Tests_MyersUkkonen
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Collections-Sequenceable-Diff2'
-!
-
-!Diff2Tests_MyersUkkonen class methodsFor:'documentation'!
-
-copyright
-"
- Copyright (c) 2007-2012 Tony Garnock-Jones
-
- This code is based on Squeak's DiffMerge package
- written by Tony Garnock-Jones. Original project's web site:
-
- http://www.squeaksource.com/DiffMerge
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-"
-! !
-
-!Diff2Tests_MyersUkkonen methodsFor:'as yet unclassified'!
-
-diffClass
-
- ^Diff2 MyersUkkonen
-
- "Modified: / 16-03-2012 / 18:55:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!Diff2Tests_MyersUkkonen class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id: Diff2Tests_MyersUkkonen.st 7929 2012-03-16 20:12:51Z vranyj1 $'
-! !
--- a/Diff3Tests.st Sat Mar 17 13:13:35 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-"
- Copyright (c) 2007-2012 Tony Garnock-Jones
-
- This code is based on Squeak's DiffMerge package
- written by Tony Garnock-Jones. Original project's web site:
-
- http://www.squeaksource.com/DiffMerge
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-"
-"{ Package: 'stx:libtool' }"
-
-TestCase subclass:#Diff3Tests
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Collections-Sequenceable-Diff3'
-!
-
-!Diff3Tests class methodsFor:'documentation'!
-
-copyright
-"
- Copyright (c) 2007-2012 Tony Garnock-Jones
-
- This code is based on Squeak's DiffMerge package
- written by Tony Garnock-Jones. Original project's web site:
-
- http://www.squeaksource.com/DiffMerge
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-"
-! !
-
-!Diff3Tests methodsFor:'as yet unclassified'!
-
-instance
- ^ Diff3 new
- file1: #(the quick fox jumps over some lazy dog);
- file0: #(the quick brown fox jumped over a dog);
- file2: #(the quick brown fox jumps over some record dog);
- diffClass: Diff2 HuntMcilroy.
-
- "Modified: / 16-03-2012 / 18:55:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testMergeExcludingFalseConflicts
- | m |
- m := self instance mergeClean.
- self assert: m = {
- #ok -> #(#the #quick #fox #jumps #over) .
- #conflict->(Diff3::Conflict new
- left: #(#some #lazy);
- original: #(#a);
- right: #(#some #record)) .
- #ok -> #(#dog)
- }.
-
- "Created: / 16-03-2012 / 18:21:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testMergeIncludingFalseConflicts
- | m |
- m := self instance merge.
- self assert: m = {
- #ok -> #(#the #quick #fox) .
- #conflict->(Diff3::Conflict new
- left: #(#jumps);
- original: #(#jumped);
- right: #(#jumps)) .
- #ok -> #(#over) .
- #conflict -> (Diff3::Conflict new
- left: #(#some #lazy);
- original: #(#a);
- right: #(#some #record)) .
- #ok -> #(#dog)
- }.
-
- "Created: / 16-03-2012 / 18:21:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testMergeIndices
- | m |
- m := self instance mergeIndices.
- self assert: m = {
- ((Diff3::Chunk offset: 1 length: 2) side: #original).
- ((Diff3::Chunk offset: 4 length: 1) side: #original).
- (Diff3::Conflict new
- left: (Diff2::Chunk offset: 4 length: 1);
- original: (Diff2::Chunk offset: 5 length: 1);
- right: (Diff2::Chunk offset: 5 length: 1)).
- ((Diff3::Chunk offset: 6 length: 1) side: #original).
- (Diff3::Conflict new
- left: (Diff2::Chunk offset: 6 length: 2);
- original: (Diff2::Chunk offset: 7 length: 1);
- right: (Diff2::Chunk offset: 7 length: 2)).
- ((Diff3::Chunk offset: 8 length: 1) side: #original)
- }.
-
- "Modified: / 16-03-2012 / 19:22:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testOverlaps1
- | m |
- m := (Diff3 new
- file0: #(AA ZZ 00 M 99);
- file1: #(AA a b c ZZ new 00 a a M 99);
- file2: #(AA a d c ZZ 11 M z z 99);
- diffClass: Diff2 HuntMcilroy) merge.
- self assert: m = {
- #ok -> #(AA).
- #conflict -> (Diff3::Conflict new left: #(a b c); original: #(); right: #(a d c)).
- #ok -> #(ZZ).
- #conflict -> (Diff3::Conflict new left: #(new 00 a a); original: #(00); right: #(11)).
- #ok -> #(M z z 99)}.
-
- "Modified: / 16-03-2012 / 19:20:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testOverlaps2
- | m |
- m := (Diff3 new
- file0: #();
- file1: #(A B C);
- file2: #(A D C);
- diffClass: Diff2 HuntMcilroy) merge.
- self assert: m = {
- #conflict -> (Diff3::Conflict new left: #(A B C); original: #(); right: #(A D C))}.
-
- "Modified: / 16-03-2012 / 19:20:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testOverlaps3
- | m |
- m := (Diff3 new
- file0: #(0 1 2 A X DD C Y E);
- file1: #(0 1 2 A X DD op BB Y E);
- file2: #(0 1 2 A AA C Y E);
- diffClass: Diff2 HuntMcilroy) merge.
- self assert: m = {
- #ok -> #(0 1 2 A).
- #conflict -> (Diff3::Conflict new left: #(X DD op BB); original: #(X DD C); right: #(AA C)).
- #ok -> #(Y E)}.
-
- "Modified: / 16-03-2012 / 19:20:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testOverlaps4
- | m |
- m := (Diff3 new
- file0: #(0 1 2 A X DD C Y E);
- file1: #(0 1 2 A op BB X DD C Y E);
- file2: #(0 1 2 A AA C Y E);
- diffClass: Diff2 HuntMcilroy) merge.
- self assert: m = {
- #ok -> #(0 1 2 A).
- #conflict -> (Diff3::Conflict new left: #(op BB X DD); original: #(X DD); right: #(AA)).
- #ok -> #(C Y E)}.
-
- "Modified: / 16-03-2012 / 19:20:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!Diff3Tests class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id: Diff3Tests.st 7929 2012-03-16 20:12:51Z vranyj1 $'
-! !
--- a/Make.proto Sat Mar 17 13:13:35 2012 +0000
+++ b/Make.proto Sat Mar 17 20:05:16 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-03-16 20:14:02.983.
+# automagically generated from the projectDefinition: stx_libtool at 2012-03-17 20:04:25.839.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -225,7 +225,7 @@
$(OUTDIR)VersionDiffBrowser.$(O) VersionDiffBrowser.$(H): VersionDiffBrowser.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)ViewWithAcceptAndCancelBar.$(O) ViewWithAcceptAndCancelBar.$(H): ViewWithAcceptAndCancelBar.st $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg/Button.$(H) $(INCLUDE_TOP)/stx/libwidg/Label.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
$(OUTDIR)Win32FileDialog.$(O) Win32FileDialog.$(H): Win32FileDialog.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(STCHDR)
-$(OUTDIR).stx_libtool.svn.$(O) .stx_libtool.svn.$(H): .stx_libtool.svn.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)stx_libtool.$(O) stx_libtool.$(H): stx_libtool.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)AbstractDirectoryBrowser.$(O) AbstractDirectoryBrowser.$(H): AbstractDirectoryBrowser.st $(INCLUDE_TOP)/stx/libtool/AbstractFileBrowser.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)AbstractFileFinderApplicationComponent.$(O) AbstractFileFinderApplicationComponent.$(H): AbstractFileFinderApplicationComponent.st $(INCLUDE_TOP)/stx/libtool/AbstractFileApplicationNoteBookComponent.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)AbstractSourceCodeManagementSettingsAppl.$(O) AbstractSourceCodeManagementSettingsAppl.$(H): AbstractSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -242,7 +242,7 @@
$(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)/stx/libtool/AbstractLauncherApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(STCHDR)
$(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)/stx/libtool/CodeGeneratorTool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -296,7 +296,7 @@
$(OUTDIR)Tools__ImplementingClassList.$(O) Tools__ImplementingClassList.$(H): Tools__ImplementingClassList.st $(INCLUDE_TOP)/stx/libtool/Tools__MethodList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Tools__ImplementingMethodList.$(O) Tools__ImplementingMethodList.$(H): Tools__ImplementingMethodList.st $(INCLUDE_TOP)/stx/libtool/Tools__MethodList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Tools__NamespaceFilter.$(O) Tools__NamespaceFilter.$(H): Tools__NamespaceFilter.st $(INCLUDE_TOP)/stx/libtool/Tools__NamespaceList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Tools__TestRunner2.$(O) Tools__TestRunner2.$(H): Tools__TestRunner2.st $(INCLUDE_TOP)/stx/libtool/Tools__AbstractTestRunner.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ClassList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(STCHDR)
+$(OUTDIR)Tools__TestRunner2.$(O) Tools__TestRunner2.$(H): Tools__TestRunner2.st $(INCLUDE_TOP)/stx/libtool/Tools__AbstractTestRunner.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ClassList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)Tools__HierarchicalChangeList.$(O) Tools__HierarchicalChangeList.$(H): Tools__HierarchicalChangeList.st $(INCLUDE_TOP)/stx/libtool/Tools__ChangeList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserListWithFilter.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Tools__HierarchicalPackageFilterList.$(O) Tools__HierarchicalPackageFilterList.$(H): Tools__HierarchicalPackageFilterList.st $(INCLUDE_TOP)/stx/libtool/Tools__HierarchicalProjectList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ProjectList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)Tools__InheritanceClassList.$(O) Tools__InheritanceClassList.$(H): Tools__InheritanceClassList.st $(INCLUDE_TOP)/stx/libtool/Tools__HierarchicalClassList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ClassList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec Sat Mar 17 13:13:35 2012 +0000
+++ b/Make.spec Sat Mar 17 20:05:16 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-03-16 20:14:01.421.
+# automagically generated from the projectDefinition: stx_libtool at 2012-03-17 20:04:21.548.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -311,7 +311,7 @@
$(OUTDIR)VersionDiffBrowser.$(O) \
$(OUTDIR)ViewWithAcceptAndCancelBar.$(O) \
$(OUTDIR)Win32FileDialog.$(O) \
- $(OUTDIR).stx_libtool.svn.$(O) \
+ $(OUTDIR)stx_libtool.$(O) \
$(OUTDIR)AbstractDirectoryBrowser.$(O) \
$(OUTDIR)AbstractSourceCodeManagementSettingsAppl.$(O) \
$(OUTDIR)BookmarkMenuBuilder.$(O) \
--- a/SyntaxHighlighter2.st Sat Mar 17 13:13:35 2012 +0000
+++ b/SyntaxHighlighter2.st Sat Mar 17 20:05:16 2012 +0000
@@ -26,7 +26,8 @@
"{ Package: 'stx:libtool' }"
SyntaxHighlighter subclass:#SyntaxHighlighter2
- instanceVariableNames:'elements lastVariableElements lastSelectorElement'
+ instanceVariableNames:'elements lastVariableElements lastSelectorElement
+ ignoreBadIdentifier'
classVariableNames:''
poolDictionaries:''
category:'Interface-CodeView-Syntax'
@@ -644,7 +645,9 @@
variable
| node |
+ ignoreBadIdentifier := classToCompileFor isNil.
node := super variable.
+ ignoreBadIdentifier := false.
node isVariable ifTrue:[
| el prevEl |
@@ -679,6 +682,13 @@
"Modified: / 16-02-2012 / 22:34:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+markBadIdentifierFrom:pos1 to:pos2
+
+ super markBadIdentifierFrom:pos1 to:pos2
+
+ "Created: / 17-03-2012 / 19:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
markLocalIdentifierFrom:pos1 to:pos2
| node el prevEl |
@@ -714,16 +724,24 @@
"Created: / 14-02-2010 / 17:40:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (format): / 21-08-2011 / 09:18:21 / cg"
"Modified: / 16-02-2012 / 23:46:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+markUnknownIdentifierFrom:pos1 to:pos2
+
+ ignoreBadIdentifier == true ifTrue:[ ^ self ].
+
+ super markUnknownIdentifierFrom:pos1 to:pos2
+
+ "Created: / 31.3.1998 / 19:09:26 / cg"
+ "Modified: / 31.3.1998 / 19:10:30 / cg"
! !
!SyntaxHighlighter2 class methodsFor:'documentation'!
version_CVS
- ^ 'Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.8 2012/01/19 09:48:54 cg Exp '
+ ^ '§Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.8 2012/01/19 09:48:54 cg Exp §'
!
version_SVN
- ^ '$Id: SyntaxHighlighter2.st 7911 2012-02-22 09:55:48Z vranyj1 $'
+ ^ '$Id: SyntaxHighlighter2.st 7940 2012-03-17 20:05:16Z vranyj1 $'
! !
-
-
--- a/Tools__BackgroundSourceProcessingService.st Sat Mar 17 13:13:35 2012 +0000
+++ b/Tools__BackgroundSourceProcessingService.st Sat Mar 17 20:05:16 2012 +0000
@@ -76,16 +76,24 @@
!BackgroundSourceProcessingService methodsFor:'change & update'!
+modelChanged
+ "Model has changed (i.e., value holder keeping displayed text"
+
+ self sourceChanged: true
+
+ "Created: / 17-03-2012 / 15:45:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
sourceChanged:force
"Called when codeview's text changes"
- (force or:[codeView textView modified]) ifTrue:[
+ (force or:[codeView reallyModified]) ifTrue:[
self process
].
"Modified: / 22-08-2011 / 13:51:53 / cg"
"Modified (format): / 05-09-2011 / 05:06:40 / cg"
- "Modified: / 24-01-2012 / 12:25:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 17-03-2012 / 16:04:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
update:aspect with:param from:sender
@@ -93,7 +101,7 @@
"/sender == textView modifiedChannel ifTrue:[^self codeChanged: false].
sender == textView model ifTrue:[
sender value ~= textView contents ifTrue:[
- self sourceChanged:true.
+ self modelChanged.
^self.
].
].
@@ -117,8 +125,8 @@
"Created: / 06-03-2010 / 19:38:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 13-09-2011 / 12:00:29 / cg"
- "Modified: / 16-09-2011 / 17:30:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 22-02-2012 / 15:02:16 / jv"
+ "Modified: / 17-03-2012 / 16:06:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!BackgroundSourceProcessingService methodsFor:'event handling'!
@@ -175,16 +183,17 @@
].
job scheduled ifTrue:[
- job running ifFalse:[
- "/ process already created, but did not get a change to start yet;
- ^ self
- ] ifTrue:[
+"/ job running ifFalse:[
+"/ "/ process already created, but did not get a change to start yet;
+"/ ^ self
+"/ ] ifTrue:[
job stop.
- ]
+"/ ]
].
- prio := Processor userBackgroundPriority - 1.
textView shown ifFalse:[
- prio := prio - 1 max:1
+ prio := Processor userBackgroundPriority - 1
+ ] ifTrue:[
+ prio := Processor activeProcess priority - 1.
].
job startWithPriority: prio.
@@ -217,7 +226,7 @@
!BackgroundSourceProcessingService class methodsFor:'documentation'!
version
- ^ '$Id: Tools__BackgroundSourceProcessingService.st 7913 2012-02-22 17:35:52Z vranyj1 $'
+ ^ '$Id: Tools__BackgroundSourceProcessingService.st 7940 2012-03-17 20:05:16Z vranyj1 $'
!
version_CVS
@@ -225,5 +234,5 @@
!
version_SVN
- ^ '$Id: Tools__BackgroundSourceProcessingService.st 7913 2012-02-22 17:35:52Z vranyj1 $'
+ ^ '$Id: Tools__BackgroundSourceProcessingService.st 7940 2012-03-17 20:05:16Z vranyj1 $'
! !
--- a/Tools__CodeHighlightingService.st Sat Mar 17 13:13:35 2012 +0000
+++ b/Tools__CodeHighlightingService.st Sat Mar 17 20:05:16 2012 +0000
@@ -243,6 +243,8 @@
"/self delayedUpdateBufferLabelWithCheckIfModified
] ifFalse:[
textView contents: newCode.
+ codeView syntaxElements: elements.
+ gutterView invalidate.
]
]
]
@@ -343,17 +345,19 @@
codeView syntaxElements: elements.
gutterView invalidate.
+"/ Transcript showCR:'--> rehighlighted ', self identityHash printString.
+
"Modified: / 09-10-2006 / 11:50:17 / cg"
"Created: / 14-02-2010 / 16:10:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (format): / 21-08-2011 / 09:38:22 / cg"
- "Modified: / 30-01-2012 / 16:49:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 01-02-2012 / 19:18:00 / jv"
+ "Modified: / 17-03-2012 / 19:33:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!CodeHighlightingService class methodsFor:'documentation'!
version
- ^ '$Id: Tools__CodeHighlightingService.st 7911 2012-02-22 09:55:48Z vranyj1 $'
+ ^ '$Id: Tools__CodeHighlightingService.st 7940 2012-03-17 20:05:16Z vranyj1 $'
!
version_CVS
@@ -361,6 +365,5 @@
!
version_SVN
- ^ '$Id: Tools__CodeHighlightingService.st 7911 2012-02-22 09:55:48Z vranyj1 $'
+ ^ '$Id: Tools__CodeHighlightingService.st 7940 2012-03-17 20:05:16Z vranyj1 $'
! !
-
--- a/Tools__CodeView2.st Sat Mar 17 13:13:35 2012 +0000
+++ b/Tools__CodeView2.st Sat Mar 17 20:05:16 2012 +0000
@@ -620,7 +620,7 @@
self update:#value with:newValue from:textView model.
].
- "Modified: / 27-07-2011 / 12:58:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 17-03-2012 / 16:11:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
modified
@@ -698,7 +698,7 @@
(v := self classHolder value) notNil ifTrue:[^v].
(v := self methodHolder value) notNil ifTrue:[^v mclass].
- ^UndefinedObject
+ ^nil
"Created: / 27-07-2011 / 13:14:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -3297,7 +3297,7 @@
!CodeView2 class methodsFor:'documentation'!
version
- ^ '$Id: Tools__CodeView2.st 7939 2012-03-17 13:13:35Z vranyj1 $'
+ ^ '$Id: Tools__CodeView2.st 7940 2012-03-17 20:05:16Z vranyj1 $'
!
version_CVS
@@ -3305,7 +3305,7 @@
!
version_SVN
- ^ '$Id: Tools__CodeView2.st 7939 2012-03-17 13:13:35Z vranyj1 $'
+ ^ '$Id: Tools__CodeView2.st 7940 2012-03-17 20:05:16Z vranyj1 $'
! !
CodeView2 initialize!
--- a/Tools__NavigationState.st Sat Mar 17 13:13:35 2012 +0000
+++ b/Tools__NavigationState.st Sat Mar 17 20:05:16 2012 +0000
@@ -36,7 +36,7 @@
messagePaneView codePaneAndPluginView
codePaneAndPluginViewRelativeCorners pluginVisibleHolder
bookmarkHolder worker packageInfoBackgroundColorHolder
- packageInfoButton showMethodTemplate'
+ packageInfoButton showMethodTemplate lastMethodShownInCodeView'
classVariableNames:''
poolDictionaries:''
category:'Interface-Browsers-New'
@@ -194,6 +194,14 @@
^ Smalltalk
!
+lastMethodShownInCodeView
+ ^ lastMethodShownInCodeView
+!
+
+lastMethodShownInCodeView:something
+ lastMethodShownInCodeView := something.
+!
+
messagePaneView
^ messagePaneView
!
@@ -1665,5 +1673,5 @@
!
version_SVN
- ^ '$Id: Tools__NavigationState.st 7916 2012-02-28 12:59:00Z vranyj1 $'
+ ^ '$Id: Tools__NavigationState.st 7940 2012-03-17 20:05:16Z vranyj1 $'
! !
--- a/Tools__NewSystemBrowser.st Sat Mar 17 13:13:35 2012 +0000
+++ b/Tools__NewSystemBrowser.st Sat Mar 17 20:05:16 2012 +0000
@@ -48081,16 +48081,8 @@
!
showMethodsCode:mthd scrollToTop:doScrollToTop
- |code codeView doAutoFormat doSyntaxColoring|
-
- "/Do no coloring here if CodeView2 is used,
- "/since CodeView2 itself cares about the coloring!!
- "/Not working correctly -> do the coloring until fixed in CodeView2
- "(UserPreferences current useCodeView2In: #Browser)"false ifTrue:[
- doSyntaxColoring := false
- ] ifFalse:[
- doSyntaxColoring := self doSyntaxColoring value == true.
- ].
+ |code codeView doAutoFormat doSyntaxColoring doUpdateCode prevMthd |
+
doAutoFormat := self doAutoFormat value and:[RBFormatter notNil].
codeView := self codeView.
@@ -48099,7 +48091,22 @@
code := self sourceOfMethod:mthd.
code isText ifTrue:[
doSyntaxColoring := false.
- ].
+ ] ifFalse:[
+ "/Do no coloring here if CodeView2 is used,
+ "/since CodeView2 itself cares about the coloring!!
+ "/Not working correctly -> do the coloring until fixed in CodeView2
+ "JV: Enable is, otherwise I won't notice that it does not work
+ correctly!!"
+ (UserPreferences current useCodeView2In: #Browser) ifTrue:[
+ doSyntaxColoring := code size < 2000
+ ] ifFalse:[
+ doSyntaxColoring := self doSyntaxColoring value == true.
+ ].
+ ].
+
+
+
+
doAutoFormat ifTrue:[
Error catch:[
@@ -48107,29 +48114,44 @@
].
].
- doSyntaxColoring ifTrue:[
- "/ immediate coloring, if code is not too large;
- "/ otherwise, do it in the background.
- code size < 2000 " 10000 " ifTrue:[
- Error handle:[:ex |
- Transcript showCR:'error in syntaxHighlighter: ',ex description.
- ] do:[
- code := self syntaxHighlightedCodeFor:code method:mthd.
- ].
- ] ifFalse:[
- self enqueueDelayedStartSyntaxHighlightProcess.
- ].
-
- [
- codeView modifiedChannel removeDependent:self.
- codeView modified:false.
+ "Hack for Java methods: 'As whole class source coce is shown,
+ there is no need to set codeview's content if previous method
+ belonged to the same class. Code is already shown, we need only
+ to scrool to it..."
+ "hmm...hmm...how implement it in a better, more generic way?"
+ doUpdateCode := true.
+ mthd isJavaMethod ifTrue:[
+ prevMthd := navigationState lastMethodShownInCodeView.
+ (prevMthd notNil and:[prevMthd isJavaMethod]) ifTrue:[
+ doUpdateCode := mthd javaClass ~~ prevMthd javaClass
+ ].
+ ].
+ doUpdateCode ifTrue:[
+ doSyntaxColoring ifTrue:[
+ "/ immediate coloring, if code is not too large;
+ "/ otherwise, do it in the background.
+ code size < 2000 " 10000 " ifTrue:[
+ Error handle:[:ex |
+ Transcript showCR:'error in syntaxHighlighter: ',ex description.
+ ] do:[
+ code := self syntaxHighlightedCodeFor:code method:mthd.
+ ].
+ ] ifFalse:[
+ self enqueueDelayedStartSyntaxHighlightProcess.
+ ].
+
+ [
+ codeView modifiedChannel removeDependent:self.
+ codeView modified:false.
+ self showCode:code scrollToTop:doScrollToTop.
+ ] ensure:[
+ codeView modifiedChannel addDependent:self.
+ ]
+ ] ifFalse:[
self showCode:code scrollToTop:doScrollToTop.
- ] ensure:[
- codeView modifiedChannel addDependent:self.
- ]
- ] ifFalse:[
- self showCode:code scrollToTop:doScrollToTop.
- ].
+ ].
+ ].
+ navigationState lastMethodShownInCodeView: mthd.
"/ scroll, for file-based classes (java, ruby, etc.)
mthd sourceLineNumber ~~ 1 ifTrue:[
@@ -48142,8 +48164,8 @@
self updatePackageInfoForMethod:mthd.
"Created: / 01-03-2000 / 11:38:57 / cg"
- "Modified (format): / 29-07-2011 / 11:45:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 21-08-2011 / 08:54:33 / cg"
+ "Modified: / 17-03-2012 / 16:15:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
showNothing
@@ -55891,7 +55913,7 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Id: Tools__NewSystemBrowser.st 7923 2012-03-09 23:06:58Z vranyj1 $'
+ ^ '$Id: Tools__NewSystemBrowser.st 7940 2012-03-17 20:05:16Z vranyj1 $'
!
version_CVS
@@ -55899,7 +55921,7 @@
!
version_SVN
- ^ '$Id: Tools__NewSystemBrowser.st 7923 2012-03-09 23:06:58Z vranyj1 $'
+ ^ '$Id: Tools__NewSystemBrowser.st 7940 2012-03-17 20:05:16Z vranyj1 $'
! !
NewSystemBrowser initialize!
--- a/abbrev.stc Sat Mar 17 13:13:35 2012 +0000
+++ b/abbrev.stc Sat Mar 17 20:05:16 2012 +0000
@@ -132,7 +132,7 @@
ViewWithAcceptAndCancelBar ViewWithAcceptAndCancelBar stx:libtool 'Views-Basic' 2
Win32FileDialog Win32FileDialog stx:libtool 'Interface-Tools-File' 0
XTermView XTermView stx:libtool 'Interface-Tools-Terminal' 2
-stx_libtool .stx_libtool.svn stx:libtool '* Projects & Packages *' 3
+stx_libtool stx_libtool stx:libtool '* Projects & Packages *' 3
AbstractDirectoryBrowser AbstractDirectoryBrowser stx:libtool 'Interface-Tools-File' 3
AbstractSourceCodeManagementSettingsAppl AbstractSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
BookmarkMenuBuilder BookmarkMenuBuilder stx:libtool 'Interface-Bookmarks' 0
@@ -209,10 +209,6 @@
Tools::Diff3CodeView2 Tools__Diff3CodeView2 stx:libtool 'Interface-CodeView' 2
Tools::TextDiff2Tool Tools__TextDiff2Tool stx:libtool 'Interface-Diff' 1
Tools::TextDiff3Tool Tools__TextDiff3Tool stx:libtool 'Interface-Diff' 1
-Diff2Tests Diff2Tests stx:libtool 'Collections-Sequenceable-Diff2' 1
-Diff2Tests_HuntMcilroy Diff2Tests_HuntMcilroy stx:libtool 'Collections-Sequenceable-Diff2' 1
-Diff2Tests_MyersUkkonen Diff2Tests_MyersUkkonen stx:libtool 'Collections-Sequenceable-Diff2' 1
-Diff3Tests Diff3Tests stx:libtool 'Collections-Sequenceable-Diff3' 1
Diff2 Diff2 stx:libtool 'Collections-Sequenceable-Diff2' 0
Diff3 Diff3 stx:libtool 'Collections-Sequenceable-Diff3' 0
Diff3Hunk Diff3Hunk stx:libtool 'Collections-Sequenceable-Diff3' 0
--- a/bc.mak Sat Mar 17 13:13:35 2012 +0000
+++ b/bc.mak Sat Mar 17 20:05:16 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-03-17 13:13:35.341.
+# automagically generated from the projectDefinition: stx_libtool at 2012-03-17 20:04:28.228.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -184,7 +184,7 @@
$(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)\stx\libtool\AbstractLauncherApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ToolApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(STCHDR)
$(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)\stx\libtool\CodeGeneratorTool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -238,7 +238,7 @@
$(OUTDIR)Tools__ImplementingClassList.$(O) Tools__ImplementingClassList.$(H): Tools__ImplementingClassList.st $(INCLUDE_TOP)\stx\libtool\Tools__MethodList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Tools__ImplementingMethodList.$(O) Tools__ImplementingMethodList.$(H): Tools__ImplementingMethodList.st $(INCLUDE_TOP)\stx\libtool\Tools__MethodList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Tools__NamespaceFilter.$(O) Tools__NamespaceFilter.$(H): Tools__NamespaceFilter.st $(INCLUDE_TOP)\stx\libtool\Tools__NamespaceList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Tools__TestRunner2.$(O) Tools__TestRunner2.$(H): Tools__TestRunner2.st $(INCLUDE_TOP)\stx\libtool\Tools__AbstractTestRunner.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ClassList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(STCHDR)
+$(OUTDIR)Tools__TestRunner2.$(O) Tools__TestRunner2.$(H): Tools__TestRunner2.st $(INCLUDE_TOP)\stx\libtool\Tools__AbstractTestRunner.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ClassList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)Tools__HierarchicalChangeList.$(O) Tools__HierarchicalChangeList.$(H): Tools__HierarchicalChangeList.st $(INCLUDE_TOP)\stx\libtool\Tools__ChangeList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserListWithFilter.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Tools__HierarchicalPackageFilterList.$(O) Tools__HierarchicalPackageFilterList.$(H): Tools__HierarchicalPackageFilterList.st $(INCLUDE_TOP)\stx\libtool\Tools__HierarchicalProjectList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ProjectList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)Tools__InheritanceClassList.$(O) Tools__InheritanceClassList.$(H): Tools__InheritanceClassList.st $(INCLUDE_TOP)\stx\libtool\Tools__HierarchicalClassList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ClassList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/libtool.rc Sat Mar 17 13:13:35 2012 +0000
+++ b/libtool.rc Sat Mar 17 20:05:16 2012 +0000
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.1.1\0"
- VALUE "ProductDate", "Sat, 17 Mar 2012 13:13:56 GMT\0"
+ VALUE "ProductDate", "Sat, 17 Mar 2012 20:05:27 GMT\0"
END
END
--- a/stx_libtool.st Sat Mar 17 13:13:35 2012 +0000
+++ b/stx_libtool.st Sat Mar 17 20:05:16 2012 +0000
@@ -96,18 +96,18 @@
^ #(
#'stx:goodies/refactoryBrowser/parser' "RBProgramNodeVisitor - superclass of CodeGenerator "
- #'stx:goodies/sunit' "TestAsserter - superclass of Diff2Tests_MyersUkkonen "
- #'stx:libbasic' "Object - superclass of Tools::CodeView2 "
- #'stx:libbasic2' "List - superclass of SettingsDialog::HierarchicalApplicationList "
- #'stx:libbasic3' "Change - superclass of extended CompositeChange "
- #'stx:libboss' "BinaryInputManager - referenced by Tools::Profiler class>>readStatisticsFrom: "
- #'stx:libcomp' "Scanner - superclass of SyntaxHighlighter2 "
- #'stx:libhtml' "HTMLDocumentView - referenced by Tools::NewSystemBrowser>>openDocumentation "
+ #'stx:goodies/sunit' "TestCase - referenced by Tools::NewSystemBrowser>>classMenuNewTestCase "
+ #'stx:libbasic' "ExecutableFunction - superclass of Tools::MethodCategoryList::MissingMethod "
+ #'stx:libbasic2' "List - superclass of Tools::TagList "
+ #'stx:libbasic3' "MessageTally - superclass of Tools::Profiler "
+ #'stx:libboss' "BinaryOutputManager - referenced by Tools::Profiler>>storeStatisticsOn: "
+ #'stx:libcomp' "SyntaxHighlighter - superclass of SyntaxHighlighter2 "
+ #'stx:libhtml' "DidYouKnowTipViewer - referenced by AbstractLauncherApplication>>showTipOfTheDay "
#'stx:libui' "InputFieldSpec - superclass of EditFieldWithCompletionSpec "
- #'stx:libview' "ModalBox - superclass of Tools::SearchDialog "
- #'stx:libview2' "ApplicationModel - superclass of Tools::CheckinInfoDialog "
- #'stx:libwidg' "Button - superclass of ViewWithAcceptAndCancelBar::AcceptAndCancelBar::ButtonWithHelpText "
- #'stx:libwidg2' "ListModelView - superclass of Tools::CodeCompletionMenu "
+ #'stx:libview' "PopUpView - superclass of extended PopUpMenu "
+ #'stx:libview2' "ApplicationModel - superclass of PerforceSourceCodeManagementSettingsAppl "
+ #'stx:libwidg' "VariablePanel - superclass of FileBrowserV2PanelView "
+ #'stx:libwidg2' "TwoColumnTextView - superclass of DiffCodeView "
)
! !
@@ -341,10 +341,6 @@
#'Tools::Diff3CodeView2'
#'Tools::TextDiff2Tool'
#'Tools::TextDiff3Tool'
- (Diff2Tests autoload)
- (#'Diff2Tests_HuntMcilroy' autoload)
- (#'Diff2Tests_MyersUkkonen' autoload)
- (Diff3Tests autoload)
Diff2
Diff3
Diff3Hunk
@@ -533,7 +529,7 @@
!stx_libtool class methodsFor:'documentation'!
version
- ^ '$Id: stx_libtool.st 7935 2012-03-16 20:24:01Z vranyj1 $'
+ ^ '$Id: stx_libtool.st 7940 2012-03-17 20:05:16Z vranyj1 $'
!
version_CVS
@@ -541,5 +537,5 @@
!
version_SVN
- ^ '$Id: stx_libtool.st 7935 2012-03-16 20:24:01Z vranyj1 $'
+ ^ '$Id: stx_libtool.st 7940 2012-03-17 20:05:16Z vranyj1 $'
! !