--- a/Diff3TextView.st	Wed Jul 18 09:25:57 2012 +0100
+++ b/Diff3TextView.st	Wed Jul 18 10:57:46 2012 +0100
@@ -437,9 +437,9 @@
 !Diff3TextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.9 2012/06/01 10:44:15 cg Exp $'
+    ^ '$Id: Diff3TextView.st 8016 2012-07-18 09:57:46Z vranyj1 $'
 !
 
 version_SVN
-    ^ '$Id: Diff3TextView.st 8007 2012-06-05 14:49:00Z vranyj1 $'
+    ^ '$Id: Diff3TextView.st 8016 2012-07-18 09:57:46Z vranyj1 $'
 ! !

--- a/Make.proto	Wed Jul 18 09:25:57 2012 +0100
+++ b/Make.proto	Wed Jul 18 10:57:46 2012 +0100
@@ -244,7 +244,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/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(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/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(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) $(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)

--- a/RCSConflictEditTextView.st	Wed Jul 18 09:25:57 2012 +0100
+++ b/RCSConflictEditTextView.st	Wed Jul 18 10:57:46 2012 +0100
@@ -9,8 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
-
 "{ Package: 'stx:libtool' }"
 
 EditTextView subclass:#RCSConflictEditTextView
@@ -154,5 +152,9 @@
 !RCSConflictEditTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/RCSConflictEditTextView.st,v 1.3 2006/07/05 07:42:02 fm Exp $'
+    ^ '$Id: RCSConflictEditTextView.st 8016 2012-07-18 09:57:46Z vranyj1 $'
+!
+
+version_SVN
+    ^ '$Id:: RCSConflictEditTextView.st 8016 2012-07-18 09:57:46Z vranyj1                                                           $'
 ! !

--- a/Tools__BreakpointService.st	Wed Jul 18 09:25:57 2012 +0100
+++ b/Tools__BreakpointService.st	Wed Jul 18 10:57:46 2012 +0100
@@ -64,6 +64,12 @@
 "
 ! !
 
+!BreakpointService class methodsFor:'others'!
+
+version_CVS
+    ^ '§Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.12 2012/03/23 18:10:47 cg Exp §'
+! !
+
 !BreakpointService methodsFor:'accessing'!
 
 breakpoints
@@ -188,23 +194,30 @@
 recompile
     "recompile the current method for changed breakpoints"
 
-    |method newMethod compiler|
+    |method newMethod compiler class selector|
 
-    method :=codeView methodHolder value"currentMethod".
+    method := codeView methodHolder value.
     (method notNil and:[method hasPrimitiveCode not]) ifTrue:[
         "/ be careful: if the text has been edited/modified, do not compile
         textView modified ifTrue:[
-            self halt
+            self breakPoint: #cg.
+            self breakPoint: #jv.
+            ^self.
         ] ifFalse:[
             "/ prepare to get reachable bpts
             breakpoints do:[:bp | bp isReached:false].
 
+            class := method mclass.
+            class isNil ifTrue:[
+                class := codeView classHolder value.
+            ].
+            selector := method selector.
             Class withoutUpdatingChangesDo:[
                 compiler := ByteCodeCompilerWithBreakpointSupport new.
                 compiler breakpoints:breakpoints.
                 newMethod := compiler
                             compile:method source
-                            forClass:method mclass 
+                            forClass:class 
                             inCategory:method category 
                             notifying:nil
                             install:false 
@@ -212,24 +225,34 @@
                             silent:true 
                             foldConstants:true
                             ifFail:[ self halt ].
-
-                (codeView classHolder value primAddSelector:compiler selector withMethod:newMethod) ifFalse:[
-                    self halt.
+                selector isNil ifTrue:[
+                    "/May happen as the selector is not stored in the method but
+                    "/searches through method's mclass methodDictionary.
+                    "/Following should be save as breakpoint is not installed when
+                    "/the code is modified...
+                    selector := compiler selector.
+                ].
+                (class primAddSelector: selector withMethod:newMethod) ifFalse:[
+                    self breakPoint: #cg.
+                    self breakPoint: #jv.
                     ^ self
                 ].
+                codeView methodHolder value:newMethod.
+                method mclass isNil ifTrue:[
+                    method mclass:class.
+                ].
             ].
-
+"/ self halt.
             breakpoints := breakpoints 
                             select:[:bp | 
                                 bp isReached ifFalse:[ Transcript show:'remove unreached:'; showCR:bp ].
                                 bp isReached
-                            ].
-            currentMethod := newMethod.
+                            ]
         ]
     ]
 
     "Created: / 05-07-2011 / 21:33:13 / cg"
-    "Modified: / 17-06-2012 / 09:36:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-07-2012 / 10:53:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 setOrToggleBreakpointAtLine:line 
@@ -270,7 +293,7 @@
      Ask JV what the args means if unsure (I'm lazy to document
      them, now it is just an experiment...)"
     
-    |bpnt icon|
+    |bpnt icon dx dy|
 
     codeView methodHolder value isNil ifTrue:[
         ^ self
@@ -284,26 +307,24 @@
         icon isNil ifTrue:[
             ^ self
         ].
-        self 
-            drawAnnotationIcon:icon
-            atX:x y:y width:w height:h
+        dx := ((w - icon width) / 2) rounded.
+        dy := ((h - icon height) / 2) rounded.
+        icon 
+            displayOn:view
+            x:x + dx
+            y:y - h + dy + 4. "TODO: Magic constant"
     ].
 
     "Created: / 17-06-2011 / 13:52:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (format): / 05-07-2011 / 22:14:33 / cg"
-    "Modified: / 30-01-2012 / 19:32:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !BreakpointService class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__BreakpointService.st 8008 2012-06-17 08:45:40Z vranyj1 $'
-!
-
-version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.12 2012/03/23 18:10:47 cg Exp §'
+    ^ '$Id: Tools__BreakpointService.st 8016 2012-07-18 09:57:46Z vranyj1 $'
 !
 
 version_SVN
-    ^ '$Id: Tools__BreakpointService.st 8008 2012-06-17 08:45:40Z vranyj1 $'
+    ^ '$Id:: Tools__BreakpointService.st 8016 2012-07-18 09:57:46Z vranyj1                                                          $'
 ! !

--- a/Tools__ChangeSetBrowser2.st	Wed Jul 18 09:25:57 2012 +0100
+++ b/Tools__ChangeSetBrowser2.st	Wed Jul 18 10:57:46 2012 +0100
@@ -1542,7 +1542,7 @@
             activeHelpKey: fileLoad
             enabled: isWorkingNotHolder
             label: 'Load'
-            itemValue: doLoad
+            itemValue: doOpen
             translateLabel: true
             isButton: true
             labelImage: (ResourceRetriever XPToolbarIconLibrary loadFromFileIcon)
@@ -1643,8 +1643,6 @@
         nil
         nil
       )
-
-    "Modified: / 17-05-2012 / 20:45:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetBrowser2 class methodsFor:'plugIn spec'!
@@ -3475,7 +3473,7 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__ChangeSetBrowser2.st 8004 2012-05-21 14:54:39Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st 8016 2012-07-18 09:57:46Z vranyj1 $'
 !
 
 version_CVS
@@ -3483,5 +3481,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetBrowser2.st 8004 2012-05-21 14:54:39Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st 8016 2012-07-18 09:57:46Z vranyj1 $'
 ! !

--- a/Tools__NewSystemBrowser.st	Wed Jul 18 09:25:57 2012 +0100
+++ b/Tools__NewSystemBrowser.st	Wed Jul 18 10:57:46 2012 +0100
@@ -32391,113 +32391,114 @@
      classesToUnload current repository diffs allDiffs
      title|
 
+
     collectionOfClasses size == 1 ifTrue:[
-	self compareAgainstNewestInRepository:(collectionOfClasses first theNonMetaclass) usingManager:aManagerOrNil.
-	^ self.
+        self compareAgainstNewestInRepository:(collectionOfClasses first theNonMetaclass) usingManager:aManagerOrNil.
+        ^ self.
     ].
 
     classesToUnload := IdentitySet new.
     classes :=
-	collectionOfClasses
-	    collect:[:eachClass |
-		|loadedClass|
-
-		eachClass isLoaded ifFalse:[
-		    loadedClass := eachClass autoload.
-		    loadedClass notNil ifTrue:[classesToUnload add:loadedClass].
-		] ifTrue:[
-		    loadedClass := eachClass
-		].
-		loadedClass isNil
-		    ifTrue:nil
-		    ifFalse:[loadedClass theNonMetaclass]]
-	    thenSelect:[:cls | cls notNil].
+        collectionOfClasses
+            collect:[:eachClass |
+                |loadedClass|
+
+                eachClass isLoaded ifFalse:[
+                    loadedClass := eachClass autoload.
+                    loadedClass notNil ifTrue:[classesToUnload add:loadedClass].
+                ] ifTrue:[
+                    loadedClass := eachClass
+                ].
+                loadedClass isNil
+                    ifTrue:nil
+                    ifFalse:[loadedClass theNonMetaclass]]
+            thenSelect:[:cls | cls notNil].
 
     classes do:[:eachClass |
-	eachClass isLoaded ifFalse:[
-	    Transcript showCR:('Cannot compare unloaded class: ' , eachClass name).
-	] ifTrue:[
-	    aStream := self sourceStreamForRepositorySourceOfClass:eachClass usingManager:aManagerOrNil.
-	    aStream notNil ifTrue:[
-		aStream class readErrorSignal handle:[:ex |
-		    self warn:('read error while reading extracted source\\' , ex description) withCRs.
-		    aStream close.
-		    ^ self
-		] do:[
-		    comparedSource := aStream contents asString.
-		].
-		aStream close.
-
-		self busyLabel:'generating current source ...' with:nil.
-
-		aStream := '' writeStream.
-		Method flushSourceStreamCache.
-		"/ eachClass fileOutOn:aStream withTimeStamp:false.
-		"/ currentSource := aStream contents asString.
-		currentSource := eachClass source asString.
-		aStream close.
-
-		self busyLabel:'comparing  ...' with:nil.
-
-		comparedSource = currentSource ifTrue:[
-		    ((eachClass revision = ((aManagerOrNil ? eachClass sourceCodeManager) newestRevisionOf:eachClass))
-		    and:[eachClass hasUnsavedChanges]) ifTrue:[
-			(self confirm:'Versions are identical.\\Remove entries from changeSet ?' withCRs) ifTrue:[
-			    ChangeSet current condenseChangesForClass:eachClass.
-			].
-		    ] ifFalse:[
-			self information:'Versions are identical.'.
-		    ]
-		] ifFalse:[
-		    thisRevString := eachClass revision.
-		    thisRevString isNil ifTrue:[
-			thisRevString := 'no revision'
-		    ].
-
-		    self busyLabel:'comparing  ...' with:nil.
-
-		    current    := ChangeSet fromStream:(s := currentSource readStream). s close.
-		    repository := ChangeSet fromStream:(s := comparedSource readStream). s close.
-
-		    diffs := repository diffSetsAgainst:current.
-		    allDiffs isNil ifTrue:[
-			allDiffs := diffs.
-		    ] ifFalse:[
-			allDiffs changed addAll:(diffs changed).
-			allDiffs onlyInArg addAll:(diffs onlyInArg).
-			allDiffs onlyInReceiver addAll:(diffs onlyInReceiver).
-		    ].
-		].
-	    ].
-	].
+        eachClass isLoaded ifFalse:[
+            Transcript showCR:('Cannot compare unloaded class: ' , eachClass name).
+        ] ifTrue:[
+            aStream := self sourceStreamForRepositorySourceOfClass:eachClass usingManager:aManagerOrNil.
+            aStream notNil ifTrue:[
+                aStream class readErrorSignal handle:[:ex |
+                    self warn:('read error while reading extracted source\\' , ex description) withCRs.
+                    aStream close.
+                    ^ self
+                ] do:[
+                    comparedSource := aStream contents asString.
+                ].
+                aStream close.
+
+                self busyLabel:'generating current source ...' with:nil.
+
+                aStream := '' writeStream.
+                Method flushSourceStreamCache.
+                "/ eachClass fileOutOn:aStream withTimeStamp:false.
+                "/ currentSource := aStream contents asString.
+                currentSource := eachClass source asString.
+                aStream close.
+
+                self busyLabel:'comparing  ...' with:nil.
+
+                comparedSource = currentSource ifTrue:[
+                    ((eachClass revision = ((aManagerOrNil ? eachClass sourceCodeManager) newestRevisionOf:eachClass))
+                    and:[eachClass hasUnsavedChanges]) ifTrue:[
+                        (self confirm:'Versions are identical.\\Remove entries from changeSet ?' withCRs) ifTrue:[
+                            ChangeSet current condenseChangesForClass:eachClass.
+                        ].
+                    ] ifFalse:[
+                        self information:'Versions are identical.'.
+                    ]
+                ] ifFalse:[
+                    thisRevString := eachClass revision.
+                    thisRevString isNil ifTrue:[
+                        thisRevString := 'no revision'
+                    ].
+
+                    self busyLabel:'comparing  ...' with:nil.
+
+                    current    := ChangeSet fromStream:(s := currentSource readStream). s close.
+                    repository := ChangeSet fromStream:(s := comparedSource readStream). s close.
+
+                    diffs := repository diffSetsAgainst:current.
+                    allDiffs isNil ifTrue:[
+                        allDiffs := diffs.
+                    ] ifFalse:[
+                        allDiffs changed addAll:(diffs changed).
+                        allDiffs onlyInArg addAll:(diffs onlyInArg).
+                        allDiffs onlyInReceiver addAll:(diffs onlyInReceiver).
+                    ].
+                ].
+            ].
+        ].
     ].
 
     allDiffs isEmpty ifTrue:[
-	(classes contains:[:someClass |
-	    (someClass hasUnsavedChanges)])
-	ifTrue:[
-	    (self confirm:(resources
-			    stringWithCRs:'The classes are up-to-date.\\Remove entries from changeSet ?'))
-	    ifTrue:[
-		classes do:[:eachClass |
-		    ChangeSet current condenseChangesForClass:eachClass.
-		]
-	    ].
-	] ifFalse:[
-	    self information:'The classes are up-to-date.'.
-	    ChangeSet current unrememberChangedClasses.
-	].
-    ] ifFalse:[
-	title := collectionOfClasses size == 1
-		    ifTrue:['Differences of %1' bindWith:collectionOfClasses first name]
-		    ifFalse:['Differences of %1 classes' bindWith:collectionOfClasses size].
-
-	VersionDiffBrowser
-	    openOnDiffSet:allDiffs
-	    labelA:'Repository'
-	    labelB:'Image'
-	    title:title
-	    ignoreExtensions:true.
+        (classes contains:[:someClass |
+            (someClass hasUnsavedChanges)])
+        ifTrue:[
+            (self confirm:(resources
+                            stringWithCRs:'The classes are up-to-date.\\Remove entries from changeSet ?'))
+            ifTrue:[
+                classes do:[:eachClass |
+                    ChangeSet current condenseChangesForClass:eachClass.
+                ]
+            ].
+        ] ifFalse:[
+            self information:'The classes are up-to-date.'.
+            ChangeSet current unrememberChangedClasses.
+        ].
+    ] ifFalse:[
+        title := collectionOfClasses size == 1
+                    ifTrue:['Differences of %1' bindWith:collectionOfClasses first name]
+                    ifFalse:['Differences of %1 classes' bindWith:collectionOfClasses size].
+
+        VersionDiffBrowser
+            openOnDiffSet:allDiffs
+            labelA:'Repository'
+            labelB:'Image'
+            title:title
+            ignoreExtensions:true.
     ].
 
     self normalLabel.
@@ -32506,6 +32507,7 @@
     "Modified: / 12-09-2011 / 11:54:42 / cg"
     "Created: / 11-10-2011 / 10:32:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 21-12-2011 / 20:10:53 / cg"
+    "Modified (format): / 18-07-2012 / 10:16:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 generateDiffSetForClasses:collectionOfClasses newest:newest
@@ -44518,43 +44520,6 @@
 
 !NewSystemBrowser methodsFor:'menu actions-subversion-class'!
 
-classMenuSubversionCompare
-    | classes repo|
-
-    classes := self selectedNonMetaclasses.
-    classes isEmptyOrNil ifTrue:[ ^ self ].
-    classes size == 1 ifTrue:[
-        repo := classes anyOne svnRepository.
-    ] ifFalse:[
-        | repos |
-
-        repos := classes collect:[:cls|cls svnRepository].
-        repo := repos anElement.
-        repos allSatisfy:[:r|
-            r == repo ifFalse:[
-                Dialog warn: 'Classes are not is the same SVN repository'.
-                ^self.
-            ]
-        ].
-    ].
-
-    (SVN::BranchAndRevisionSelectionDialog new)
-        title:'Compare ' , (self infoStringForClasses:classes withPrefix:'');
-        repository:repo;
-        branch:repo branch;
-        path: (classes size == 1 ifTrue:[repo containerNameForClass: classes anyOne] ifFalse:[nil]);
-        onAccept:
-                [:dlg |
-                dlg showProgressWhile:
-                        [self
-                            classMenuSubversionCompare:classes
-                            withBranch:dlg branch
-                            revision:dlg revision]];
-        open
-
-    "Modified: / 10-07-2012 / 16:36:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 classMenuSubversionShowRevisionLog
     | pkg classes branch path |
 
@@ -57323,7 +57288,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__NewSystemBrowser.st 8014 2012-07-10 15:42:40Z vranyj1 $'
+    ^ '$Id: Tools__NewSystemBrowser.st 8016 2012-07-18 09:57:46Z vranyj1 $'
 !
 
 version_CVS
@@ -57331,7 +57296,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__NewSystemBrowser.st 8014 2012-07-10 15:42:40Z vranyj1 $'
+    ^ '$Id: Tools__NewSystemBrowser.st 8016 2012-07-18 09:57:46Z vranyj1 $'
 ! !
 
 NewSystemBrowser initialize!

--- a/abbrev.stc	Wed Jul 18 09:25:57 2012 +0100
+++ b/abbrev.stc	Wed Jul 18 10:57:46 2012 +0100
@@ -24,56 +24,56 @@
 ClassItemRoot ClassItemRoot stx:libtool 'Interface-Browsers-Support' 0
 ClassItemRootForRevision ClassItemRootForRevision stx:libtool 'Interface-Browsers-Support' 0
 ClassNameItem ClassNameItem stx:libtool 'Interface-Browsers-Support' 0
-ClassRevisionTree ClassRevisionTree stx:libtool 'Interface-Browsers-Support' 0
-ClassVariablesInspectorView ClassVariablesInspectorView stx:libtool 'Interface-Inspector' 0
+ClassRevisionTree ClassRevisionTree stx:libtool 'Interface-Browsers-Support' 1
+ClassVariablesInspectorView ClassVariablesInspectorView stx:libtool 'Interface-Inspector' 2
 CodeGenerator CodeGenerator stx:libtool 'Interface-Browsers' 0
 CodeGeneratorTests CodeGeneratorTests stx:libtool 'Interface-Browsers' 0
 CodeGeneratorTool CodeGeneratorTool stx:libtool 'Interface-Browsers' 0
-ColorInspectorView ColorInspectorView stx:libtool 'Interface-Inspector' 0
+ColorInspectorView ColorInspectorView stx:libtool 'Interface-Inspector' 2
 DebugView DebugView stx:libtool 'Interface-Debugger' 2
 Diff Diff stx:libtool 'Collections-Sequenceable-Diff' 0
-Diff3TextView Diff3TextView stx:libtool 'Views-Text' 0
+Diff3TextView Diff3TextView stx:libtool 'Views-Text' 2
 DiffListUtility DiffListUtility stx:libtool 'Views-Text' 0
 DiffTextView DiffTextView stx:libtool 'Views-Text' 2
 EWorldIconLibrary EWorldIconLibrary stx:libtool 'Interface-Smalltalk' 0
 EditFieldWithCompletion EditFieldWithCompletion stx:libtool 'Views-Text' 2
 EditFieldWithCompletionSpec EditFieldWithCompletionSpec stx:libtool 'Interface-Support-UI-Specs' 0
-EventMonitor EventMonitor stx:libtool 'Monitors-ST/X' 0
+EventMonitor EventMonitor stx:libtool 'Monitors-ST/X' 1
 ExpandableRevisionItem ExpandableRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 FileBrowser FileBrowser stx:libtool 'Interface-Tools-File' 2
 FileBrowserV2PanelView FileBrowserV2PanelView stx:libtool 'Interface-Tools-File' 2
-FileBrowserV2SettingsDialog FileBrowserV2SettingsDialog stx:libtool 'Interface-Tools-File' 0
-FileBrowserV2Tests FileBrowserV2Tests stx:libtool 'Interface-Tools-File' 0
+FileBrowserV2SettingsDialog FileBrowserV2SettingsDialog stx:libtool 'Interface-Tools-File' 1
+FileBrowserV2Tests FileBrowserV2Tests stx:libtool 'Interface-Tools-File' 1
 FileBrowserV2UISpecifications FileBrowserV2UISpecifications stx:libtool 'Interface-Tools-File' 0
 FileDialog FileDialog stx:libtool 'Interface-Tools-File' 1
-FileDialogV2 FileDialogV2 stx:libtool 'Interface-Tools-File' 0
+FileDialogV2 FileDialogV2 stx:libtool 'Interface-Tools-File' 1
 FileOperation FileOperation stx:libtool 'Interface-Support' 0
 FilenameEditFieldV2 FilenameEditFieldV2 stx:libtool 'Interface-Tools-File' 2
 HierarchicalClassRevisionList HierarchicalClassRevisionList stx:libtool 'Interface-Browsers-Support' 0
-HierarchicalVersionDiffBrowser HierarchicalVersionDiffBrowser stx:libtool 'Interface-Browsers' 0
+HierarchicalVersionDiffBrowser HierarchicalVersionDiffBrowser stx:libtool 'Interface-Browsers' 1
 InspectorView InspectorView stx:libtool 'Interface-Inspector' 2
-Launcher Launcher stx:libtool 'Interface-Smalltalk' 0
-LibraryBuilder LibraryBuilder stx:libtool 'Interface-Tools' 0
+Launcher Launcher stx:libtool 'Interface-Smalltalk' 9
+LibraryBuilder LibraryBuilder stx:libtool 'Interface-Tools' 8
 MemoryMonitor MemoryMonitor stx:libtool 'Monitors-ST/X' 1
 MemoryMonitorView MemoryMonitorView stx:libtool 'Monitors-ST/X' 2
-MemoryUsageView MemoryUsageView stx:libtool 'Monitors-ST/X' 0
+MemoryUsageView MemoryUsageView stx:libtool 'Monitors-ST/X' 2
 MultiViewToolApplication MultiViewToolApplication stx:libtool 'Interface-Smalltalk' 7
 NewChangesBrowser NewChangesBrowser stx:libtool 'Interface-Browsers' 7
-OldLauncher OldLauncher stx:libtool 'Interface-Smalltalk' 0
-ProcessMonitor ProcessMonitor stx:libtool 'Monitors-ST/X' 0
+OldLauncher OldLauncher stx:libtool 'Interface-Smalltalk' 2
+ProcessMonitor ProcessMonitor stx:libtool 'Monitors-ST/X' 2
 ProcessMonitorV2 ProcessMonitorV2 stx:libtool 'Monitors-ST/X' 1
-ProjectView ProjectView stx:libtool 'Interface-Tools' 0
-RCSConflictEditTextView RCSConflictEditTextView stx:libtool 'Views-Text' 0
-SemaphoreMonitor SemaphoreMonitor stx:libtool 'Monitors-ST/X' 0
+ProjectView ProjectView stx:libtool 'Interface-Tools' 2
+RCSConflictEditTextView RCSConflictEditTextView stx:libtool 'Views-Text' 2
+SemaphoreMonitor SemaphoreMonitor stx:libtool 'Monitors-ST/X' 2
 SettingsDialog SettingsDialog stx:libtool 'Interface-Smalltalk' 1
-SmalltalkInspectorView SmalltalkInspectorView stx:libtool 'Interface-Inspector' 0
+SmalltalkInspectorView SmalltalkInspectorView stx:libtool 'Interface-Inspector' 2
 SourceRevisionItem SourceRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 SyntaxElement SyntaxElement stx:libtool 'Interface-CodeView-Syntax' 0
 SyntaxHighlighter2 SyntaxHighlighter2 stx:libtool 'Interface-CodeView-Syntax' 3
 SystemBrowser SystemBrowser stx:libtool 'Interface-Browsers' 1
-SystemStatusMonitor SystemStatusMonitor stx:libtool 'Monitors-ST/X' 0
-TerminalApplication TerminalApplication stx:libtool 'Interface-Smalltalk' 0
-TextDiffTests TextDiffTests stx:libtool 'Collections-Sequenceable-Diff' 0
+SystemStatusMonitor SystemStatusMonitor stx:libtool 'Monitors-ST/X' 2
+TerminalApplication TerminalApplication stx:libtool 'Interface-Smalltalk' 7
+TextDiffTests TextDiffTests stx:libtool 'Collections-Sequenceable-Diff' 1
 Tools::AbstractTestRunner Tools__AbstractTestRunner stx:libtool 'SUnit-UI' 1
 Tools::BreakpointBrowser Tools__BreakpointBrowser stx:libtool 'Interface-Smalltalk-Breakpoints' 1
 Tools::Browslet Tools__Browslet stx:libtool 'Interface-Browsers-Browslets' 1
@@ -89,12 +89,12 @@
 Tools::CodeCompletionMenu Tools__CodeCompletionMenu stx:libtool 'Interface-CodeView' 2
 Tools::CodeCritics Tools__CodeCritics stx:libtool 'Interface-Browsers-New' 0
 Tools::CodeView2 Tools__CodeView2 stx:libtool 'Interface-CodeView' 2
-Tools::CodeView2DemoApp Tools__CodeView2DemoApp stx:libtool 'Interface-CodeView' 0
+Tools::CodeView2DemoApp Tools__CodeView2DemoApp stx:libtool 'Interface-CodeView' 1
 Tools::CodeViewService Tools__CodeViewService stx:libtool 'Interface-CodeView' 0
 Tools::BackgroundSourceProcessingService Tools__BackgroundSourceProcessingService stx:libtool 'Interface-CodeView' 0
 Tools::CompilerWarningToDoListEntry Tools__CompilerWarningToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
 Tools::DiffCodeView2 Tools__DiffCodeView2 stx:libtool 'Interface-CodeView' 2
-Tools::DiffCodeView2DemoApp Tools__DiffCodeView2DemoApp stx:libtool 'Interface-CodeView' 0
+Tools::DiffCodeView2DemoApp Tools__DiffCodeView2DemoApp stx:libtool 'Interface-CodeView' 1
 Tools::HierarchicalChangesetDialog Tools__HierarchicalChangesetDialog stx:libtool 'Interface-Dialogs' 1
 Tools::InlineMessageDialog Tools__InlineMessageDialog stx:libtool 'Interface-Tools' 1
 Tools::Inspector2 Tools__Inspector2 stx:libtool 'Interface-Inspector2' 1
@@ -104,7 +104,7 @@
 Tools::MethodCategoryCache Tools__MethodCategoryCache stx:libtool 'Interface-Browsers-New' 0
 Tools::MethodRewriter Tools__MethodRewriter stx:libtool 'Interface-MethodRewriter' 1
 Tools::NavigationHistory Tools__NavigationHistory stx:libtool 'Interface-History' 0
-Tools::NavigationHistoryTests Tools__NavigationHistoryTests stx:libtool 'Interface-History' 0
+Tools::NavigationHistoryTests Tools__NavigationHistoryTests stx:libtool 'Interface-History' 1
 Tools::NavigationState Tools__NavigationState stx:libtool 'Interface-Browsers-New' 0
 Tools::NavigatorModel Tools__NavigatorModel stx:libtool 'Interface-Browsers-New' 1
 Tools::NewClassWizardDialog Tools__NewClassWizardDialog stx:libtool 'Interface-Browsers-New' 1
@@ -115,7 +115,7 @@
 Tools::ProjectLoader Tools__ProjectLoader stx:libtool 'Interface-Tools' 1
 Tools::SearchDialog Tools__SearchDialog stx:libtool 'Interface-Browsers-New' 2
 Tools::SmalltalkDiffTool Tools__SmalltalkDiffTool stx:libtool 'Interface-Diff & Merge tool' 1
-Tools::SmalltalkMergeTool Tools__SmalltalkMergeTool stx:libtool 'Interface-Diff & Merge tool' 0
+Tools::SmalltalkMergeTool Tools__SmalltalkMergeTool stx:libtool 'Interface-Diff & Merge tool' 1
 Tools::SpecialCodeView Tools__SpecialCodeView stx:libtool 'Interface-Browsers-New' 1
 Tools::StringSearchTool Tools__StringSearchTool stx:libtool 'Interface-Tools' 1
 Tools::Tag Tools__Tag stx:libtool 'Interface-Tools-File-Tags' 0
@@ -123,9 +123,9 @@
 Tools::TagsBrowser Tools__TagsBrowser stx:libtool 'Interface-Tools-File-Tags' 1
 Tools::TextDiffTool Tools__TextDiffTool stx:libtool 'Interface-Diff' 1
 Tools::ToDoList Tools__ToDoList stx:libtool 'Interface-Smalltalk-ToDo' 0
-Tools::ToDoListBrowser Tools__ToDoListBrowser stx:libtool 'Interface-Smalltalk-ToDo' 0
+Tools::ToDoListBrowser Tools__ToDoListBrowser stx:libtool 'Interface-Smalltalk-ToDo' 1
 Tools::ToDoListEntry Tools__ToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
-Tools::ToDoNotification Tools__ToDoNotification stx:libtool 'Interface-Smalltalk-ToDo' 0
+Tools::ToDoNotification Tools__ToDoNotification stx:libtool 'Interface-Smalltalk-ToDo' 1
 Tools::WebBrowserPage Tools__WebBrowserPage stx:libtool 'Interface-Browsers-Web' 1
 VersionDiffBrowser VersionDiffBrowser stx:libtool 'Interface-Browsers' 1
 VersionRevisionItem VersionRevisionItem stx:libtool 'Interface-Browsers-Support' 0

--- a/bc.mak	Wed Jul 18 09:25:57 2012 +0100
+++ b/bc.mak	Wed Jul 18 10:57:46 2012 +0100
@@ -186,7 +186,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\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(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\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(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) $(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)

--- a/libtool.rc	Wed Jul 18 09:25:57 2012 +0100
+++ b/libtool.rc	Wed Jul 18 10:57:46 2012 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libtool.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,8007,8007
+  FILEVERSION     6,2,8008,8008
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Tools (LIB)\0"
-      VALUE "FileVersion", "6.2.8007.8007\0"
+      VALUE "FileVersion", "6.2.8008.8008\0"
       VALUE "InternalName", "stx:libtool\0"
       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", "Sun, 17 Jun 2012 08:45:47 GMT\0"
+      VALUE "ProductDate", "Wed, 18 Jul 2012 10:00:21 GMT\0"
     END
 
   END