Polymorph-Tools-Diff

DiffJoinMorph
A DiffJoinMorph is xxxxxxxxx.
Instance Variables
dstOffset: <Object>
mappings: <Object>
srcOffset: <Object>
dstOffset
- xxxxx
mappings
- xxxxx
srcOffset
- xxxxx
compositeText
Answer the composite text based on the selection state
of the joins.
defaultColor
Answer the default color for the receiver.
drawOn:
Draw the indicators for the mappings.
dstOffset
Answer the value of dstOffset
dstOffset:
Set the dstOffset.
extent:
Update the shapes of the joins.
initialize
Initialize the receiver.
layoutBounds:
Set the bounds for laying out children of the receiver.
mappings
Answer the value of mappings
mappings:
Set the value of mappings
mouseDown:
Check for a click.
srcOffset
Answer the value of srcOffset
srcOffset:
Set the srcOffset.
updateMappings
Update the shapes of the joins.
DiffMapMorph
A DiffMapMorph is xxxxxxxxx.
Instance Variables
mappings: <Object>
mappings
- xxxxx
adoptPaneColor:
Change our border color too.
defaultColor
Answer the default color for the receiver.
drawOn:
Draw the indicators for the mappings.
extent:
Update the gradient.
gradientRampForColor:
Answer the background gradient ramp to use.
initialize
Initialize the receiver.
mappings
Answer the value of mappings
mappings:
Set the value of mappings
mappingsHeight
Answer the maximum y of all the mappings.
DiffMorph
A DiffMorph is xxxxxxxxx.
Instance Variables
contextClass: <Object>
difference: <Object>
dstMorph: <Object>
dstText: <Object>
joinMappings: <Object>
joinMorph: <Object>
mapMorph: <Object>
prettyPrint: <Object>
scrollbarMorph: <Object>
srcMorph: <Object>
srcText: <Object>
contextClass
- xxxxx
difference
- xxxxx
dstMorph
- xxxxx
dstText
- xxxxx
joinMappings
- xxxxx
joinMorph
- xxxxx
mapMorph
- xxxxx
prettyPrint
- xxxxx
scrollbarMorph
- xxxxx
srcMorph
- xxxxx
srcText
- xxxxx
additionColor
Answer the color used to show additions.
adoptPaneColor:
Change our border color too.
applyHighlights
Apply the relevant highlights to src and dst.
applyJoin
Apply the join mappings to the join morph.
applyMap
Apply the join mappings to the map morph.
calculateDifference
Calculate the difference of the src and dst.
calculateJoinMappings
Calculate the join parameters between src and dst
and store in joinMappings.
calculatedJoinMappings
Calculate the join parameters between src and dst
and answer.
sl = src line, dl = dst line, j = joins, ds = dst run start, ss = src run start
de = dst run end, se = dst run end, mds = match dst start, mss = match src start
calibrateScrollbar
Set the scrollbar parameters to match the texts.
colorForType:
Anwser the color to use for the given change type.
contextClass
Answer the value of contextClass
contextClass:
Set the value of contextClass
defaultColor
Answer the default color for the receiver.
defaultTitle
Answer the default title label for the receiver.
difference
Answer the value of difference
difference:
Set the value of difference
dstMorph
Answer the value of dstMorph
dstMorph:
Set the value of dstMorph
dstScroll:
Called from dst when scrolled by keyboard etc.
dstText
Answer the value of dstText
dstText:
Set the value of dstText
edgeColor
Answer the color used to show the border of the changes.
extent:
Update the scrollbar.
font:
Set the font on the src and dst morphs.
from:to:
Set the old (src) and new (dst) text.
from:to:contextClass:
Set the old (src) and new (dst) text.
hideOrShowScrollBar
Do nothing
initialize
Initialize the receiver.
join:selected:
Set the selection for the given join and update the
src dst and join morphs.
joinColor
Answer the color used for the join bar.
joinMappings
Answer the join parameters between src and dst.
joinMappings:
Set the join parameters between src and dst.
joinMorph
Answer the value of joinMorph
joinMorph:
Set the value of joinMorph
joinSectionClass
Answer the class to use for a new join section.
mapMorph
Answer the value of mapMorph
mapMorph:
Set the value of mapMorph
matchColor
Answer the color used to show matches.
modificationColor
Answer the color used to show changes.
newDstMorph
Answer a new dst text morph.
newHighlight
Anewser a new highlight.
newHighlight:
Anewser a new highlight.
newJoinMorph
Answer a new join morph.
newJoinSection
Answer a new join section.
newJoinSectionFrom:to:
Answer a new join section.
newMapMorph
Answer a new map morph.
newMatchJoinSectionFrom:to:
Answer a new match join section.
newPrettyPrintCheckboxMorph
Answer a new checkbox for specifying whether to use
pretty printing for the diff texts.
newScrollbarMorph
Answer a new scrollbar morph.
newSrcMorph
Answer a new src text morph.
newText
Answer the new (dst) text.
oldText
Answer the old (src) text.
prettyPrint
Answer the value of prettyPrint
prettyPrint:
Set the value of prettyPrint
removalColor
Answer the color used to show removals.
scrollbarMorph
Answer the value of scrollbarMorph
scrollbarMorph:
Set the value of scrollbarMorph
setText
Set the src and dst text in the morphs applying
prettyPrint if required.
srcMorph
Answer the value of srcMorph
srcMorph:
Set the value of srcMorph
srcScroll:
Called from src when scrolled by keyboard etc..
srcText
Answer the value of srcText
srcText:
Set the value of srcText
textSelectionColor
Answer the color used for thew text selection.
themeChanged
Update the scrollbar width/frame.
updateJoinOffsets
Update the src and dst offsets in the join morph
to match the src and dst tex scroll offsets.
updateText
Reset the text if we have some.
vScroll:
Called from standalone scroolbar.
Scroll the srcMorph and redo the join.
InlineTextDiffBuilder
An InlineTextDiffBuilder is xxxxxxxxx.
Instance Variables
split:
Answer the split 'lines' by splitting on whitespace.
JoinSection
A JoinSection is xxxxxxxxx.
Instance Variables
borderColor: <Object>
borderWidth: <Object>
dst: <Object>
shape: <Object>
src: <Object>
type: <Object>
width: <Object>
borderColor
- xxxxx
borderWidth
- xxxxx
dst
- xxxxx
shape
- xxxxx
src
- xxxxx
type
- xxxxx
width
- xxxxx
addHighlightsFrom:to:to:color:
Add the highlights required for the given character blocks
of a paragraph. May be up to three highlights depending
on the line spans.
borderColor
Answer the value of borderColor
borderColor:
Set the value of borderColor
borderColorToUse
Answer the border color to use.
borderWidth
Answer the value of borderWidth
borderWidth:
Set the value of borderWidth
clicked
The receiver or a highlight was clicked.
containsPoint:
Answer whether the receiver contains the given point.
createHighlights
Create and store the src and dst highlights.
createHighlightsFrom:to:
Create and store the src and dst highlights.
Use the given paragraphs to determine inline
diffs.
drawMapOn:in:scale:
Draw the join on the given canvas scaled into the given rectangle.
drawOn:
Draw the join on the given canvas.
dst
Answer the value of dst
dst:
Set the value of dst
dstColor:
Set the dst color
dstLineRange:
Set the dst lineRange.
dstOffset:
Set the dst offset.
dstRange:
Set the dst range.
fillStyleFor:
Answer the fillStyle to use for the given rectangle.
initialize
Initialize the receiver.
newHighlight
Anwser a new highlight.
shape
Answer the value of shape
shape:
Set the value of shape
src
Answer the value of src
src:
Set the value of src
srcColor:
Set the src color.
srcLineRange:
Set the src lneRange.
srcOffset:
Set the src offset
srcRange:
Set the src range
type
Answer the value of type
type:
Set the value of type
updateHighlights
Update the highlight border colors.
updateShape
Update the receiver's shape.
wantsClick
Don't if we are transparent for now.
width
Answer the value of width
width:
Set the value of width
JoinSide
A JoinSide is xxxxxxxxx.
Instance Variables
color: <Object>
highlights: <Object>
lineRange: <Object>
offset: <Object>
range: <Object>
text: <Object>
color
- xxxxx
highlights
- xxxxx
lineRange
- xxxxx
offset
- xxxxx
range
- xxxxx
text
- xxxxx
color
Answer the value of color
color:
Set the value of color
highlight
Answer the primary highlight.
highlights
Answer the value of highlights
highlights:
Set the value of highlights
initialize
Initialize the receiver.
lineRange
Answer the value of lineRange
lineRange:
Set the value of lineRange
offset
Answer the value of offset
offset:
Set the value of offset
range
Answer the value of range
range:
Set the value of range
text
Answer the value of text
text:
Set the value of text
MergeDiffMorph
A MergeDiffMorph is xxxxxxxxx.
Instance Variables
allowJoinClicks: <Object>
allowJoinClicks
- xxxxx
allowJoinClicks
Answer the value of allowJoinClicks
allowJoinClicks:
Set the value of allowJoinClicks
calculatedJoinMappings
Specify click allowance for each section.
compositeText
Answer the composite text based on the selection state
of the joins.
indicateDst
Change the indicators of the joins to the dst side.
indicateSrc
Change the indicators of the joins to the src side.
initialize
Initialize the receiver.
joinSectionClass
Answer the class to use for a new join section.
newJoinMorph
Answer a new join morph.
update:
A join has probably changed its selection state.
MergeJoinSection
A MergeJoinSection is xxxxxxxxx.
Instance Variables
allowClick: <Object>
selected: <Object>
selectedBorderColor: <Object>
selectionState: <Object>
stateIcons: <Object>
allowClick
- xxxxx
selected
- xxxxx
selectedBorderColor
- xxxxx
selectionState
- xxxxx
stateIcons
- xxxxx
allowClick
Answer the value of allowClick
allowClick:
Set the value of allowClick
appendToCompositeText:
If appropriate append the relevant src or dst text to the given text.
borderColorToUse
Answer the border color to use based on the selection state.
clicked
The receiver or a highlight was clicked.
containsPoint:
Answer whether the receiver contains the given point.
defaultStateIcons
Answer the default state icons.
drawOn:
Draw the join on the given canvas.
initialize
Initialize the receiver.
selectNextState
Set the selection state to the next one with wraparound.
selected
Answer the value of selected
selected:
Set the value of selected
selectedBorderColor
Answer the value of selectedBorderColor
selectedBorderColor:
Set the value of selectedBorderColor
selectionState
Answer the value of selectionState
selectionState:
Set the value of selectionState
selectionStates
Answer the valid selection states in order.
stateIcon
Answer the state icon to use.
stateIconBounds
Answer the bounds of the state icon.
stateIcons
Answer the value of stateIcons
stateIcons:
Set the value of stateIcons
wantsClick
Allow if explictly enabled and super.
PSMCChangeWrapper
A PSMCChangeWrapper is xxxxxxxxx.
Instance Variables
actualClass
Answer the class represented in the receiver.
icon
Answer a form with an icon to represent the receiver
isConflict
Answer whether the receiver is a conflict item.
model:
Set the model.
operation
Answer the underlying operation.
PSMCClassChangeWrapper
A PSMCClassChangeWrapper is xxxxxxxxx.
Instance Variables
conflict: <Object>
contents: <Object>
conflict
- xxxxx
contents
- xxxxx
actualClass
Answer the class represented in the receiver.
chooseLocal
Choose the local version.
chooseRemote
Choose the remote version.
clearChoice
Choose neither version (be in conflict).
conflict
Answer the conflict for the class itself or nil if none.
contents
Answer the contents of the change.
gatherContents
Answer the contents of the change from the model.
icon
Answer a form with an icon to represent the receiver
isConflict
Answer whether the receiver is a conflict item.
localChosen
Answer whether the local version is chosen.
operation
Answer the patch operation for the class itself or nil if none.
preferredColor
Answer the colour for the string.
If a conflict and unresolved answer red.
remoteChosen
Answer whether the remote version is chosen.
PSMCConflictWrapper
A PSMCConflictWrapper is xxxxxxxxx.
Instance Variables
asString
Answer the method name.
chooseLocal
Choose the local version.
chooseRemote
Choose the remote version.
clearChoice
Choose neither version (be in conflict).
icon
Answer a form with an icon to represent the receiver
isConflict
Answer whether the receiver is a conflict item.
localChosen
Answer whether the local version is chosen.
operation
Answer the patch operation for the conflict.
preferredColor
remoteChosen
Answer whether the remote version is chosen.
PSMCMergeMorph
A PSMCMergeMorph is xxxxxxxxx.
Instance Variables
codeMorph: <Object>
merged: <Object>
patchMorph: <Object>
codeMorph
- xxxxx
merged
- xxxxx
patchMorph
- xxxxx
allConflictsResolved
Answer whether all conflicts were resolved.
cancel
Delete the window to cancel.
codeMorph
Answer the value of codeMorph
codeMorph:
Set the value of codeMorph
compositeText
Answer the composite text from the patch morph.
compositeText:
Save the new method text for the selected method.
Yet to be implemented.
conflictCount
Answer the number of conflicts that are unresolved.
conflictCountString
Answer a string describing the number of conflicts.
defaultTitle
Answer the default title label for the receiver.
forMerger:
initialize
Initialize the receiver.
merge
Do the merge and close if no conflicts.
merged
Answer the value of merged. Indicates whether
the merge button was pressed with no conflicts remaining.
merged:
Set the value of merged
model:
Set the model and update the window.
newButtonsMorph
Answer a new buttons morph.
newCodeMorph
Answer a new code morph.
newConflictsButton
Answer a new button for displaying the count
of outstanding conflicts and navigating to each.
It will be disabled if all conflicts are resolved.
newMergeButton
Answer a new button for performing the merge.
It will be disabled if any conflicts are unresolved.
newPatchMorph
Answer a new patch morph.
notAllConflictsResolved
Answer whether any conflicts are unresolved.
patchMorph
Answer the value of patchMorph
patchMorph:
Set the value of patchMorph
selectNextConflict
Select the next conflict in the tree.
update:
A join has probably changed its selection state.
updateCode
Update the code morph to match selected differences.
PSMCMergePatchMorph
A PSMCMergePatchMorph is xxxxxxxxx.
Instance Variables
changesMenu:
Answer the changes menu.
diffMorphClass
Answer a the class to use for a new diff morph.
keepCurrentVersion
Mark the conflict as local.
markAsConflict
Mark the conflict as unresolved.
nextConflict
Answer the first conflict or, if the current selection is a conflict,
the subsequent conflict.
notAllConflictsResolved
Answer whether any conflicts are unresolved.
selectNextConflict
Select the next conflict after the current selection, if any.
selectionIsConflict
Answer whether the currently selected change is a conflict.
updateSource
Update the source difference morph.
useIncomingVersion
Mark the conflict as remote.
PSMCOrganizationChangeWrapper
A PSMCOrganizationChangeWrapper is xxxxxxxxx.
Instance Variables
PSMCPatchMorph
A PSMCPatchMorph is xxxxxxxxx.
Instance Variables
changeTree: <Object>
diffMorph: <Object>
selectedChangeWrapper: <Object>
changeTree
- xxxxx
diffMorph
- xxxxx
selectedChangeWrapper
- xxxxx
browseClass
Browse the class of the selected item.
browseImplementors
Browse the method implementors.
browseSenders
Browse the method senders.
browseVersions
Browse the method versions.
changeTree
Answer the value of changeTree
changeTree:
Set the value of changeTree
changes
Answer the changes tree roots.
changesMenu:
Answer the changes menu.
compositeText
Answer the composite text based on the selection state
of the joins.
defaultTitle
Answer the default title label for the receiver.
diffMorph
Answer the value of diffMorph
diffMorph:
Set the value of diffMorph
diffMorphClass
Answer a the class to use for a new diff morph.
forPatch:
initialize
Initialize the receiver.
loadMethodSelection
Install the selected change
model:
Set the model and update the window.
newChangeTreeMorph
Answer a new morph for the tree of changes.
newDiffMorph
Answer a new morph for the source difference.
perform:orSendTo:
Selector was just chosen from a menu by a user. If can respond, then
perform it on myself. If not, send it to otherTarget, presumably the
editPane from which the menu was invoked.
selectedChange
Answer the selected change.
selectedChangeWrapper
Answer the selected change.
selectedChangeWrapper:
Set the selected change.
selectedMessageName
Answer the method selector or nil if no method change
is selected..
selectionHasAcutalClass
Answer whether the currently selected change has an actual
class in the image.
selectionIsMethodChange
Answer whether the currently selected change is for a method.
taskbarIcon
Answer the icon for the receiver in a task bar
or nil for the default.
update:
A join has probably changed its selection state.
updateSource
Update the source difference morph.
PSMCPatchOperationWrapper
A PSMCPatchOperationWrapper is xxxxxxxxx.
Instance Variables
asString
Answer the method name.
operation
Answer the pacth operation for the receiver or nil if none.