commit | e850ef5271d1c39221a021be0ec1d58a23ebb485 | [log] [tgz] |
---|---|---|
author | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Aug 23 14:57:06 2013 +0900 |
committer | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Aug 23 14:57:19 2013 +0900 |
tree | fce46675bfd7df85286973f337f315732cc6af57 | |
parent | 7fe140e744206a55b46df1fc31366efc39b4ba5c [diff] |
Compare string objects with .equals method rather than == Change-Id: I6dfcd9e84e3d3519a34f27b2f24196359717b72e
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java index 58a7042..6e9b6d6 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
@@ -306,7 +306,7 @@ if (lastState != null && patchSetId.equals(lastState.patchSetId) && lastState.approvals.containsKey(label.name())) { - b.setValue(lastState.approvals.get(label.name()) == value); + b.setValue(lastState.approvals.get(label.name()).equals(value)); } else { b.setValue(b.parseValue() == (prior != null ? prior : 0)); }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java index 3f79a61..0cabdda 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java
@@ -108,7 +108,7 @@ headerText.setText(text); header.setVisible(true); } - if (windowTitle == null || windowTitle == old) { + if (windowTitle == null || windowTitle.equals(old)) { setWindowTitle(text); } }
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java index 387b93a..6489035 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java
@@ -96,7 +96,7 @@ final boolean nullIfDefault) { final String ov = get(name); String nv = ui.readString(ov != null ? ov : dv, "%s", title); - if (nullIfDefault && nv == dv) { + if (nullIfDefault && nv.equals(dv)) { nv = null; } if (!eq(ov, nv)) {