| commit | 4cb50ad3a59cbf1dabb86bb5815c1f3bc8098bfb | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Fri Dec 06 06:54:41 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Dec 06 06:54:42 2013 +0000 |
| tree | 245519bb4369b4623a7ed68dcbd77b1d7602a9fe | |
| parent | 6ba586b77a60290be8abacb959b516769633e227 [diff] | |
| parent | c7dbfed9f0af97113c32934be226d579f70d677f [diff] |
Merge "Replace 'indexOf()' expression with 'contains()'"
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java index 5097acd..c87bb28 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
@@ -49,7 +49,6 @@ import com.google.gwt.core.client.JsArray; import com.google.gwt.core.client.JsArrayString; import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.RepeatingCommand; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent;
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java index 75a7e07..eb6d1f7 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java
@@ -159,13 +159,13 @@ return c > 0 ? auth.substring(0, c) : null; } else if (auth.startsWith("Digest ")) { - int u = auth.indexOf("username=\""); + final int u = auth.indexOf("username=\""); if (u <= 0) { return null; } auth = auth.substring(u + 10); - int e = auth.indexOf('"'); - return e > 0 ? auth.substring(0, auth.indexOf('"')) : null; + final int e = auth.indexOf('"'); + return e > 0 ? auth.substring(0, e) : null; } else { return null;
diff --git a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/Plugin.java b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/Plugin.java index b5f7175..b1ff403 100644 --- a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/Plugin.java +++ b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/Plugin.java
@@ -26,4 +26,9 @@ * </ol> */ public abstract class Plugin implements EntryPoint { + public native static void go(String t) + /*-{ $wnd.Gerrit.go(t) }-*/; + + public native static void refresh() + /*-{ $wnd.Gerrit.refresh() }-*/; }