Merge lp:~frankoid/bzr4j/idea10-fixes into lp:bzr4j

[Francis Devereux]

Fixed IDEA 10 compile errors. The lack of implementations of new methods introduced in IDEA 10 was causing occasional AbstractMethodErrors when doing "Annotate".

[lp:~frankoid/bzr4j/idea10-fixes]

52. By Patrick Woodworth on 2011-02-15

Merging changes for 2.6.0 release.

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrVcs.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrVcs.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrVcs.java	2011-01-22 16:12:58 +0000
@@ -42,6 +42,7 @@
 import com.intellij.openapi.vcs.merge.MergeProvider;
 import com.intellij.openapi.vcs.rollback.RollbackEnvironment;
 import com.intellij.openapi.vcs.update.UpdateEnvironment;
+import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -81,7 +82,7 @@
 /**
  * @author Patrick Woodworth
  */
-public class BzrVcs extends AbstractVcs implements Disposable {
+public class BzrVcs extends AbstractVcs<CommittedChangeList> implements Disposable {
 
   static final Logger LOG = Logger.getInstance(BzrVcs.class.getName());
 

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotation.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotation.java	2010-04-16 22:03:14 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotation.java	2011-01-22 16:12:58 +0000
@@ -130,6 +130,14 @@
     public String getTooltipText(int lineNumber) {
       return null;
     }
+
+    public String getId() {
+      return null;
+    }
+
+    public boolean isShowByDefault() {
+      return false;
+    }
   }
 
 }