eXept Software AG Logo

Smalltalk/X Webserver

Documentation of class 'Diff3TextView':

Home

Documentation
www.exept.de
Everywhere
for:
[back]

Class: Diff3TextView


Inheritance:

   Object
   |
   +--GraphicsMedium
      |
      +--DisplaySurface
         |
         +--SimpleView
            |
            +--SyncedMultiColumnTextView
               |
               +--ThreeColumnTextView
                  |
                  +--Diff3TextView

Package:
stx:libtool
Category:
Views-Text
Version:
rev: 1.12 date: 2016/07/20 09:35:36
user: stefan
file: Diff3TextView.st directory: libtool
module: stx stc-classLibrary: libtool
Author:
Claus Gittinger

Description:


a view showing merged diff3 (see rcsmerge / merge unix manual pages) output in a
user-friendly form.
The view is created and opened with:

   d := Diff3TextView openOn:text label:l1 label:l2 label:l3.

and it will show the 3 versions side-by-side
Its main use is for the SourceCodeManager, to show merged sources after
a failed checkin.

Notice:
    This has diff3 output (or cvs diff output) hardwired into it.
    Needs to be adapted, if that format ever changes.


Related information:

    TextView
    EditTextView
    DiffTextView

Class protocol:

instance creation
o  openOnMergedText: text label: firstLabel label: secondLabel label: thirdLabel
open up a view showing firstText, secondText and thirdText side-by-side,
and labels for all views.

public helpers
o  emphasizeMergedDiff3Text: mergedText emphasize1: e1 emphasize2: e2 emphasizeSep: e3
given the merge()/rcsmerge() merged output (as created by 'cvs update'),
create & return a text object which contains the conflicts
highlighted.
CAVEAT: this is a highly specialized method - probably not the right place
for it here ...

o  emphasizeMergedDiff3TextFromPerforce: mergedText origEmphasis: origEmphasize otherEmphasis: otherEmphasize yourEmphasis: yourEmphasize separatorEmphasis: separatorEmphasize
given the merge()/rcsmerge() merged output (as created by 'cvs update'),
create & return a text object which contains the conflicts
highlighted.
CAVEAT: this is a highly specialized method - probably not the right place
for it here ...


Instance protocol:

initialization
o  initStyle
(comment from inherited method)
this method sets up all style dependent things

private
o  updateListsFromMergedText: mergedText
given the merge()/rcsmerge() merged output (as created by 'cvs update'),
update my views contents



ST/X 7.1.0.0; WebServer 1.663 at exept.de:8081; Sun, 18 Nov 2018 08:39:46 GMT