switcher.switchTo(switcher.getDefaultSource());
final LineAnnotationAspect revisionAspect = switcher.getRevisionAspect();
final CurrentRevisionAnnotationFieldGutter currentRevisionGutter =
- new CurrentRevisionAnnotationFieldGutter(fileAnnotation, editor, revisionAspect, presentation, bgColorMap);
+ new CurrentRevisionAnnotationFieldGutter(fileAnnotation, revisionAspect, presentation, bgColorMap);
final MergeSourceAvailableMarkerGutter mergeSourceGutter =
- new MergeSourceAvailableMarkerGutter(fileAnnotation, editor, null, presentation, bgColorMap);
+ new MergeSourceAvailableMarkerGutter(fileAnnotation, null, presentation, bgColorMap);
presentation.addAction(new SwitchAnnotationSourceAction(switcher, editorGutter));
presentation.addSourceSwitchListener(currentRevisionGutter);
final LineAnnotationAspect[] aspects = fileAnnotation.getAspects();
for (LineAnnotationAspect aspect : aspects) {
- gutters.add(new AnnotationFieldGutter(fileAnnotation, editor, aspect, presentation, bgColorMap));
+ gutters.add(new AnnotationFieldGutter(fileAnnotation, aspect, presentation, bgColorMap));
}
if (historyIds != null) {
- gutters.add(new HistoryIdColumn(fileAnnotation, editor, presentation, bgColorMap, historyIds));
+ gutters.add(new HistoryIdColumn(fileAnnotation, presentation, bgColorMap, historyIds));
}
- gutters.add(new HighlightedAdditionalColumn(fileAnnotation, editor, null, presentation, bgColorMap));
+ gutters.add(new HighlightedAdditionalColumn(fileAnnotation, null, presentation, bgColorMap));
final AnnotateActionGroup actionGroup = new AnnotateActionGroup(gutters, editorGutter);
presentation.addAction(actionGroup, 1);
- gutters.add(new ExtraFieldGutter(fileAnnotation, editor, presentation, bgColorMap, actionGroup));
+ gutters.add(new ExtraFieldGutter(fileAnnotation, presentation, bgColorMap, actionGroup));
presentation.addAction(new AnnotateCurrentRevisionAction(fileAnnotation, vcs));
presentation.addAction(new AnnotatePreviousRevisionAction(fileAnnotation, vcs));
private final boolean myIsGutterAction;
private Couple<Map<VcsRevisionNumber, Color>> myColorScheme;
+ @Deprecated
AnnotationFieldGutter(FileAnnotation annotation,
Editor editor,
LineAnnotationAspect aspect,
final TextAnnotationPresentation presentation,
Couple<Map<VcsRevisionNumber, Color>> colorScheme) {
+ this(annotation, aspect, presentation, colorScheme);
+ }
+
+ AnnotationFieldGutter(FileAnnotation annotation,
+ LineAnnotationAspect aspect,
+ final TextAnnotationPresentation presentation,
+ Couple<Map<VcsRevisionNumber, Color>> colorScheme) {
myAnnotation = annotation;
myAspect = aspect;
myPresentation = presentation;
private boolean myTurnedOn;
CurrentRevisionAnnotationFieldGutter(FileAnnotation annotation,
- Editor editor,
LineAnnotationAspect aspect,
TextAnnotationPresentation highlighting,
Couple<Map<VcsRevisionNumber, Color>> colorScheme) {
- super(annotation, editor, aspect, highlighting, colorScheme);
+ super(annotation, aspect, highlighting, colorScheme);
}
@Override
private final AnnotateActionGroup myActionGroup;
public ExtraFieldGutter(FileAnnotation fileAnnotation,
- Editor editor,
AnnotationPresentation presentation,
Couple<Map<VcsRevisionNumber, Color>> bgColorMap, AnnotateActionGroup actionGroup) {
- super(fileAnnotation, editor, null, presentation, bgColorMap);
+ super(fileAnnotation, null, presentation, bgColorMap);
myActionGroup = actionGroup;
}
class HighlightedAdditionalColumn extends AnnotationFieldGutter {
HighlightedAdditionalColumn(FileAnnotation annotation,
- Editor editor,
LineAnnotationAspect aspect,
TextAnnotationPresentation presentation,
Couple<Map<VcsRevisionNumber, Color>> colorScheme) {
- super(annotation, editor, aspect, presentation, colorScheme);
+ super(annotation, aspect, presentation, colorScheme);
}
@Override
private final Map<VcsRevisionNumber, Integer> myHistoryIds;
HistoryIdColumn(FileAnnotation annotation,
- final Editor editor,
final TextAnnotationPresentation presentation,
Couple<Map<VcsRevisionNumber, Color>> colorScheme,
Map<VcsRevisionNumber, Integer> ids) {
- super(annotation, editor, null, presentation, colorScheme);
+ super(annotation, null, presentation, colorScheme);
myHistoryIds = ids;
}
private boolean myTurnedOn;
MergeSourceAvailableMarkerGutter(FileAnnotation annotation,
- Editor editor,
LineAnnotationAspect aspect,
TextAnnotationPresentation highlighting,
Couple<Map<VcsRevisionNumber, Color>> colorScheme) {
- super(annotation, editor, aspect, highlighting, colorScheme);
+ super(annotation, aspect, highlighting, colorScheme);
}
@Override