← Back to branch summary

~frankoid/bzr4j/idea11-fixes

« back to all changes in this revision

Viewing changes to modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCheckinEnvironment.java

  • Committer: Patrick Woodworth
  • Date: 2010-09-29 23:00:58 UTC
  • Revision ID: patrick@woodworth.org-20100929230058-ac8lahfzpur4q1l5
Fixes for IDEA X compilation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCheckinEnvironment.java
23
23
import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
24
24
import com.intellij.openapi.vfs.VfsUtil;
25
25
import com.intellij.openapi.vfs.VirtualFile;
 
26
import com.intellij.util.NullableFunction;
 
27
import com.intellij.util.PairConsumer;
26
28
import com.intellij.vcsUtil.VcsUtil;
27
29
import org.emergent.bzr4j.intellij.BzrFile;
28
30
import org.emergent.bzr4j.intellij.BzrVcsMessages;
29
31
import org.emergent.bzr4j.intellij.command.BzrAddCommand;
30
32
import org.emergent.bzr4j.intellij.command.BzrCommandException;
31
33
import org.emergent.bzr4j.intellij.command.BzrCommitCommand;
 
34
import org.jetbrains.annotations.NotNull;
32
35
 
33
36
import java.util.HashMap;
34
37
import java.util.LinkedList;
44
47
  }
45
48
 
46
49
  public RefreshableOnComponent createAdditionalOptionsPanel(CheckinProjectPanel panel) {
 
50
    return createAdditionalOptionsPanel(panel, null);
 
51
  }
 
52
 
 
53
  public RefreshableOnComponent createAdditionalOptionsPanel(
 
54
      CheckinProjectPanel checkinProjectPanel,
 
55
      PairConsumer<Object, Object> objectObjectPairConsumer) {
47
56
    return null;
48
57
  }
49
58
 
60
69
    return BzrVcsMessages.message("bzr4intellij.commit", params);
61
70
  }
62
71
 
 
72
  public List<VcsException> commit(List<Change> changes, String preparedComment) {
 
73
    //noinspection unchecked
 
74
    return commit(changes, preparedComment, NullableFunction.NULL);
 
75
  }
 
76
 
63
77
  @SuppressWarnings({ "ThrowableInstanceNeverThrown" })
64
 
  public List<VcsException> commit(List<Change> changes, String preparedComment) {
 
78
  public List<VcsException> commit(List<Change> changes, String preparedComment, @NotNull NullableFunction<Object, Object> parametersHolder) {
65
79
    List<VcsException> exceptions = new LinkedList<VcsException>();
66
80
    for (Map.Entry<VirtualFile, List<BzrFile>> entry : getFilesByRepository(changes).entrySet()) {
67
81
      BzrCommitCommand command = new BzrCommitCommand(project, entry.getKey(), preparedComment);