Search in sources :

Example 1 with ShowBlameForUnstagedResourceAction

use of com.oxygenxml.git.view.staging.actions.ShowBlameForUnstagedResourceAction in project oxygen-git-client-addon by oxygenxml.

the class GitResourceContextualMenu method createAllActions.

/**
 * Creates actions for contextual menu.
 *  @param allSelectedResources  A list with all selected resources.
 * @param selectedLeaves         A list of FileStatus with selected leaves.
 * @param selResProvider         Provides the resources that will be processed by the menu's actions.
 * @param forStagedRes           <code>true</code> if the contextual menu is created for staged files.
 */
private void createAllActions(final List<FileStatus> allSelectedResources, final List<FileStatus> selectedLeaves, final SelectedResourcesProvider selResProvider, final boolean forStagedRes) {
    // "Open in compare editor" action
    showDiffAction = new AbstractAction(TRANSLATOR.getTranslation(Tags.OPEN_IN_COMPARE)) {

        @Override
        public void actionPerformed(ActionEvent e) {
            DiffPresenter.showDiff(selectedLeaves.get(0), gitCtrl);
        }
    };
    // "Open" action
    openAction = new OpenAction(selResProvider);
    // "Stage"/"Unstage" actions
    stageUnstageAction = new StageUnstageResourceAction(allSelectedResources, // then the action should be unstage.
    !forStagedRes, gitCtrl);
    // Resolve using "mine"
    resolveUsingMineAction = new AbstractAction(TRANSLATOR.getTranslation(Tags.RESOLVE_USING_MINE)) {

        @Override
        public void actionPerformed(ActionEvent e) {
            gitCtrl.asyncResolveUsingMine(allSelectedResources);
        }
    };
    // Resolve using "theirs"
    resolveUsingTheirsAction = new AbstractAction(TRANSLATOR.getTranslation(Tags.RESOLVE_USING_THEIRS)) {

        @Override
        public void actionPerformed(ActionEvent e) {
            gitCtrl.asyncResolveUsingTheirs(allSelectedResources);
        }
    };
    // "Mark resolved" action
    markResolvedAction = new AbstractAction(TRANSLATOR.getTranslation(Tags.MARK_RESOLVED)) {

        @Override
        public void actionPerformed(ActionEvent e) {
            try {
                if (FileUtil.containsConflictMarkers(allSelectedResources, GIT_ACCESS.getWorkingCopy())) {
                    int answer = FileStatusDialog.showWarningMessageWithConfirmation(TRANSLATOR.getTranslation(Tags.MARK_RESOLVED), TRANSLATOR.getTranslation(Tags.CONFLICT_MARKERS_MESSAGE), TRANSLATOR.getTranslation(Tags.RESOLVE_ANYWAY), TRANSLATOR.getTranslation(Tags.CANCEL));
                    if (answer == FileStatusDialog.RESULT_OK) {
                        gitCtrl.asyncAddToIndex(allSelectedResources);
                    }
                } else {
                    gitCtrl.asyncAddToIndex(allSelectedResources);
                }
            } catch (Exception err) {
                LOGGER.error(err.getMessage(), err);
            }
        }
    };
    // "Restart Merge" action
    restartMergeAction = new AbstractAction(TRANSLATOR.getTranslation(Tags.RESTART_MERGE)) {

        @Override
        public void actionPerformed(ActionEvent e) {
            String[] options = new String[] { "   " + TRANSLATOR.getTranslation(Tags.YES) + "   ", "   " + TRANSLATOR.getTranslation(Tags.NO) + "   " };
            int[] optionIds = new int[] { 0, 1 };
            int result = GitResourceContextualMenu.PLUGIN_WS.showConfirmDialog(TRANSLATOR.getTranslation(Tags.RESTART_MERGE), TRANSLATOR.getTranslation(Tags.RESTART_MERGE_CONFIRMATION), options, optionIds);
            if (result == optionIds[0]) {
                GIT_ACCESS.restartMerge();
            }
        }
    };
    // "Discard" action
    discardAction = new DiscardAction(selResProvider, gitCtrl);
    if (!forStagedRes) {
        // Show history
        historyAction = new AbstractAction(TRANSLATOR.getTranslation(Tags.SHOW_HISTORY)) {

            @Override
            public void actionPerformed(ActionEvent e) {
                if (!allSelectedResources.isEmpty()) {
                    historyController.showResourceHistory(allSelectedResources.get(0).getFileLocation());
                }
            }
        };
        // "Blame" action
        blameAction = new ShowBlameForUnstagedResourceAction(historyController, selResProvider);
    }
}
Also used : DiscardAction(com.oxygenxml.git.view.staging.actions.DiscardAction) OpenAction(com.oxygenxml.git.view.staging.actions.OpenAction) StageUnstageResourceAction(com.oxygenxml.git.view.staging.actions.StageUnstageResourceAction) ActionEvent(java.awt.event.ActionEvent) ShowBlameForUnstagedResourceAction(com.oxygenxml.git.view.staging.actions.ShowBlameForUnstagedResourceAction) AbstractAction(javax.swing.AbstractAction)

Example 2 with ShowBlameForUnstagedResourceAction

use of com.oxygenxml.git.view.staging.actions.ShowBlameForUnstagedResourceAction in project oxygen-git-client-addon by oxygenxml.

the class BlameTest method testShowBlameFromStagingArea_askUserConfirmation.

/**
 * <p><b>Description:</b> Show blame from staging area. Ask save editor before blame if editor modified.</p>
 * <p><b>Bug ID:</b> EXM-45008</p>
 *
 * @author sorin_carbunaru
 *
 * @throws Exception
 */
@Test
public void testShowBlameFromStagingArea_askUserConfirmation() throws Exception {
    URL script = getClass().getClassLoader().getResource("scripts/blame_script.txt");
    File wcTree = new File("target/gen/BlameTest_testBlame");
    RepoGenerationScript.generateRepository(script, wcTree);
    try {
        GitAccess.getInstance().setRepositorySynchronously(wcTree.getAbsolutePath());
        String content = "Line 1\n" + "Line 2\n" + "Line 3\n" + "Line 4\n" + "Line 5";
        HashMap<Integer, int[]> line2offsets = computeLineMappings(content);
        // Mock plugin workspace
        StandalonePluginWorkspace pluginWSMock = Mockito.mock(StandalonePluginWorkspace.class);
        PluginWorkspaceProvider.setPluginWorkspace(pluginWSMock);
        // Mock "open()"
        Mockito.when(pluginWSMock.open(Mockito.any(), Mockito.any(), Mockito.any())).thenReturn(true);
        // Mock util access
        UtilAccess utilAcces = Mockito.mock(UtilAccess.class);
        Mockito.when(utilAcces.correctURL(Mockito.anyString())).thenReturn("");
        Mockito.when(pluginWSMock.getUtilAccess()).thenReturn(utilAcces);
        // Mock confirmation
        boolean[] confirmDialogShown = new boolean[1];
        Mockito.doAnswer(new Answer<Integer>() {

            @Override
            public Integer answer(InvocationOnMock invocation) throws Throwable {
                confirmDialogShown[0] = true;
                return 0;
            }
        }).when(pluginWSMock).showConfirmDialog(Mockito.anyString(), Mockito.anyString(), Mockito.any(), Mockito.any());
        // Mock editor and page
        boolean[] editorSaved = new boolean[1];
        WSEditor wsEditor = Mockito.mock(WSEditor.class);
        Mockito.when(wsEditor.isModified()).thenReturn(true);
        Mockito.when(pluginWSMock.getEditorAccess(Mockito.any(), Mockito.anyInt())).thenReturn(wsEditor);
        Mockito.doAnswer(new Answer<Void>() {

            @Override
            public Void answer(InvocationOnMock invocation) throws Throwable {
                editorSaved[0] = true;
                return null;
            }
        }).when(wsEditor).save();
        Mockito.doNothing().when(wsEditor).changePage(Mockito.anyString());
        WSXMLTextEditorPage page = Mockito.mock(WSXMLTextEditorPage.class);
        JTextArea textArea = new JTextArea();
        Mockito.when(page.getTextComponent()).thenReturn(textArea);
        Mockito.when(wsEditor.getCurrentPage()).thenReturn(page);
        // Methods for mapping lines to offsets and back.
        Mockito.when(page.getOffsetOfLineStart(Mockito.anyInt())).thenAnswer(new Answer<Integer>() {

            @Override
            public Integer answer(InvocationOnMock invocation) throws Throwable {
                Object key = invocation.getArguments()[0];
                return line2offsets.get(key)[0];
            }
        });
        Mockito.when(page.getOffsetOfLineEnd(Mockito.anyInt())).thenAnswer(new Answer<Integer>() {

            @Override
            public Integer answer(InvocationOnMock invocation) throws Throwable {
                return line2offsets.get(invocation.getArguments()[0])[1];
            }
        });
        Mockito.when(page.getLineOfOffset(Mockito.anyInt())).thenAnswer(new Answer<Integer>() {

            @Override
            public Integer answer(InvocationOnMock invocation) throws Throwable {
                int offset = (int) invocation.getArguments()[0];
                for (Integer line : line2offsets.keySet()) {
                    int[] is = line2offsets.get(line);
                    if (is[0] <= offset && offset < is[1]) {
                        return line;
                    }
                }
                return -1;
            }
        });
        // Intercept history view requests.
        final List<RevCommit> commits = new ArrayList<>();
        HistoryController historyController = Mockito.mock(HistoryController.class);
        Mockito.doAnswer(new Answer<Void>() {

            @Override
            public Void answer(InvocationOnMock invocation) throws Throwable {
                RevCommit rev = (RevCommit) invocation.getArguments()[1];
                commits.add(rev);
                return null;
            }
        }).when(historyController).showCommit(Mockito.anyString(), Mockito.any());
        Mockito.when(historyController.isHistoryShowing()).thenReturn(Boolean.TRUE);
        textArea.setText(content);
        flushAWT();
        // >>> Show blame <<<
        ShowBlameForUnstagedResourceAction showBlameAction = new ShowBlameForUnstagedResourceAction(historyController, new SelectedResourcesProvider() {

            @Override
            public List<FileStatus> getOnlySelectedLeaves() {
                return null;
            }

            @Override
            public List<FileStatus> getAllSelectedResources() {
                return Arrays.asList(new FileStatus(GitChangeType.MODIFIED, "file1.txt"));
            }
        });
        showBlameAction.actionPerformed(null);
        assertTrue(confirmDialogShown[0]);
        assertTrue(editorSaved[0]);
        Highlight[] highlights = textArea.getHighlighter().getHighlights();
        assertEquals(5, highlights.length);
        String expected = dumpOffsetMap(line2offsets);
        String actual = dumpHighlights(highlights);
        assertEquals(expected, actual);
    } finally {
        GitAccess.getInstance().closeRepo();
        FileUtils.deleteDirectory(wcTree);
    }
}
Also used : JTextArea(javax.swing.JTextArea) FileStatus(com.oxygenxml.git.service.entities.FileStatus) Highlight(javax.swing.text.Highlighter.Highlight) SelectedResourcesProvider(com.oxygenxml.git.view.staging.ChangesPanel.SelectedResourcesProvider) ArrayList(java.util.ArrayList) UtilAccess(ro.sync.exml.workspace.api.util.UtilAccess) URL(java.net.URL) HistoryController(com.oxygenxml.git.view.history.HistoryController) ArrayList(java.util.ArrayList) List(java.util.List) RevCommit(org.eclipse.jgit.revwalk.RevCommit) WSXMLTextEditorPage(ro.sync.exml.workspace.api.editor.page.text.xml.WSXMLTextEditorPage) ShowBlameForUnstagedResourceAction(com.oxygenxml.git.view.staging.actions.ShowBlameForUnstagedResourceAction) WSEditor(ro.sync.exml.workspace.api.editor.WSEditor) InvocationOnMock(org.mockito.invocation.InvocationOnMock) StandalonePluginWorkspace(ro.sync.exml.workspace.api.standalone.StandalonePluginWorkspace) File(java.io.File) Test(org.junit.Test)

Aggregations

ShowBlameForUnstagedResourceAction (com.oxygenxml.git.view.staging.actions.ShowBlameForUnstagedResourceAction)2 FileStatus (com.oxygenxml.git.service.entities.FileStatus)1 HistoryController (com.oxygenxml.git.view.history.HistoryController)1 SelectedResourcesProvider (com.oxygenxml.git.view.staging.ChangesPanel.SelectedResourcesProvider)1 DiscardAction (com.oxygenxml.git.view.staging.actions.DiscardAction)1 OpenAction (com.oxygenxml.git.view.staging.actions.OpenAction)1 StageUnstageResourceAction (com.oxygenxml.git.view.staging.actions.StageUnstageResourceAction)1 ActionEvent (java.awt.event.ActionEvent)1 File (java.io.File)1 URL (java.net.URL)1 ArrayList (java.util.ArrayList)1 List (java.util.List)1 AbstractAction (javax.swing.AbstractAction)1 JTextArea (javax.swing.JTextArea)1 Highlight (javax.swing.text.Highlighter.Highlight)1 RevCommit (org.eclipse.jgit.revwalk.RevCommit)1 Test (org.junit.Test)1 InvocationOnMock (org.mockito.invocation.InvocationOnMock)1 WSEditor (ro.sync.exml.workspace.api.editor.WSEditor)1 WSXMLTextEditorPage (ro.sync.exml.workspace.api.editor.page.text.xml.WSXMLTextEditorPage)1