Search in sources :

Example 6 with GitTreeNode

use of com.oxygenxml.git.view.GitTreeNode in project oxygen-git-client-addon by oxygenxml.

the class TreeUtil method sort.

/**
 * Sorts the given node
 *
 * @param node The node to be sorted.
 */
private static void sort(GitTreeNode node) {
    int childCount = node.getChildCount();
    List<GitTreeNode> children = new ArrayList<>(childCount);
    for (int i = 0; i < childCount; i++) {
        children.add((GitTreeNode) node.getChildAt(i));
    }
    Collections.sort(children, new NodeTreeComparator());
    node.removeAllChildren();
    children.forEach(node::add);
}
Also used : GitTreeNode(com.oxygenxml.git.view.GitTreeNode) ArrayList(java.util.ArrayList) NodeTreeComparator(com.oxygenxml.git.view.NodeTreeComparator)

Example 7 with GitTreeNode

use of com.oxygenxml.git.view.GitTreeNode in project oxygen-git-client-addon by oxygenxml.

the class TreeUtil method sortGitTree.

/**
 * Sorts the entire tree.
 *
 * @param treeModel The tree model.
 */
public static void sortGitTree(DefaultTreeModel treeModel) {
    GitTreeNode root = (GitTreeNode) treeModel.getRoot();
    Enumeration<?> e = root.depthFirstEnumeration();
    while (e.hasMoreElements()) {
        GitTreeNode node = (GitTreeNode) e.nextElement();
        if (!node.isLeaf()) {
            sort(node);
        }
    }
}
Also used : GitTreeNode(com.oxygenxml.git.view.GitTreeNode)

Example 8 with GitTreeNode

use of com.oxygenxml.git.view.GitTreeNode in project oxygen-git-client-addon by oxygenxml.

the class BranchActionsTest method testContextualMenuActionsOnCurrentBranch.

/**
 *<p><b>Description:</b>Tests the action created on the current Branch</p>
 * <p><b>Bug ID:</b> EXM-43410</p>
 *
 * @author gabriel_nedianu
 *
 * @throws Exception
 */
public void testContextualMenuActionsOnCurrentBranch() throws Exception {
    File file = new File(LOCAL_TEST_REPOSITORY + "local.txt");
    file.createNewFile();
    setFileContent(file, "local content");
    // Make the first commit for the local repository
    gitAccess.add(new FileStatus(GitChangeType.ADD, "local.txt"));
    gitAccess.commit("First local commit.");
    // Verify we are on main branch
    String initialBranchName = gitAccess.getBranchInfo().getBranchName();
    assertEquals(GitAccess.DEFAULT_BRANCH_NAME, initialBranchName);
    GitControllerBase mock = new GitController();
    BranchManagementPanel branchManagementPanel = new BranchManagementPanel(mock);
    branchManagementPanel.refreshBranches();
    flushAWT();
    BranchTreeMenuActionsProvider branchTreeMenuActionsProvider = new BranchTreeMenuActionsProvider(mock);
    GitTreeNode root = (GitTreeNode) (branchManagementPanel.getTree().getModel().getRoot());
    GitTreeNode mainBranchNode = (GitTreeNode) root.getFirstLeaf();
    String mainBranchPath = (String) mainBranchNode.getUserObject();
    assertEquals("refs/heads/" + GitAccess.DEFAULT_BRANCH_NAME, mainBranchPath);
    // ------------- Verify the actions on the selected branch -------------
    List<AbstractAction> actionsForNode = branchTreeMenuActionsProvider.getActionsForNode(mainBranchNode);
    int noOfActions = actionsForNode.size();
    assertEquals(1, noOfActions);
    String actionName = (String) actionsForNode.get(0).getValue(AbstractAction.NAME);
    assertEquals(translator.getTranslation(Tags.CREATE_BRANCH) + "...", actionName);
}
Also used : GitControllerBase(com.oxygenxml.git.service.GitControllerBase) FileStatus(com.oxygenxml.git.service.entities.FileStatus) GitTreeNode(com.oxygenxml.git.view.GitTreeNode) GitController(com.oxygenxml.git.view.event.GitController) File(java.io.File) AbstractAction(javax.swing.AbstractAction)

Example 9 with GitTreeNode

use of com.oxygenxml.git.view.GitTreeNode in project oxygen-git-client-addon by oxygenxml.

the class BranchActionsTest method testCreateLocalBranchAction.

/**
 * Tests the action of creating a new branch from a local branch.
 *
 * @throws Exception
 */
public void testCreateLocalBranchAction() throws Exception {
    boolean initialIsCheckoutNewBranch = OptionsManager.getInstance().isCheckoutNewlyCreatedLocalBranch();
    try {
        File file = new File(LOCAL_TEST_REPOSITORY + "local.txt");
        file.createNewFile();
        setFileContent(file, "local content");
        // Make the first commit for the local repository and create a branch for it.
        gitAccess.add(new FileStatus(GitChangeType.ADD, "local.txt"));
        gitAccess.commit("First local commit.");
        gitAccess.createBranch(LOCAL_BRANCH_NAME1);
        gitAccess.createBranch(LOCAL_BRANCH_NAME2);
        gitAccess.fetch();
        String initialBranchName = gitAccess.getBranchInfo().getBranchName();
        assertEquals(GitAccess.DEFAULT_BRANCH_NAME, initialBranchName);
        GitControllerBase mock = new GitController();
        BranchManagementPanel branchManagementPanel = new BranchManagementPanel(mock);
        branchManagementPanel.refreshBranches();
        flushAWT();
        BranchTreeMenuActionsProvider branchTreeMenuActionsProvider = new BranchTreeMenuActionsProvider(mock);
        GitTreeNode root = (GitTreeNode) (branchManagementPanel.getTree().getModel().getRoot());
        // ------------- Create branch LOCAL_BRANCH_COPY_NAME from first branch in the tree: LOCAL_BRANCH_NAME1 -------------
        GitTreeNode firstLeaf = (GitTreeNode) root.getFirstLeaf();
        String firstLeafPath = (String) firstLeaf.getUserObject();
        assertTrue(firstLeafPath.contains(Constants.R_HEADS));
        String[] split = firstLeafPath.split("/");
        assertEquals(LOCAL_BRANCH_NAME1, split[split.length - 1]);
        List<AbstractAction> actionsForNode = branchTreeMenuActionsProvider.getActionsForNode(firstLeaf);
        for (AbstractAction abstractAction : actionsForNode) {
            if (abstractAction.getValue(AbstractAction.NAME).equals(translator.getTranslation(Tags.CREATE_BRANCH) + "...")) {
                SwingUtilities.invokeLater(() -> {
                    abstractAction.actionPerformed(null);
                });
                flushAWT();
                JDialog createBranchDialog = findDialog(translator.getTranslation(Tags.CREATE_BRANCH));
                JCheckBox checkoutBranchCheckBox = findCheckBox(createBranchDialog, Tags.CHECKOUT_BRANCH);
                assertNotNull(checkoutBranchCheckBox);
                checkoutBranchCheckBox.setSelected(true);
                flushAWT();
                JTextField branchNameTextField = findComponentNearJLabel(createBranchDialog, translator.getTranslation(Tags.BRANCH_NAME) + ": ", JTextField.class);
                branchNameTextField.setText(LOCAL_BRANCH_COPY_NAME);
                JButton okButton = findFirstButton(createBranchDialog, "Create");
                if (okButton != null) {
                    okButton.setEnabled(true);
                    okButton.doClick();
                }
                break;
            }
        }
        sleep(500);
        gitAccess.fetch();
        branchManagementPanel.refreshBranches();
        flushAWT();
        root = (GitTreeNode) (branchManagementPanel.getTree().getModel().getRoot());
        StringBuilder actualTree = new StringBuilder();
        BranchManagementTest.serializeTree(actualTree, root);
        assertEquals("localRepository\n" + "  refs/heads/\n" + "    refs/heads/LocalBranch\n" + "    refs/heads/LocalBranch2\n" + "    refs/heads/LocalBranchCopy\n" + "    refs/heads/" + GitAccess.DEFAULT_BRANCH_NAME + "\n", actualTree.toString());
        assertEquals("LocalBranchCopy", gitAccess.getBranchInfo().getBranchName());
    } finally {
        OptionsManager.getInstance().setCheckoutNewlyCreatedLocalBranch(initialIsCheckoutNewBranch);
    }
}
Also used : FileStatus(com.oxygenxml.git.service.entities.FileStatus) JButton(javax.swing.JButton) GitController(com.oxygenxml.git.view.event.GitController) JTextField(javax.swing.JTextField) JCheckBox(javax.swing.JCheckBox) GitControllerBase(com.oxygenxml.git.service.GitControllerBase) GitTreeNode(com.oxygenxml.git.view.GitTreeNode) File(java.io.File) AbstractAction(javax.swing.AbstractAction) JDialog(javax.swing.JDialog)

Example 10 with GitTreeNode

use of com.oxygenxml.git.view.GitTreeNode in project oxygen-git-client-addon by oxygenxml.

the class BranchActionsTest method testCheckoutRemoteBranchAction.

/**
 * Tests the action of checkout a remote branch.
 *
 * @throws Exception
 */
public void testCheckoutRemoteBranchAction() throws Exception {
    gitAccess.setRepositorySynchronously(REMOTE_TEST_REPOSITORY);
    File file = new File(REMOTE_TEST_REPOSITORY + "remote1.txt");
    file.createNewFile();
    setFileContent(file, "remote content");
    // Make the first commit for the remote repository and create a branch for it.
    gitAccess.add(new FileStatus(GitChangeType.ADD, "remote1.txt"));
    gitAccess.commit("First remote commit.");
    // Create new remote branches
    gitAccess.createBranch(REMOTE_BRANCH_NAME1);
    gitAccess.createBranch(REMOTE_BRANCH_NAME2);
    gitAccess.setRepositorySynchronously(LOCAL_TEST_REPOSITORY);
    gitAccess.fetch();
    String initialBranchName = gitAccess.getBranchInfo().getBranchName();
    assertEquals(GitAccess.DEFAULT_BRANCH_NAME, initialBranchName);
    GitControllerBase mock = new GitController();
    BranchManagementPanel branchManagementPanel = new BranchManagementPanel(mock);
    branchManagementPanel.refreshBranches();
    flushAWT();
    BranchTreeMenuActionsProvider branchTreeMenuActionsProvider = new BranchTreeMenuActionsProvider(mock);
    GitTreeNode root = (GitTreeNode) (branchManagementPanel.getTree().getModel().getRoot());
    // ------------- Checkout the last branch in the tree: REMOTE_BRANCH_NAME2, with the name REMOTE_BRANCH_NAME2_COPY-------------
    GitTreeNode lastLeaf = (GitTreeNode) root.getLastLeaf();
    String lastLeafPath = (String) lastLeaf.getUserObject();
    assertTrue(lastLeafPath.contains(Constants.R_REMOTES));
    String[] branchPath = lastLeafPath.split("/");
    assertEquals(REMOTE_BRANCH_NAME2, branchPath[branchPath.length - 1]);
    AbstractAction checkoutAction = branchTreeMenuActionsProvider.getCheckoutAction(lastLeaf);
    if (checkoutAction != null) {
        SwingUtilities.invokeLater(() -> {
            checkoutAction.actionPerformed(null);
        });
        JDialog checkoutBranchDialog = findDialog(translator.getTranslation(Tags.CHECKOUT_BRANCH));
        if (checkoutBranchDialog != null) {
            JTextField branchNameTextField = findComponentNearJLabel(checkoutBranchDialog, translator.getTranslation(Tags.BRANCH_NAME) + ": ", JTextField.class);
            branchNameTextField.setText(REMOTE_BRANCH_NAME2_COPY);
            JButton firstButtonFound = findFirstButton(checkoutBranchDialog, "Checkout");
            if (firstButtonFound != null) {
                firstButtonFound.setEnabled(true);
                firstButtonFound.doClick();
            }
        }
    }
    sleep(500);
    gitAccess.fetch();
    branchManagementPanel.refreshBranches();
    flushAWT();
    root = (GitTreeNode) (branchManagementPanel.getTree().getModel().getRoot());
    StringBuilder actualTree = new StringBuilder();
    BranchManagementTest.serializeTree(actualTree, root);
    assertEquals("localRepository\n" + "  refs/heads/\n" + "    refs/heads/RemoteBranch2Copy\n" + "  refs/remotes/\n" + "    refs/remotes/origin/\n" + "      refs/remotes/origin/" + GitAccess.DEFAULT_BRANCH_NAME + "\n" + "      refs/remotes/origin/RemoteBranch\n" + "      refs/remotes/origin/RemoteBranch2\n" + "", actualTree.toString());
    // ------------- Checkout the previous branch in the tree: REMOTE_BRANCH_NAME1, with the name REMOTE_BRANCH_NAME1_COPY-------------
    GitTreeNode previousLeaf = (GitTreeNode) lastLeaf.getPreviousLeaf();
    String previousLeafPath = (String) previousLeaf.getUserObject();
    assertTrue(lastLeafPath.contains(Constants.R_REMOTES));
    branchPath = previousLeafPath.split("/");
    assertEquals(REMOTE_BRANCH_NAME1, branchPath[branchPath.length - 1]);
    List<AbstractAction> actionsForNode = branchTreeMenuActionsProvider.getActionsForNode(previousLeaf);
    for (AbstractAction abstractAction : actionsForNode) {
        if (abstractAction.getValue(AbstractAction.NAME).equals(translator.getTranslation(Tags.CHECKOUT) + "...")) {
            SwingUtilities.invokeLater(() -> {
                abstractAction.actionPerformed(null);
            });
            JDialog checkoutDialog = findDialog(translator.getTranslation(Tags.CHECKOUT_BRANCH));
            if (checkoutDialog != null) {
                JTextField branchNameTextField = findComponentNearJLabel(checkoutDialog, translator.getTranslation(Tags.BRANCH_NAME) + ": ", JTextField.class);
                branchNameTextField.setText(REMOTE_BRANCH_NAME1_COPY);
                JButton firstButtonFound = findFirstButton(checkoutDialog, "Checkout");
                if (firstButtonFound != null) {
                    firstButtonFound.setEnabled(true);
                    firstButtonFound.doClick();
                }
            }
            break;
        }
    }
    sleep(500);
    gitAccess.fetch();
    branchManagementPanel.refreshBranches();
    flushAWT();
    root = (GitTreeNode) (branchManagementPanel.getTree().getModel().getRoot());
    actualTree = new StringBuilder();
    BranchManagementTest.serializeTree(actualTree, root);
    assertEquals("localRepository\n" + "  refs/heads/\n" + "    refs/heads/RemoteBranch2Copy\n" + "    refs/heads/RemoteBranchCopy\n" + "  refs/remotes/\n" + "    refs/remotes/origin/\n" + "      refs/remotes/origin/" + GitAccess.DEFAULT_BRANCH_NAME + "\n" + "      refs/remotes/origin/RemoteBranch\n" + "      refs/remotes/origin/RemoteBranch2\n" + "", actualTree.toString());
}
Also used : FileStatus(com.oxygenxml.git.service.entities.FileStatus) JButton(javax.swing.JButton) GitController(com.oxygenxml.git.view.event.GitController) JTextField(javax.swing.JTextField) GitControllerBase(com.oxygenxml.git.service.GitControllerBase) GitTreeNode(com.oxygenxml.git.view.GitTreeNode) File(java.io.File) AbstractAction(javax.swing.AbstractAction) JDialog(javax.swing.JDialog)

Aggregations

GitTreeNode (com.oxygenxml.git.view.GitTreeNode)49 FileStatus (com.oxygenxml.git.service.entities.FileStatus)33 File (java.io.File)30 GitControllerBase (com.oxygenxml.git.service.GitControllerBase)23 AbstractAction (javax.swing.AbstractAction)19 GitController (com.oxygenxml.git.view.event.GitController)18 JButton (javax.swing.JButton)15 TreePath (javax.swing.tree.TreePath)14 Test (org.junit.Test)14 JDialog (javax.swing.JDialog)13 JTree (javax.swing.JTree)8 BranchManagementPanel (com.oxygenxml.git.view.branches.BranchManagementPanel)7 BranchTreeMenuActionsProvider (com.oxygenxml.git.view.branches.BranchTreeMenuActionsProvider)7 JTextField (javax.swing.JTextField)7 JCheckBox (javax.swing.JCheckBox)6 DefaultTreeModel (javax.swing.tree.DefaultTreeModel)5 ArrayList (java.util.ArrayList)4 Date (java.util.Date)4 JLabel (javax.swing.JLabel)4 DefaultMutableTreeNode (javax.swing.tree.DefaultMutableTreeNode)4