| java.lang.Object org.netbeans.spi.diff.MergeVisualizer org.netbeans.modules.merge.builtin.visualizer.GraphicalMergeVisualizer
GraphicalMergeVisualizer | public class GraphicalMergeVisualizer extends MergeVisualizer implements Serializable(Code) | | The default graphical visualizer of merge conflicts.
author: Martin Entlicher |
serialVersionUID | final static long serialVersionUID(Code) | | |
GraphicalMergeVisualizer | public GraphicalMergeVisualizer()(Code) | | Creates a new instance of GraphicalMergeVisualizer
|
createView | public Component createView(Difference[] diffs, StreamSource source1, StreamSource source2, StreamSource result) throws IOException(Code) | | Show the visual representation of the merging process of two sources.
The result of the merging process can be saved into a Writer even
before all conflicts are actually resolved.
Parameters: diffs - The list of conflicts. Parameters: source1 - the source of the first file Parameters: source2 - the source of the second file Parameters: result - the information about the result source The Component representing the diff visual representationor null, when the representation is outside the IDE. throws: IOException - when the reading from input streams fails. |
getColorOtherConflict | public java.awt.Color getColorOtherConflict()(Code) | | Getter for property colorOtherConflict.
Value of property colorOtherConflict. |
getColorResolvedConflict | public java.awt.Color getColorResolvedConflict()(Code) | | Getter for property colorResolvedConflict.
Value of property colorResolvedConflict. |
getColorUnresolvedConflict | public java.awt.Color getColorUnresolvedConflict()(Code) | | Getter for property colorUnresolvedConflict.
Value of property colorUnresolvedConflict. |
getDisplayName | public String getDisplayName()(Code) | | Get the display name of this merge visualizer.
|
getShortDescription | public String getShortDescription()(Code) | | Get a short description of this merge visualizer.
|
setColorOtherConflict | public void setColorOtherConflict(java.awt.Color colorOtherConflict)(Code) | | Setter for property colorOtherConflict.
Parameters: colorOtherConflict - New value of property colorOtherConflict. |
setColorResolvedConflict | public void setColorResolvedConflict(java.awt.Color colorResolvedConflict)(Code) | | Setter for property colorResolvedConflict.
Parameters: colorResolvedConflict - New value of property colorResolvedConflict. |
setColorUnresolvedConflict | public void setColorUnresolvedConflict(java.awt.Color colorUnresolvedConflict)(Code) | | Setter for property colorUnresolvedConflict.
Parameters: colorUnresolvedConflict - New value of property colorUnresolvedConflict. |
|
|