|
Class: ChangeSetDiffTool (in Tools)
Object
|
+--Model
|
+--ApplicationModel
|
+--Tools::ChangeSetDiffTool
- Package:
- stx:libtool
- Category:
- Interface-Diff
- Version:
- rev:
1.22
date: 2019/07/31 15:48:57
- user: cg
- file: Tools__ChangeSetDiffTool.st directory: libtool
- module: stx stc-classLibrary: libtool
- Author:
- Jan Vrany <jan.vrany@fit.cvut.cz>
Tool for viewing/merging differences between two change sets
[instance variables:]
[class variables:]
accessing
-
autoMoveToNextConflict
-
-
autoMoveToNextConflict: aBoolean
-
accessing - defaults
-
versionAColor
-
-
versionBColor
-
-
versionBaseColor
-
-
versionNotPresentText
-
image specs
-
mergeDiff3AToMergedArrow30x30
-
-
mergeDiff3BToMergedArrow30x30
-
-
mergeDiff3BaseToAArrow30x30
-
-
mergeDiff3BaseToBArrow30x30
-
-
versionA24x24
-
-
versionB24x24
-
-
versionBase24x24
-
-
versionMerged24x24
-
interface opening
-
open
-
(comment from inherited method)
create an instance of the application and open its view.
Sorry, but for visualworks compatibility, the builder is returned,
not the application instance
interface specs
-
labelDiff2Spec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelDiff2Spec
Tools::ChangeSetDiffTool new openInterface:#labelDiff2Spec
|
-
labelDiff3Spec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelDiff3Spec
Tools::ChangeSetDiffTool new openInterface:#labelDiff3Spec
|
-
labelMergeSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelMergeSpec
Tools::ChangeSetDiffTool new openInterface:#labelMergeSpec
|
-
labelSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:SVN::DiffBrowser andSelector:#labelSpec
SVN::DiffBrowser new openInterface:#labelSpec
|
-
oneColumnNavigatorSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#oneColumnNavigatorSpec
Tools::ChangeSetDiffTool new openInterface:#oneColumnNavigatorSpec
|
-
twoColumnNavigatorSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#twoColumnNavigatorSpec
Tools::ChangeSetDiffTool new openInterface:#twoColumnNavigatorSpec
|
-
windowSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#windowSpec
Tools::ChangeSetDiffTool new openInterface:#windowSpec
Tools::ChangeSetDiffTool open
|
interface specs - labels
-
mergeALabelSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeALabelSpec
Tools::ChangeSetDiffTool new openInterface:#mergeALabelSpec
|
-
mergeBLabelSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
-
mergeBaseLabelSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
-
mergeMergeLabelSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeMergeLabelSpec
Tools::ChangeSetDiffTool new openInterface:#mergeMergeLabelSpec
|
-
versionALabelSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionALabelSpec
Tools::ChangeSetDiffTool new openInterface:#versionALabelSpec
|
-
versionBLabelSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec
Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec
|
-
versionBaseLabelSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
usage example(s):
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec
Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec
|
-
versionMergeLabelSpec
-
This resource specification was automatically generated
by the UIPainter of ST/X.
menu specs
-
listMenu
-
This resource specification was automatically generated
by the MenuEditor of ST/X.
usage example(s):
MenuEditor new openOnClass:SVN::DiffBrowser andSelector:#listMenu
(Menu new fromLiteralArrayEncoding:(SVN::DiffBrowser listMenu)) startUp
|
-
listMenuDiff
-
This resource specification was automatically generated
by the MenuEditor of ST/X.
-
listMenuMerge
-
This resource specification was automatically generated
by the MenuEditor of ST/X.
usage example(s):
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#listMenuMerge
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenuMerge)) startUp
|
-
mainMenu
-
This resource specification was automatically generated
by the MenuEditor of ST/X.
usage example(s):
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#mainMenu
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool mainMenu)) startUp
|
-
toolbarMenu
-
This resource specification was automatically generated
by the MenuEditor of ST/X.
usage example(s):
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#toolbarMenu
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool toolbarMenu)) startUp
|
plugIn spec
-
aspectSelectors
-
This resource specification was automatically generated
by the UIPainter of ST/X.
accessing
-
beSingleColumn
-
-
beTwoColumn
-
-
beTwoColumn: aBoolean
-
-
codeAspect
-
-
diffInfo
-
-
diffset
-
-
diffset: aDiff3Set
-
-
patchset
-
-
selection
-
-
showCopyrightMethodDiffs
-
-
showCopyrightMethodDiffs: aBoolean
-
-
showVersionMethodDiffs
-
-
showVersionMethodDiffs: aBoolean
-
-
title: aString
-
accessing-menus
-
listMenu
-
accessing-selection
-
selection: entry
-
-
theFirstSelectedEntry
-
selection might be an Iterator
-
theLastSelectedEntry
-
selection might be an Iterator
-
theSingleSelectedObject
-
accessing-subApps
-
textDiff2Tool
-
-
textDiff3Tool
-
accessing-subviews
-
labelsView: something
-
-
list1View: aView
-
-
list2View: aView
-
-
navigatorAndDiffPanelView: something
-
aspects
-
autoMoveToNextConflictHolder
-
-
canSaveHolder
-
return/create the 'canSaveHolder' value holder (automatically generated)
-
codeAspectHolder
-
return/create the valueHolder 'codeAspectHolder'
-
diffInfoHolder
-
return/create the 'diffInfoHolder' value holder (automatically generated)
-
diffInfoHolder: something
-
set the 'diffInfoHolder' value holder (automatically generated)
-
diffListEntryLabelGeneratorAspect
-
-
diffsetHolder
-
return/create the 'diffsetHolder' value holder (automatically generated)
-
diffsetHolder: aValueHolder
-
set the 'diffsetHolder' value holder (automatically generated)
-
diffsetHolderPrivate
-
return/create the 'diffSetHolderPrivate' value holder (automatically generated)
-
firstColSelectionHolder
-
return/create the valueHolder 'firstColSelectionHolder'
-
hasDiffsetHolder
-
return/create the 'hasDiffsetHolder' value holder (automatically generated)
-
hasDiffsetHolder: something
-
set the 'hasDiffsetHolder' value holder (automatically generated)
-
hasSelectionHolder
-
-
highlightConflictsHolder
-
return/create the 'highlightConflictsHolder' value holder (automatically generated)
-
highlightConflictsHolder: something
-
set the 'highlightConflictsHolder' value holder (automatically generated)
-
infoPanel
-
-
labelSpecHolder
-
return/create the 'labelSpecHolder' value holder (automatically generated)
-
listHolder
-
return/create the 'listHolder' value holder (automatically generated)
-
listMenuHolder
-
diffMenuHolder := ValueHolder with:self listMenu
-
mergeDataHolder
-
return/create the 'mergeDataHolder' value holder (automatically generated)
-
mergeDataHolder: something
-
set the 'mergeDataHolder' value holder (automatically generated)
-
mergeHolder
-
return/create the 'mergeHolder' value holder (automatically generated)
-
mergeHolder: something
-
set the 'mergeHolder' value holder (automatically generated)
-
mergeSavedHolder
-
return/create the 'mergeSavedHolder' value holder (automatically generated)
-
nameAspect
-
-
navigatorPanelSpecHolder
-
-
secondColSelectionHolder
-
return/create the valueHolder 'firstColSelectionHolder'
-
selectionHolder
-
return/create the 'selectionHolder' value holder (automatically generated)
-
showCopyrightMethodDiffsHolder
-
return/create the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)
-
showCopyrightMethodDiffsHolder: something
-
set the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)
-
showVersionMethodDiffsHolder
-
return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)
-
showVersionMethodDiffsHolder: something
-
set the 'showVersionMethodDiffsHolder' value holder (automatically generated)
-
singleSelectionHolder
-
return/create the 'singleSelectionHolder' value holder (automatically generated)
-
textDiffToolHolder
-
return/create the 'textDiffToolHolder' value holder (automatically generated)
-
textDiffToolHolder: something
-
set the 'textDiffToolHolder' value holder (automatically generated)
-
textDiffToolWindowSpecHolder
-
return/create the 'textDiffToolWindowSpecHolder' value holder (automatically generated)
-
textDiffToolWindowSpecHolder: something
-
set the 'textDiffToolWindowSpecHolder' value holder (automatically generated)
-
titleHolder
-
return/create the 'titleHolder' value holder (automatically generated)
-
versionALabelHolder
-
-
versionATextHolder
-
-
versionBLabelHolder
-
-
versionBTextHolder
-
-
versionBaseLabelHolder
-
-
versionBaseTextHolder
-
change & update
-
diffInfoChanged
-
-
diffsetChanged
-
-
mergeDataChanged
-
Resolution has been changed...
-
mergeDataHolderChanged
-
-
selectionChanged
-
Maybe, there was no merge data beforehand. In that case,
update
-
update: aspect with: param from: sender
-
Resolution has been changed...
-
updateListMenu
-
-
updateViews
-
hooks
-
commonPostOpen
-
(comment from inherited method)
a common hook for postOpenWith:, postOpenAsSubcanvasWith: and postOpenAsDialogWith:.
Notice: redefined methods should do a super send.
otherwise resources might be undefined.
initialization
-
initialize
-
(comment from inherited method)
nothing done here;
but can be redefined in concrete applications
menu actions
-
changesetMenuBrowse: changeset
-
-
changesetMenuBrowseA
-
-
changesetMenuBrowseB
-
-
changesetMenuBrowseBase
-
-
changesetMenuBrowseMerge
-
-
fileMenuOpen
-
-
fileMenuOpenOnDiffBetween: a and: b
-
-
fileMenuOpenOnDiffInfo: info
-
-
fileMenuSave
-
-
fileMenuSaveAs
-
-
fileMenuSaveAs: aFilename
-
-
fileMenuSaveAs: aFilename format: format
-
-
fileMenuSaveAsPatch
-
-
fileMenuSaveMergedAs
-
-
listMenuBrowse
-
must do collect because selection is an iterator..."
-
listMenuInspect
-
-
listMenuLoadVersionA
-
-
listMenuLoadVersionB
-
-
listMenuMergeUsingA
-
-
listMenuMergeUsingB
-
-
listMenuMergeUsingBase
-
-
listMenuOpenInExternal: command
-
-
menuMoveDown
-
-
menuMoveDownConflict
-
-
menuMoveDownToSuchThat: aBlock
-
-
menuMoveTo: entry
-
self window sensor pushUserEvent:#selection: for: self withArgument: entry
-
menuMoveUp
-
-
menuMoveUpConflict
-
-
menuMoveUpToSuchThat: aBlock
-
private
-
labelHeight: height
-
queries
-
canBrowse
-
^[self selection notNil
and:[self selection versionA notNil]]
-
canSave
-
Returns true, if a merged file can be saved
-
canSaveAs
-
Returns true, if a merged file can be saved
-
canSaveAsPatch
-
-
canSaveMergedAs
-
Returns true, if a merged file can be saved
-
hasSelection
-
aspect holding true if a change is selected
-
isOneColumnBrowser
-
startup & release
-
closeRequest
-
Warn about unsaved merge..."
testing
-
isDiff2
-
-
isDiff2Or3
-
-
isDiff3
-
-
isMerge
-
OpenDialog
Starting the application:
Tools::ChangeSetDiffTool open
|
Show differences between CVS HEAD and SVN jv-branch
NewSystemBrowser:
| cvsCs svnCs |
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'.
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'.
Tools::ChangeSetDiffTool new
open;
fileMenuOpenOnDiffBetween: cvsCs and: svnCs.
|
Show differences between CVS HEAD and SVN jv-branch and
base version of NewSystemBrowser:
| cvsBaseCs cvsCs svnCs |
cvsBaseCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@2012-01-01/stx/libtool/Tools__NewSystemBrowser.st'.
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'.
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'.
Tools::ChangeSetDiffTool new
open;
fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs
|
|