diff --git a/plugins/tasks/tasks-api/src/com/intellij/tasks/config/TaskSettings.java b/plugins/tasks/tasks-api/src/com/intellij/tasks/config/TaskSettings.java index 7bc3973e3769..058dd23daa73 100644 --- a/plugins/tasks/tasks-api/src/com/intellij/tasks/config/TaskSettings.java +++ b/plugins/tasks/tasks-api/src/com/intellij/tasks/config/TaskSettings.java @@ -15,6 +15,7 @@ import org.jetbrains.annotations.NotNull; public class TaskSettings implements PersistentStateComponent { public boolean ALWAYS_DISPLAY_COMBO = false; public int CONNECTION_TIMEOUT = 5000; + public boolean LOWER_CASE_BRANCH = false; public static TaskSettings getInstance() { return ServiceManager.getService(TaskSettings.class); diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsOpenTaskPanel.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsOpenTaskPanel.java index b44bb1f8ada1..84d729656799 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsOpenTaskPanel.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsOpenTaskPanel.java @@ -24,6 +24,7 @@ import com.intellij.openapi.vcs.VcsTaskHandler; import com.intellij.tasks.LocalTask; import com.intellij.tasks.Task; import com.intellij.tasks.TaskManager; +import com.intellij.tasks.config.TaskSettings; import com.intellij.tasks.impl.TaskManagerImpl; import com.intellij.tasks.ui.TaskDialogPanel; import com.intellij.ui.ColoredListCellRenderer; @@ -37,6 +38,7 @@ import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Arrays; +import java.util.Locale; /** * @author Dmitry Avdeev @@ -156,9 +158,10 @@ public class VcsOpenTaskPanel extends TaskDialogPanel { @NotNull private String getBranchName(Task task) { - return myVcsTaskHandler != null - ? myVcsTaskHandler.cleanUpBranchName(myTaskManager.constructDefaultBranchName(task)) - : myTaskManager.suggestBranchName(task); + String branchName = myVcsTaskHandler != null + ? myVcsTaskHandler.cleanUpBranchName(myTaskManager.constructDefaultBranchName(task)) + : myTaskManager.suggestBranchName(task); + return TaskSettings.getInstance().LOWER_CASE_BRANCH ? branchName.toLowerCase(Locale.ENGLISH) : branchName; } private void updateFields(boolean initial) { diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form index d13e010af90e..6cfe92d81ed3 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form @@ -1,6 +1,6 @@
- + @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -29,12 +29,12 @@ - + - + @@ -58,7 +58,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -192,6 +192,14 @@ + + + + + + + + diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java index 8e9a8c9f50fb..02861097fe83 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.java @@ -85,6 +85,7 @@ public class TaskConfigurable extends BindableConfigurable implements Searchable @BindControl("branchNameFormat") private EditorTextField myBranchNameFormat; + private JCheckBox myLowerCase; private final Project myProject; private Configurable[] myConfigurables; @@ -126,6 +127,7 @@ public class TaskConfigurable extends BindableConfigurable implements Searchable enableCachePanel(); myAlwaysDisplayTaskCombo.setSelected(TaskSettings.getInstance().ALWAYS_DISPLAY_COMBO); myConnectionTimeout.setText(Integer.toString(TaskSettings.getInstance().CONNECTION_TIMEOUT)); + myLowerCase.setSelected(TaskSettings.getInstance().LOWER_CASE_BRANCH); } @Override @@ -146,6 +148,7 @@ public class TaskConfigurable extends BindableConfigurable implements Searchable int oldConnectionTimeout = TaskSettings.getInstance().CONNECTION_TIMEOUT; Integer connectionTimeout = Integer.valueOf(myConnectionTimeout.getText()); TaskSettings.getInstance().CONNECTION_TIMEOUT = connectionTimeout; + TaskSettings.getInstance().LOWER_CASE_BRANCH = myLowerCase.isSelected(); if (connectionTimeout != oldConnectionTimeout) { for (TaskRepository repository : manager.getAllRepositories()) { @@ -160,7 +163,8 @@ public class TaskConfigurable extends BindableConfigurable implements Searchable public boolean isModified() { return super.isModified() || TaskSettings.getInstance().ALWAYS_DISPLAY_COMBO != myAlwaysDisplayTaskCombo.isSelected() || - TaskSettings.getInstance().CONNECTION_TIMEOUT != Integer.valueOf(myConnectionTimeout.getText()); + TaskSettings.getInstance().CONNECTION_TIMEOUT != Integer.valueOf(myConnectionTimeout.getText()) || + TaskSettings.getInstance().LOWER_CASE_BRANCH != myLowerCase.isSelected(); } @Override