Merge remote-tracking branch 'origin/master' into mikhail.golubev/configurable-issues...
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 12 Feb 2015 15:56:16 +0000 (18:56 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 12 Feb 2015 15:56:16 +0000 (18:56 +0300)
1  2 
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java

index b88b296fd5a6a28fd34e8ef5f832d92ed630c8d9,66c3f80540c5583b255af3f9fb870e717cef5990..ab2eac4df5ad06f54c03594036587c10fbbeccf5
@@@ -52,10 -48,8 +52,10 @@@ import java.util.Set
   */
  public class OpenTaskDialog extends DialogWrapper {
    private final static Logger LOG = Logger.getInstance("#com.intellij.tasks.actions.SimpleOpenTaskDialog");
-   public static final String START_FROM_BRANCH = "start.from.branch";
+   private static final String START_FROM_BRANCH = "start.from.branch";
  
 +  private static final CustomTaskState DO_NOT_UPDATE_STATE = new CustomTaskState("", "-- do not update --");
 +
    private JPanel myPanel;
    @BindControl(value = "clearContext", instant = true)
    private JCheckBox myClearContext;