From e0d77c19255db935beb8c76d4f895b96cae7d2fc Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 30 Sep 2013 18:52:04 +0900 Subject: [PATCH] ChangeScreen2: Add missing action titles Some of the action buttons on the ChangeScreen2 did not have titles. Add them. Also make the titles consistent in usage of capitalisation. Change-Id: Ibcf90fc45202a5081bfe4b348a05443eb1a6584b --- .../src/main/java/com/google/gerrit/server/change/Abandon.java | 1 + .../java/com/google/gerrit/server/change/DeleteDraftChange.java | 2 +- .../com/google/gerrit/server/change/DeleteDraftPatchSet.java | 2 +- .../src/main/java/com/google/gerrit/server/change/Publish.java | 2 +- .../src/main/java/com/google/gerrit/server/change/Restore.java | 1 + .../src/main/java/com/google/gerrit/server/change/Revert.java | 1 + .../src/main/java/com/google/gerrit/server/change/Submit.java | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java index 6b4c0e06c8..d8ea472862 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java @@ -134,6 +134,7 @@ public class Abandon implements RestModifyView, public UiAction.Description getDescription(ChangeResource resource) { return new UiAction.Description() .setLabel("Abandon") + .setTitle("Abandon the change") .setVisible(resource.getChange().getStatus().isOpen() && resource.getControl().canAbandon()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftChange.java index 1386e0b998..767d5eecf0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftChange.java @@ -83,7 +83,7 @@ public class DeleteDraftChange implements public UiAction.Description getDescription(ChangeResource rsrc) { try { return new UiAction.Description() - .setTitle(String.format("Delete Draft Change %d", + .setTitle(String.format("Delete draft change %d", rsrc.getChange().getChangeId())) .setVisible(rsrc.getChange().getStatus() == Status.DRAFT && rsrc.getControl().canDeleteDraft(dbProvider.get())); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java index ba45c088cd..3265c815e8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java @@ -91,7 +91,7 @@ public class DeleteDraftPatchSet implements RestModifyView, PatchSet.Id current = rsrc.getChange().currentPatchSetId(); try { return new UiAction.Description() - .setTitle(String.format("Publish Revision %d", + .setTitle(String.format("Publish revision %d", rsrc.getPatchSet().getPatchSetId())) .setVisible(rsrc.getPatchSet().isDraft() && rsrc.getPatchSet().getId().equals(current) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java index 581c4ba919..694c17c946 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java @@ -133,6 +133,7 @@ public class Restore implements RestModifyView, public UiAction.Description getDescription(ChangeResource resource) { return new UiAction.Description() .setLabel("Restore") + .setTitle("Restore the change") .setVisible(resource.getChange().getStatus() == Status.ABANDONED && resource.getControl().canRestore()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java index 1d4ad710b9..73a6b03539 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java @@ -113,6 +113,7 @@ public class Revert implements RestModifyView, public UiAction.Description getDescription(ChangeResource resource) { return new UiAction.Description() .setLabel("Revert") + .setTitle("Revert the change") .setVisible(resource.getChange().getStatus() == Status.MERGED && resource.getControl().getRefControl().canUpload()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java index c0dc10c9dd..a601a1f6fe 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java @@ -147,7 +147,7 @@ public class Submit implements RestModifyView, PatchSet.Id current = resource.getChange().currentPatchSetId(); return new UiAction.Description() .setTitle(String.format( - "Submit Revision %d", + "Submit revision %d", resource.getPatchSet().getPatchSetId())) .setVisible(resource.getChange().getStatus().isOpen() && resource.getPatchSet().getId().equals(current)