diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java index 762b561c56d1..0b9842866794 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java @@ -154,7 +154,7 @@ public class HgBranchPopupActions { if (bookmarkDialog.isOK()) { try { final String name = bookmarkDialog.getName(); - new HgBookmarkCreateCommand(myProject, myPreselectedRepo, name, bookmarkDialog.getRevision(), + new HgBookmarkCreateCommand(myProject, myPreselectedRepo, name, bookmarkDialog.isActive()).execute(new HgCommandResultHandler() { @Override public void process(@Nullable HgCommandResult result) { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgBookmarkCreateCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgBookmarkCreateCommand.java index c928ce0bb09f..89442efbc35e 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgBookmarkCreateCommand.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgBookmarkCreateCommand.java @@ -19,18 +19,15 @@ public class HgBookmarkCreateCommand { @NotNull private final Project myProject; @NotNull private final VirtualFile myRepo; @Nullable private final String myBookmarkName; - @Nullable private final String myRevisionNumber; private final boolean isActive; public HgBookmarkCreateCommand(@NotNull Project project, @NotNull VirtualFile repo, @Nullable String bookmarkName, - @Nullable String revisionNumber, boolean active) { myProject = project; myRepo = repo; myBookmarkName = bookmarkName; - myRevisionNumber = revisionNumber; isActive = active; } @@ -40,10 +37,6 @@ public class HgBookmarkCreateCommand { } List arguments = new ArrayList(); arguments.add(myBookmarkName); - if (!StringUtil.isEmptyOrSpaces(myRevisionNumber)) { - arguments.add("--rev"); - arguments.add(myRevisionNumber); - } if (!isActive) { arguments.add("--inactive"); } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.form b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.form index e66baed3ed13..aa93ace47de0 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.form +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.form @@ -13,7 +13,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -37,27 +37,13 @@ - - - - - - - - - - - - - - - - - + + + diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.java index 161c5dfadce0..2340d875ee7d 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.java @@ -13,10 +13,9 @@ import javax.swing.*; * @author Nadya Zabrodina */ public class HgBookmarkDialog extends DialogWrapper { - private JPanel myContentPanel; - private JTextField myRevision; - private JTextField myBookmarkName; - private JCheckBox myActiveCheckbox; + @NotNull private JPanel myContentPanel; + @NotNull private JTextField myBookmarkName; + @NotNull private JCheckBox myActiveCheckbox; public HgBookmarkDialog(@Nullable Project project) { super(project, false); @@ -31,33 +30,33 @@ public class HgBookmarkDialog extends DialogWrapper { } @Override + @NotNull public JComponent getPreferredFocusedComponent() { return myBookmarkName; } @Override + @NotNull protected String getDimensionServiceKey() { return HgBookmarkDialog.class.getName(); } + @NotNull protected JComponent createCenterPanel() { return myContentPanel; } - @NotNull - public String getRevision() { - return myRevision.getText(); - } - public boolean isActive() { return !myActiveCheckbox.isSelected(); } + @Nullable public String getName() { return myBookmarkName.getText(); } @Override + @Nullable protected ValidationInfo doValidate() { String message = "You have to specify bookmark name."; if (StringUtil.isEmptyOrSpaces(getName())) { diff --git a/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRepositoryReaderTest.java b/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRepositoryReaderTest.java index 17af02238e0b..2a8051579c95 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRepositoryReaderTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRepositoryReaderTest.java @@ -98,7 +98,7 @@ public class HgRepositoryReaderTest extends HgPlatformTest { assertEquals(myRepositoryReader.readCurrentBookmark(), "B_BookMark"); } - @NotNull + @NotNull private Collection readBookmarks() throws IOException { Collection bookmarks = new HashSet(); File bookmarksFile = new File(myHgDir, "bookmarks");