{"thread":{"id":"17081","subject":"[EGIT PATCH] Use text resources for the Commit dialog and add shortcuts.","startedAt":"2009-01-10T17:21:06Z","lastAt":"2009-01-10T17:21:06Z","messageCount":1,"participants":["Robin Rosenberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"99911","messageId":"1231608066-25921-1-git-send-email-robin.rosenberg@dewire.com","threadId":"17081","inReplyTo":null,"subject":"[EGIT PATCH] Use text resources for the Commit dialog and add shortcuts.","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2009-01-10T17:21:06Z","receivedAt":"2009-01-10T17:21:06Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>\n---\n .../src/org/spearce/egit/ui/UIText.java            |   75 ++++++++++++++++++++\n .../egit/ui/internal/dialogs/CommitDialog.java     |   67 +++++++++---------\n .../src/org/spearce/egit/ui/uitext.properties      |   25 +++++++\n 3 files changed, 134 insertions(+), 33 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java\nindex 30122d2..0abb209 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java\n@@ -566,6 +566,81 @@\n \tpublic static String PushWizard_windowTitleWithDestination;\n \n \t/** */\n+\tpublic static String CommitDialog_AddFileOnDiskToIndex;\n+\n+\t/** */\n+\tpublic static String CommitDialog_AddSOB;\n+\n+\t/** */\n+\tpublic static String CommitDialog_AmendPreviousCommit;\n+\n+\t/** */\n+\tpublic static String CommitDialog_Author;\n+\n+\t/** */\n+\tpublic static String CommitDialog_Commit;\n+\n+\t/** */\n+\tpublic static String CommitDialog_CommitChanges;\n+\n+\t/** */\n+\tpublic static String CommitDialog_CommitMessage;\n+\n+\t/** */\n+\tpublic static String CommitDialog_DeselectAll;\n+\n+\t/** */\n+\tpublic static String CommitDialog_ErrorInvalidAuthor;\n+\n+\t/** */\n+\tpublic static String CommitDialog_ErrorInvalidAuthorSpecified;\n+\n+\t/** */\n+\tpublic static String CommitDialog_ErrorMustEnterCommitMessage;\n+\n+\t/** */\n+\tpublic static String CommitDialog_ErrorNoItemsSelected;\n+\n+\t/** */\n+\tpublic static String CommitDialog_ErrorNoItemsSelectedToBeCommitted;\n+\n+\t/** */\n+\tpublic static String CommitDialog_ErrorNoMessage;\n+\n+\t/** */\n+\tpublic static String CommitDialog_File;\n+\n+\t/** */\n+\tpublic static String CommitDialog_SelectAll;\n+\n+\t/** */\n+\tpublic static String CommitDialog_Status;\n+\n+\t/** */\n+\tpublic static String CommitDialog_StatusAdded;\n+\n+\t/** */\n+\tpublic static String CommitDialog_StatusAddedIndexDiff;\n+\n+\t/** */\n+\tpublic static String CommitDialog_StatusModified;\n+\n+\t/** */\n+\tpublic static String CommitDialog_StatusModifiedIndexDiff;\n+\n+\t/** */\n+\tpublic static String CommitDialog_StatusModifiedNotStaged;\n+\n+\t/** */\n+\tpublic static String CommitDialog_StatusRemoved;\n+\n+\t/** */\n+\tpublic static String CommitDialog_StatusRemovedNotStaged;\n+\n+\t/** */\n+\tpublic static String CommitDialog_StatusUnknown;\n+\n+\t/** */\n \tpublic static String ConfirmationPage_cantConnectToAnyTitle;\n \n \t/** */\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java\nindex f32112b..fede948 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java\n@@ -52,6 +52,7 @@\n import org.eclipse.swt.widgets.Text;\n import org.eclipse.ui.model.WorkbenchLabelProvider;\n import org.spearce.egit.core.project.RepositoryMapping;\n+import org.spearce.egit.ui.UIText;\n import org.spearce.jgit.lib.Constants;\n import org.spearce.jgit.lib.GitIndex;\n import org.spearce.jgit.lib.PersonIdent;\n@@ -92,7 +93,7 @@ public String getColumnText(Object obj, int columnIndex) {\n \t\t\t\treturn item.status;\n \n \t\t\tcase 1:\n-\t\t\t\treturn item.file.getProject().getName() + \": \"\n+\t\t\t\treturn item.file.getProject().getName() + \": \" //$NON-NLS-1$\n \t\t\t\t\t\t+ item.file.getProjectRelativePath();\n \n \t\t\tdefault:\n@@ -118,10 +119,10 @@ public CommitDialog(Shell parentShell) {\n \n \t@Override\n \tprotected void createButtonsForButtonBar(Composite parent) {\n-\t\tcreateButton(parent, IDialogConstants.SELECT_ALL_ID, \"Select All\", false);\n-\t\tcreateButton(parent, IDialogConstants.DESELECT_ALL_ID, \"Deselect All\", false);\n+\t\tcreateButton(parent, IDialogConstants.SELECT_ALL_ID, UIText.CommitDialog_SelectAll, false);\n+\t\tcreateButton(parent, IDialogConstants.DESELECT_ALL_ID, UIText.CommitDialog_DeselectAll, false);\n \n-\t\tcreateButton(parent, IDialogConstants.OK_ID, \"Commit\", true);\n+\t\tcreateButton(parent, IDialogConstants.OK_ID, UIText.CommitDialog_Commit, true);\n \t\tcreateButton(parent, IDialogConstants.CANCEL_ID,\n \t\t\t\tIDialogConstants.CANCEL_LABEL, false);\n \t}\n@@ -130,19 +131,19 @@ createButton(parent, IDialogConstants.CANCEL_ID,\n \tText authorText;\n \tButton amendingButton;\n \tButton signedOffButton;\n-\t\n+\n \tCheckboxTableViewer filesViewer;\n \n \t@Override\n \tprotected Control createDialogArea(Composite parent) {\n \t\tComposite container = (Composite) super.createDialogArea(parent);\n-\t\tparent.getShell().setText(\"Commit Changes\");\n+\t\tparent.getShell().setText(UIText.CommitDialog_CommitChanges);\n \n \t\tGridLayout layout = new GridLayout(2, false);\n \t\tcontainer.setLayout(layout);\n \n \t\tLabel label = new Label(container, SWT.LEFT);\n-\t\tlabel.setText(\"Commit Message:\");\n+\t\tlabel.setText(UIText.CommitDialog_CommitMessage);\n \t\tlabel.setLayoutData(GridDataFactory.fillDefaults().span(2, 1).grab(true, false).create());\n \n \t\tcommitText = new Text(container, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);\n@@ -163,7 +164,7 @@ public void keyPressed(KeyEvent arg0) {\n \t\t\t}\n \t\t});\n \n-\t\tnew Label(container, SWT.LEFT).setText(\"Author: \");\n+\t\tnew Label(container, SWT.LEFT).setText(UIText.CommitDialog_Author);\n \t\tauthorText = new Text(container, SWT.BORDER);\n \t\tauthorText.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());\n \t\tif (author != null)\n@@ -186,24 +187,24 @@ public void widgetSelected(SelectionEvent arg0) {\n \t\t\t\t\talreadyAdded = true;\n \t\t\t\t\tString curText = commitText.getText();\n \t\t\t\t\tif (curText.length() > 0)\n-\t\t\t\t\t\tcurText += \"\\n\";\n+\t\t\t\t\t\tcurText += \"\\n\"; //$NON-NLS-1$\n \t\t\t\t\tcommitText.setText(curText + previousCommitMessage);\n \t\t\t\t}\n \t\t\t}\n-\t\t\n+\n \t\t\tpublic void widgetDefaultSelected(SelectionEvent arg0) {\n \t\t\t\t// Empty\n \t\t\t}\n \t\t});\n-\t\t\n-\t\tamendingButton.setText(\"Amend previous commit\");\n+\n+\t\tamendingButton.setText(UIText.CommitDialog_AmendPreviousCommit);\n \t\tamendingButton.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).span(2, 1).create());\n \n \t\tsignedOffButton = new Button(container, SWT.CHECK);\n \t\tsignedOffButton.setSelection(signedOff);\n-\t\tsignedOffButton.setText(\"Add Signed-off-by\");\n+\t\tsignedOffButton.setText(UIText.CommitDialog_AddSOB);\n \t\tsignedOffButton.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).span(2, 1).create());\n-\t\t\n+\n \t\tTable resourcesTable = new Table(container, SWT.H_SCROLL | SWT.V_SCROLL\n \t\t\t\t| SWT.FULL_SELECTION | SWT.MULTI | SWT.CHECK | SWT.BORDER);\n \t\tresourcesTable.setLayoutData(GridDataFactory.fillDefaults().hint(600,\n@@ -211,12 +212,12 @@ public void widgetDefaultSelected(SelectionEvent arg0) {\n \n \t\tresourcesTable.setHeaderVisible(true);\n \t\tTableColumn statCol = new TableColumn(resourcesTable, SWT.LEFT);\n-\t\tstatCol.setText(\"Status\");\n+\t\tstatCol.setText(UIText.CommitDialog_Status);\n \t\tstatCol.setWidth(150);\n \t\tstatCol.addSelectionListener(new HeaderSelectionListener(CommitItem.Order.ByStatus));\n \n \t\tTableColumn resourceCol = new TableColumn(resourcesTable, SWT.LEFT);\n-\t\tresourceCol.setText(\"File\");\n+\t\tresourceCol.setText(UIText.CommitDialog_File);\n \t\tresourceCol.setWidth(415);\n \t\tresourceCol.addSelectionListener(new HeaderSelectionListener(CommitItem.Order.ByFile));\n \n@@ -234,7 +235,7 @@ public void widgetDefaultSelected(SelectionEvent arg0) {\n \tprivate Menu getContextMenu() {\n \t\tMenu menu = new Menu(filesViewer.getTable());\n \t\tMenuItem item = new MenuItem(menu, SWT.PUSH);\n-\t\titem.setText(\"Add file on disk to index\");\n+\t\titem.setText(UIText.CommitDialog_AddFileOnDiskToIndex);\n \t\titem.addListener(SWT.Selection, new Listener() {\n \t\t\tpublic void handleEvent(Event arg0) {\n \t\t\t\tIStructuredSelection sel = (IStructuredSelection) filesViewer.getSelection();\n@@ -271,12 +272,12 @@ public void handleEvent(Event arg0) {\n \t\t\t\t}\n \t\t\t}\n \t\t});\n-\t\t\n+\n \t\treturn menu;\n \t}\n \n \tprivate static String getFileStatus(IFile file) {\n-\t\tString prefix = \"Unknown\";\n+\t\tString prefix = UIText.CommitDialog_StatusUnknown;\n \n \t\ttry {\n \t\t\tRepositoryMapping repositoryMapping = RepositoryMapping\n@@ -292,22 +293,22 @@ private static String getFileStatus(IFile file) {\n \n \t\t\tEntry indexEntry = index.getEntry(repoPath);\n \t\t\tif (headEntry == null) {\n-\t\t\t\tprefix = \"Added\";\n+\t\t\t\tprefix = UIText.CommitDialog_StatusAdded;\n \t\t\t\tif (indexEntry.isModified(repositoryMapping.getWorkDir()))\n-\t\t\t\t\tprefix = \"Added, index diff\";\n+\t\t\t\t\tprefix = UIText.CommitDialog_StatusAddedIndexDiff;\n \t\t\t} else if (indexEntry == null) {\n-\t\t\t\tprefix = \"Removed\";\n+\t\t\t\tprefix = UIText.CommitDialog_StatusRemoved;\n \t\t\t} else if (headExists\n \t\t\t\t\t&& !headEntry.getId().equals(indexEntry.getObjectId())) {\n-\t\t\t\tprefix = \"Modified\";\n+\t\t\t\tprefix = UIText.CommitDialog_StatusModified;\n \n \t\t\t\tif (indexEntry.isModified(repositoryMapping.getWorkDir()))\n-\t\t\t\t\tprefix = \"Mod., index diff\";\n+\t\t\t\t\tprefix = UIText.CommitDialog_StatusModifiedIndexDiff;\n \t\t\t} else if (!new File(repositoryMapping.getWorkDir(), indexEntry\n \t\t\t\t\t.getName()).isFile()) {\n-\t\t\t\tprefix = \"Rem., not staged\";\n+\t\t\t\tprefix = UIText.CommitDialog_StatusRemovedNotStaged;\n \t\t\t} else if (indexEntry.isModified(repositoryMapping.getWorkDir())) {\n-\t\t\t\tprefix = \"Mod., not staged\";\n+\t\t\t\tprefix = UIText.CommitDialog_StatusModifiedNotStaged;\n \t\t\t}\n \n \t\t} catch (Exception e) {\n@@ -331,14 +332,14 @@ public void setCommitMessage(String s) {\n \t\tthis.commitMessage = s;\n \t}\n \n-\tprivate String commitMessage = \"\";\n+\tprivate String commitMessage = \"\"; //$NON-NLS-1$\n \tprivate String author = null;\n \tprivate boolean signedOff = false;\n \tprivate boolean amending = false;\n \tprivate boolean amendAllowed = true;\n \n \tprivate ArrayList<IFile> selectedFiles = new ArrayList<IFile>();\n-\tprivate String previousCommitMessage = \"\";\n+\tprivate String previousCommitMessage = \"\"; //$NON-NLS-1$\n \n \t/**\n \t * Pre-select suggested set of resources to commit\n@@ -398,28 +399,28 @@ protected void okPressed() {\n \t\tauthor = authorText.getText().trim();\n \t\tsignedOff = signedOffButton.getSelection();\n \t\tamending = amendingButton.getSelection();\n-\t\t\n+\n \t\tObject[] checkedElements = filesViewer.getCheckedElements();\n \t\tselectedFiles.clear();\n \t\tfor (Object obj : checkedElements)\n \t\t\tselectedFiles.add(((CommitItem) obj).file);\n \n \t\tif (commitMessage.trim().length() == 0) {\n-\t\t\tMessageDialog.openWarning(getShell(), \"No message\", \"You must enter a commit message\");\n+\t\t\tMessageDialog.openWarning(getShell(), UIText.CommitDialog_ErrorNoMessage, UIText.CommitDialog_ErrorMustEnterCommitMessage);\n \t\t\treturn;\n \t\t}\n-\t\t\n+\n \t\tif (author.length() > 0) {\n \t\t\ttry {\n \t\t\t\tnew PersonIdent(author);\n \t\t\t} catch (IllegalArgumentException e) {\n-\t\t\t\tMessageDialog.openWarning(getShell(), \"Invalid author\", \"Invalid author specified. Please use the form:\\nA U Thor <author@example.com>\");\n+\t\t\t\tMessageDialog.openWarning(getShell(), UIText.CommitDialog_ErrorInvalidAuthor, UIText.CommitDialog_ErrorInvalidAuthorSpecified);\n \t\t\t\treturn;\n \t\t\t}\n \t\t} else author = null;\n \n \t\tif (selectedFiles.isEmpty() && !amending) {\n-\t\t\tMessageDialog.openWarning(getShell(), \"No items selected\", \"No items are currently selected to be committed.\");\n+\t\t\tMessageDialog.openWarning(getShell(), UIText.CommitDialog_ErrorNoItemsSelected, UIText.CommitDialog_ErrorNoItemsSelectedToBeCommitted);\n \t\t\treturn;\n \t\t}\n \t\tsuper.okPressed();\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties\nindex 3819047..3c9a21c 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties\n@@ -216,6 +216,31 @@ PushWizard_unexpectedError=Unexpected error occurred.\n PushWizard_windowTitleDefault=Push To Another Repositories\n PushWizard_windowTitleWithDestination=Push To: {0}\n \n+CommitDialog_AddFileOnDiskToIndex=Add file on &disk to index\n+CommitDialog_AddSOB=Add Signed-off-&by\n+CommitDialog_AmendPreviousCommit=A&mend previous commit\n+CommitDialog_Author=&Author:\n+CommitDialog_Commit=&Commit\n+CommitDialog_CommitChanges=Commit Changes\n+CommitDialog_CommitMessage=Commit &Message:\n+CommitDialog_DeselectAll=&Deselect All\n+CommitDialog_ErrorInvalidAuthor=Invalid author\n+CommitDialog_ErrorInvalidAuthorSpecified=Invalid author specified. Please use the form:\\nA U Thor <author@example.com>\n+CommitDialog_ErrorMustEnterCommitMessage=You must enter a commit message\n+CommitDialog_ErrorNoItemsSelected=No items selected\n+CommitDialog_ErrorNoItemsSelectedToBeCommitted=No items are currently selected to be committed.\n+CommitDialog_ErrorNoMessage=No message\n+CommitDialog_File=File\n+CommitDialog_SelectAll=&Select All\n+CommitDialog_Status=Status\n+CommitDialog_StatusAdded=Added\n+CommitDialog_StatusAddedIndexDiff=Added, index diff\n+CommitDialog_StatusModified=Modified\n+CommitDialog_StatusModifiedIndexDiff=Mod., index diff\n+CommitDialog_StatusModifiedNotStaged=Mod., not staged\n+CommitDialog_StatusRemoved=Removed\n+CommitDialog_StatusRemovedNotStaged=Rem., not staged\n+CommitDialog_StatusUnknown=Unknown\n ConfirmationPage_cantConnectToAnyTitle=Can't Connect\n ConfirmationPage_cantConnectToAny=Can't connect to any URI: {0}\n ConfirmationPage_description=Confirm following expected push result.\n-- \n1.6.1.rc3.56.gd0306\n"}]}