Don't use packages that weren't exposed by GWT plugin API reviewdb.client was never exposed as plugin API an thus cannot be use. It worked only because of bug in gerrit_plugin() rule. Change-Id: I80acb5899ce1891db08446444e813ac4ffc71f12
diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/FileInfo.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/FileInfo.java index 8fff48b..88941a4 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/FileInfo.java +++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/FileInfo.java
@@ -15,7 +15,6 @@ package com.googlesource.gerrit.plugins.xdocs.client; import com.google.gerrit.client.rpc.Natives; -import com.google.gerrit.reviewdb.client.Patch; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArray; @@ -23,6 +22,7 @@ import java.util.Comparator; public class FileInfo extends JavaScriptObject { + public static final String COMMIT_MSG = "/COMMIT_MSG"; public final native String path() /*-{ return this.path; }-*/; public final native boolean binary() /*-{ return this.binary || false; }-*/; @@ -30,9 +30,9 @@ Collections.sort(Natives.asList(list), new Comparator<FileInfo>() { @Override public int compare(FileInfo a, FileInfo b) { - if (Patch.COMMIT_MSG.equals(a.path())) { + if (COMMIT_MSG.equals(a.path())) { return -1; - } else if (Patch.COMMIT_MSG.equals(b.path())) { + } else if (COMMIT_MSG.equals(b.path())) { return 1; } return a.path().compareTo(b.path()); @@ -41,7 +41,7 @@ } public static String getFileName(String path) { - String fileName = Patch.COMMIT_MSG.equals(path) + String fileName = COMMIT_MSG.equals(path) ? "Commit Message" : path; int s = fileName.lastIndexOf('/');
diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/PatchSetSelectBox.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/PatchSetSelectBox.java index 72ba99b..a25620d 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/PatchSetSelectBox.java +++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/PatchSetSelectBox.java
@@ -15,7 +15,6 @@ package com.googlesource.gerrit.plugins.xdocs.client; import com.google.gerrit.plugin.client.Plugin; -import com.google.gerrit.reviewdb.client.Patch; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.JsArray; import com.google.gwt.http.client.URL; @@ -78,7 +77,7 @@ add(createLink(list.get(i))); } - if (!Patch.COMMIT_MSG.equals(path)) { + if (!FileInfo.COMMIT_MSG.equals(path)) { add(createDownloadLink()); }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocDiffScreen.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocDiffScreen.java index 8fd4bae..b3d4690 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocDiffScreen.java +++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/client/XDocDiffScreen.java
@@ -17,7 +17,6 @@ import com.google.gerrit.client.rpc.NativeMap; import com.google.gerrit.client.rpc.Natives; import com.google.gerrit.plugin.client.Plugin; -import com.google.gerrit.reviewdb.client.Patch; import com.google.gwt.core.client.JsArray; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -195,7 +194,7 @@ p.add(new Label("/")); SafeHtmlBuilder html = new SafeHtmlBuilder(); - if (Patch.COMMIT_MSG.equals(path)) { + if (FileInfo.COMMIT_MSG.equals(path)) { html.append("Commit Message"); } else { int s = path.lastIndexOf('/') + 1;