Merge branch 'svn_18_3'

[idea/community.git] / plugins / svn4idea / src / org / jetbrains / idea / svn / history / SvnHistoryProvider.java

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
index 90fc3bf8c2daee97a7d882b902a2b9a83649b7c5..92b619a7465f247c21375658a4f2ab9e58076d64 100644 (file)
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
@@ -65,6 +65,7 @@ public class SvnHistoryProvider
     myVcs = vcs;
   }
 
+  @Override
   public boolean supportsHistoryForDirectories() {
     return true;
   }
@@ -79,6 +80,7 @@ public class SvnHistoryProvider
     return true;
   }
 
+  @Override
   public VcsDependentHistoryComponents getUICustomization(final VcsHistorySession session, JComponent forShortcutRegistration) {
     final ColumnInfo[] columns;
     final Consumer<VcsFileRevision> listener;
@@ -94,6 +96,7 @@ public class SvnHistoryProvider
       field.setBackground(UIUtil.getComboBoxDisabledBackground());
       field.setWrapStyleWord(true);
       listener = new Consumer<VcsFileRevision>() {
+        @Override
         public void consume(VcsFileRevision vcsFileRevision) {
           field.setText(mergeSourceColumn.getText(vcsFileRevision));
         }
@@ -155,6 +158,7 @@ public class SvnHistoryProvider
     return new SvnHistorySession(myVcs, revisions, filePath, aBoolean, currentRevision, false, ! filePath.isNonLocal());
   }
 
+  @Override
   @Nullable
   public VcsHistorySession createSessionFor(final FilePath filePath) throws VcsException {
     final VcsAppendableHistoryPartnerAdapter adapter = new VcsAppendableHistoryPartnerAdapter();
@@ -164,6 +168,7 @@ public class SvnHistoryProvider
     return adapter.getSession();
   }
 
+  @Override
   public void reportAppendableHistory(FilePath path, final VcsAppendableHistorySessionPartner partner) throws VcsException {
     // we need + 1 rows to be reported to further detect that number of rows exceeded the limit
     reportAppendableHistory(path, partner, null, null, VcsConfiguration.getInstance(myVcs.getProject()).MAXIMUM_HISTORY_ROWS + 1, null, false);
@@ -220,6 +225,7 @@ public class SvnHistoryProvider
       indicator.setText(SvnBundle.message("progress.text2.collecting.history", path.getName()));
     }
     final Consumer<VcsFileRevision> consumer = new Consumer<VcsFileRevision>() {
+      @Override
       public void consume(VcsFileRevision vcsFileRevision) {
         if (!Boolean.TRUE.equals(sessionReported.get())) {
           partner.reportCreatedEmptySession(historySession);
@@ -449,14 +455,17 @@ public class SvnHistoryProvider
     }
   }
 
+  @Override
   public String getHelpId() {
     return null;
   }
 
+  @Override
   public AnAction[] getAdditionalActions(final Runnable refresher) {
     return new AnAction[]{ ShowAllAffectedGenericAction.getInstance(), new MergeSourceDetailsAction(), new SvnEditCommitMessageFromFileHistoryAction()};
   }
 
+  @Override
   public boolean isDateOmittable() {
     return false;
   }
@@ -495,6 +504,7 @@ public class SvnHistoryProvider
       myUrl = url;
       myRepositoryRoot = repoRootURL;
       myTracker = new SvnMergeSourceTracker(new ThrowableConsumer<Pair<SVNLogEntry, Integer>, SVNException>() {
+        @Override
         public void consume(final Pair<SVNLogEntry, Integer> svnLogEntryIntegerPair) throws SVNException {
           final SVNLogEntry logEntry = svnLogEntryIntegerPair.getFirst();
 
@@ -576,11 +586,12 @@ public class SvnHistoryProvider
       return false;
     }
 
+    @Override
     public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
       myTracker.consume(logEntry);
     }
 
-    private void addToListByLevel(final SvnFileRevision revision, final SvnFileRevision revisionToAdd, final int level) {
+    private static void addToListByLevel(final SvnFileRevision revision, final SvnFileRevision revisionToAdd, final int level) {
       if (level < 0) {
         return;
       }
@@ -678,6 +689,7 @@ public class SvnHistoryProvider
       return myRenderer;
     }
 
+    @Override
     public RevisionMergeSourceInfo valueOf(final VcsFileRevision vcsFileRevision) {
       return vcsFileRevision != null ? new RevisionMergeSourceInfo(vcsFileRevision) : null;
     }
@@ -709,7 +721,7 @@ public class SvnHistoryProvider
     }
 
     @Override
-    public boolean onClick(MouseEvent e, int clickCount) {
+    public boolean onClick(@NotNull MouseEvent e, int clickCount) {
       if (e.getButton() == 1 && !e.isPopupTrigger()) {
         Object tag = getTagAt(e);
         if (tag == myTag) {
@@ -736,6 +748,7 @@ public class SvnHistoryProvider
       return null;
     }
 
+    @Override
     public void mouseMoved(MouseEvent e) {
       JTable table = (JTable)e.getSource();
       Object tag = getTagAt(e);
@@ -760,6 +773,7 @@ public class SvnHistoryProvider
       return RevisionMergeSourceInfo.toString(value);
     }
 
+    @Override
     protected void customizeCellRenderer(final JTable table,
                                          final Object value,
                                          final boolean selected,
@@ -808,6 +822,7 @@ public class SvnHistoryProvider
   private static class CopyFromColumnInfo extends ColumnInfo<VcsFileRevision, String> {
     private final Icon myIcon = PlatformIcons.COPY_ICON;
     private final ColoredTableCellRenderer myRenderer = new ColoredTableCellRenderer() {
+      @Override
       protected void customizeCellRenderer(final JTable table,
                                            final Object value,
                                            final boolean selected,
@@ -828,6 +843,7 @@ public class SvnHistoryProvider
       super(SvnBundle.message("copy.column.title"));
     }
 
+    @Override
     public String valueOf(final VcsFileRevision o) {
       return o instanceof SvnFileRevision ? ((SvnFileRevision)o).getCopyFromPath() : "";
     }