eXept Software AG Logo

Smalltalk/X Webserver

Documentation of class 'Tools::TextDiff3Tool':

Home

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

Class: TextDiff3Tool (in Tools)


Inheritance:

   Object
   |
   +--Model
      |
      +--ApplicationModel
         |
         +--Tools::TextDiffTool
            |
            +--Tools::TextDiff3Tool

Package:
stx:libtool
Category:
Interface-Diff
Version:
rev: 1.5 date: 2019/05/17 15:13:19
user: stefan
file: Tools__TextDiff3Tool.st directory: libtool
module: stx stc-classLibrary: libtool
Author:
Jan Vrany <jan.vrany@fit.cvut.cz>

Description:


documentation to be added.


[instance variables:]

[class variables:]


Related information:



Class protocol:

defaults - colors
o  colorA

o  colorB

o  colorBase

o  colorConflict

o  colorMerged

interface specs
o  diff3Spec
This resource specification was automatically generated
by the UIPainter of ST/X.

usage example(s):

     UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#diff3Spec
     Tools::TextDiff3Tool new openInterface:#diff3Spec

o  mergeSpec
This resource specification was automatically generated
by the UIPainter of ST/X.

usage example(s):

     UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#mergeSpec
     Tools::TextDiff3Tool new openInterface:#mergeSpec

interface specs - labels
o  versionMergedLabelSpec
This resource specification was automatically generated
by the UIPainter of ST/X.

usage example(s):

     UIPainter new openOnClass:Tools::TextDiff3Tool andSelector:#versionMergedLabelSpec
     Tools::TextDiff3Tool new openInterface:#versionMergedLabelSpec

menu specs
o  toolbarMenuMerge
This resource specification was automatically generated
by the MenuEditor of ST/X.

usage example(s):

     MenuEditor new openOnClass:Tools::TextDiff3Tool andSelector:#toolbarMenuMerge
     (Menu new fromLiteralArrayEncoding:(Tools::TextDiff3Tool toolbarMenuMerge)) startUp

plugIn spec
o  aspectSelectors
This resource specification was automatically generated
by the UIPainter of ST/X.


Instance protocol:

accessing
o  beDiff3Tool

o  beMergeTool

o  mergeData

aspects
o  contentSpecHolder
return/create the 'contentSpecHolder' value holder (automatically generated)

o  diffView
(comment from inherited method)
diffView isNil ifTrue:[

o  mergeDataHolder
return/create the 'mergeDataHolder' value holder (automatically generated)

o  mergeDataHolder: something
set the 'mergeDataHolder' value holder (automatically generated)

o  mergeHolder
return/create the 'mergeHolder' value holder (automatically generated)

o  mergeHolder: something
set the 'mergeHolder' value holder (automatically generated)

o  mergeIntervalHolder
return/create the 'mergeIntervalHolder' value holder (automatically generated)

o  mergeIntervalHolder: something
set the 'mergeIntervalHolder' value holder (automatically generated)

aspects - queries
o  canMergeCurrentHolder

aspects-versions
o  labelMergedHolder
return/create the 'labelMergedHolder' value holder (automatically generated)

o  labelMergedHolder: something
set the 'labelMergedHolder' value holder (automatically generated)

o  textMergedHolder
return/create the 'textMergedHolder' value holder (automatically generated)

o  textMergedHolder: something
set the 'textMergedHolder' value holder (automatically generated)

change & update
o  update: something with: aParameter from: changedObject
Invoked when an object that I depend upon sends a change notification.

o  updateAfterAorBorCChanged
(comment from inherited method)
Called whenever one of the texts changes

o  updateCodeViewSynchronization
diffView synchronizeWith: mergeView.

o  updateMergeData

o  updateViews

hooks
o  commonPostBuild
(comment from inherited method)
a common hook for postBuildWith: and postBuildAsSubcanvasWith:.

o  postBuildDiffView: aScrollableView

o  postBuildMergeView: aCodeView2

initialization
o  initializeDiffView
superclass Tools::TextDiffTool says that I am responsible to implement this method

menu actions
o  doMergeAllAuto

o  doMergeAllExternal

o  doMergeAllUsingA

o  doMergeAllUsingB

o  doMergeAllUsingBase

o  doMergeCurrentUsingA

o  doMergeCurrentUsingB

o  doMergeCurrentUsingBase

testing
o  isDiff3

o  isMerge


Private classes:

    MergeService

Examples:


Starting the application:
  Tools::TextDiff3Tool open

more examples to be added:
  ... add code fragment for 
  ... executable example here ...


ST/X 7.2.0.0; WebServer 1.670 at bd0aa1f87cdd.unknown:8081; Thu, 25 Apr 2024 17:01:08 GMT