Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/StartDialog.java12
-rw-r--r--org.eclipse.egit.ui/META-INF/MANIFEST.MF2
3 files changed, 13 insertions, 2 deletions
diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
index f8728347e..e773c079f 100644
--- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
@@ -21,6 +21,7 @@ Import-Package: org.eclipse.egit.core;version="[5.7.0,5.8.0)",
org.eclipse.egit.ui.internal.actions;version="[5.7.0,5.8.0)",
org.eclipse.egit.ui.internal.branch;version="[5.7.0,5.8.0)",
org.eclipse.egit.ui.internal.commit;version="[5.7.0,5.8.0)",
+ org.eclipse.egit.ui.internal.components;version="[5.7.0,5.8.0)",
org.eclipse.egit.ui.internal.decorators;version="[5.7.0,5.8.0)",
org.eclipse.egit.ui.internal.expressions;version="[5.7.0,5.8.0)",
org.eclipse.egit.ui.internal.rebase;version="[5.7.0,5.8.0)",
diff --git a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/StartDialog.java b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/StartDialog.java
index ce91105da..e039bbe0a 100644
--- a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/StartDialog.java
+++ b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/StartDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (C) 2018, Max Hohenegger <eclipse@hohenegger.eu>
+ * Copyright (C) 2019, Max Hohenegger <eclipse@hohenegger.eu>
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,11 +11,13 @@
package org.eclipse.egit.gitflow.ui.internal.actions;
import org.eclipse.egit.gitflow.ui.internal.UIText;
+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.InputDialog;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
class StartDialog extends InputDialog {
@@ -43,6 +45,14 @@ class StartDialog extends InputDialog {
}
@Override
+ protected Control createDialogArea(Composite parent) {
+ Control result = super.createDialogArea(parent);
+ BranchNameNormalizer normalizer = new BranchNameNormalizer(getText());
+ normalizer.setVisible(false);
+ return result;
+ }
+
+ @Override
protected Button getOkButton() {
return startButton;
}
diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
index 9a9f008f6..5fd781f2d 100644
--- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -84,7 +84,7 @@ Export-Package: org.eclipse.egit.ui;version="5.7.0";x-friends:="org.eclipse.egit
org.eclipse.egit.ui.internal.commands.shared;version="5.7.0";x-internal:=true,
org.eclipse.egit.ui.internal.commit;version="5.7.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
org.eclipse.egit.ui.internal.commit.command;version="5.7.0";x-internal:=true,
- org.eclipse.egit.ui.internal.components;version="5.7.0";x-friends:="org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.components;version="5.7.0";x-friends:="org.eclipse.mylyn.github.ui,org.eclipse.egit.gitflow.ui",
org.eclipse.egit.ui.internal.credentials;version="5.7.0";x-internal:=true,
org.eclipse.egit.ui.internal.decorators;version="5.7.0";x-friends:="org.eclipse.egit.gitflow.ui",
org.eclipse.egit.ui.internal.dialogs;version="5.7.0";x-friends:="org.eclipse.egit.gitflow.ui",

Back to the top