Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2018-06-23 01:28:52 -0400
committerThomas Wolf2018-06-30 11:09:53 -0400
commit61e8a6cdb9a77c60b277c5f8eda5c71aada1fbfc (patch)
treea99cc3721889157ddd545184e12dcf76d849584e /org.eclipse.egit.ui/src/org
parentbf3a85c9d379ff4dac50c970f39735a99979090d (diff)
downloadegit-61e8a6cdb9a77c60b277c5f8eda5c71aada1fbfc.tar.gz
egit-61e8a6cdb9a77c60b277c5f8eda5c71aada1fbfc.tar.xz
egit-61e8a6cdb9a77c60b277c5f8eda5c71aada1fbfc.zip
Normalize tag name when typing
Use the BranchNameNormalizer also in the CreateTagDialog. Additionally remove the tooltip, and remove the stars from the mandatory input field labels, since we don't have those anywhere else. Change-Id: I96bf9c1db8b00f31a8b1263a264a68e3999fb904 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Bug:535577
Diffstat (limited to 'org.eclipse.egit.ui/src/org')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java3
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java6
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties5
3 files changed, 5 insertions, 9 deletions
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 f472bc972..9e76587ab 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
@@ -4305,9 +4305,6 @@ public class UIText extends NLS {
public static String CreateTagDialog_advancedMessage;
/** */
- public static String CreateTagDialog_tagNameToolTip;
-
- /** */
public static String CreateTagDialog_clearButton;
/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java
index e2285c09b..42ed47322 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java
@@ -32,6 +32,7 @@ import org.eclipse.egit.ui.internal.CompareUtils;
import org.eclipse.egit.ui.internal.UIIcons;
import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.internal.ValidationUtils;
+import org.eclipse.egit.ui.internal.components.BranchNameNormalizer;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IInputValidator;
import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -442,9 +443,8 @@ public class CreateTagDialog extends TitleAreaDialog {
validateInput();
}
});
-
- UIUtils.addBulbDecorator(tagNameText,
- UIText.CreateTagDialog_tagNameToolTip);
+ BranchNameNormalizer normalizer = new BranchNameNormalizer(tagNameText);
+ normalizer.setVisible(false);
new Label(left, SWT.WRAP).setText(UIText.CreateTagDialog_tagMessage);
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 9a726a6c5..0ddcda2da 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
@@ -1482,8 +1482,8 @@ TagAction_unableToResolveHeadObjectId=Unable to resolve object id associated wit
TagAction_creating=Creating {0} tag.
TagAction_taggingFailed=Tagging failed
-CreateTagDialog_tagName=Tag &name*:
-CreateTagDialog_tagMessage=Tag &message*:
+CreateTagDialog_tagName=Tag &name:
+CreateTagDialog_tagMessage=Tag &message:
CreateTagDialog_questionNewTagTitle=Create New Tag on Branch ''{0}''
CreateTagDialog_overwriteTag=Force &replace existing tag
CreateTagDialog_overwriteTagToolTip=Select this option if you want to change message or commit associated with already existing tag.
@@ -1491,7 +1491,6 @@ CreateTagDialog_existingTags=&Existing tags:
CreateTagDialog_advanced=&Advanced
CreateTagDialog_advancedToolTip=In the advanced section you may choose the commit to be tagged.
CreateTagDialog_advancedMessage=Choose commit that should be associated with this tag.
-CreateTagDialog_tagNameToolTip=Start typing tag name to filter list of existing tags.
CreateTagDialog_clearButton=C&lear
CreateTagDialog_clearButtonTooltip=Clear all dialog fields.
CreateTagDialog_CreateTagAndStartPushButton=Create Tag and Start &Push...

Back to the top