Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java13
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java2
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/DeleteRepositoryConfirmDialog.java9
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties1
4 files changed, 21 insertions, 4 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java
index 35bbadea6..51acc7fae 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoDeletionTest.java
@@ -37,7 +37,6 @@ import org.eclipse.egit.ui.internal.RepositoryCacheRule;
import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.test.ContextMenuHelper;
import org.eclipse.egit.ui.test.TestUtil;
-import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jgit.api.SubmoduleAddCommand;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
@@ -92,7 +91,9 @@ public class GitRepositoriesViewRepoDeletionTest extends
.checkBox(
UIText.DeleteRepositoryConfirmDialog_DeleteWorkingDirectoryCheckbox)
.select();
- shell.bot().button(IDialogConstants.OK_LABEL).click();
+ shell.bot().button(
+ UIText.DeleteRepositoryConfirmDialog_DeleteRepositoryConfirmButton)
+ .click();
TestUtil.joinJobs(JobFamilies.REPOSITORY_DELETE);
refreshAndWait();
@@ -131,7 +132,9 @@ public class GitRepositoriesViewRepoDeletionTest extends
checkbox.deselect();
// Now "Remove project from workspace" is selected, but "Delete working
// tree" is not.
- shell.bot().button(IDialogConstants.OK_LABEL).click();
+ shell.bot().button(
+ UIText.DeleteRepositoryConfirmDialog_DeleteRepositoryConfirmButton)
+ .click();
TestUtil.joinJobs(JobFamilies.REPOSITORY_DELETE);
refreshAndWait();
@@ -315,7 +318,9 @@ public class GitRepositoriesViewRepoDeletionTest extends
.checkBox(
UIText.DeleteRepositoryConfirmDialog_DeleteWorkingDirectoryCheckbox)
.select();
- shell.bot().button(IDialogConstants.OK_LABEL).click();
+ shell.bot().button(
+ UIText.DeleteRepositoryConfirmDialog_DeleteRepositoryConfirmButton)
+ .click();
TestUtil.joinJobs(JobFamilies.REPOSITORY_DELETE);
refreshAndWait();
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
index cb9424309..73f5ee70b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
@@ -3512,6 +3512,8 @@ public class UIText extends NLS {
public static String DeleteRepositoryConfirmDialog_DeleteRepositoryNoUndoWarning;
/** */
+ public static String DeleteRepositoryConfirmDialog_DeleteRepositoryConfirmButton;
+ /** */
public static String DeleteRepositoryConfirmDialog_DeleteRepositoryTitle;
/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/DeleteRepositoryConfirmDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/DeleteRepositoryConfirmDialog.java
index 99183f9b9..bff810e7d 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/DeleteRepositoryConfirmDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/DeleteRepositoryConfirmDialog.java
@@ -188,4 +188,13 @@ public class DeleteRepositoryConfirmDialog extends TitleAreaDialog {
else
setMessage(UIText.DeleteRepositoryConfirmDialog_DeleteRepositoryConfirmMessage);
}
+
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID,
+ UIText.DeleteRepositoryConfirmDialog_DeleteRepositoryConfirmButton,
+ true);
+ createButton(parent, IDialogConstants.CANCEL_ID,
+ IDialogConstants.CANCEL_LABEL, false);
+ }
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 7c595566e..c64a5cf47 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -1249,6 +1249,7 @@ DeleteRepositoryConfirmDialog_DeleteRepositoryTitle=Delete Repository ''{0}''
DeleteRepositoryConfirmDialog_DeleteRepositoryWindowTitle=Delete Repository
DeleteRepositoryConfirmDialog_DeleteWorkingDirectoryCheckbox=Also delete &working tree:
DeleteRepositoryConfirmDialog_DeleteProjectsCheckbox=Remove {0,choice,1#the project|1<the {0} projects} in the repository from the workspace
+DeleteRepositoryConfirmDialog_DeleteRepositoryConfirmButton = &Delete
DeleteTagOnCommitHandler_SelectTagDialogMessage=Please select the tags you want to delete
DeleteTagOnCommitHandler_SelectTagDialogTitle=Delete Tags
DeleteTagCommand_deletingTagsProgress=Deleting tags

Back to the top