Skip to content

[FIX] Copy action #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIX] Copy action #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 108 additions & 22 deletions org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/repositories/AbapGitView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,18 @@
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.ISharedImages;
Expand Down Expand Up @@ -104,13 +109,16 @@ public class AbapGitView extends ViewPart implements IAbapGitRepositoriesView {
protected TableViewer viewer;
protected Action actionRefresh, actionWizard, actionCopy, actionOpen, actionShowMyRepos, actionPullWizard, actionOpenRepository,
actionSwitchBranch;
private Action actionCopyCell;
private Action actionCopyRow;
private ISelection lastSelection;
protected IProject lastProject;
private ViewerFilter searchFilter;
private TablePatternFilter tableFilter;
protected Text searchText;
protected IAbapGitService abapGitService;
protected IRepositoryService repoService;
protected int focusedColumnIndex = -1;

//key binding for copy text
private static final KeyStroke KEY_STROKE_COPY = KeyStroke.getInstance(SWT.MOD1, 'C' | 'c');
Expand Down Expand Up @@ -151,7 +159,7 @@ public void selectionChanged(IWorkbenchPart part, ISelection selection) {
public void init(IViewSite site) throws PartInitException {
super.init(site);

// Create a new abapGit service when AbapGit Repositories View is opened.
// Create a new abapGit service when AbapGit Repositories View is opened.
if (this.abapGitService == null) {
this.abapGitService = AbapGitUIServiceFactory.createAbapGitService();
}
Expand Down Expand Up @@ -272,6 +280,27 @@ private void setupViewer(Composite parent) {
createColumns();
this.viewer.setContentProvider(ArrayContentProvider.getInstance());
addKeyListeners();

// Add Mouse Listener to track focused cell for copy operation
table.addMouseListener(new MouseAdapter() {
@Override
public void mouseDown(MouseEvent e) {
Point pt = new Point(e.x, e.y);
TableItem item = table.getItem(pt);
if (item == null) {
AbapGitView.this.focusedColumnIndex = -1;
return;
}
for (int i = 0; i < table.getColumnCount(); i++) {
Rectangle rect = item.getBounds(i);
if (rect.contains(pt)) {
AbapGitView.this.focusedColumnIndex = i;
return; // Found the column
}
}
AbapGitView.this.focusedColumnIndex = -1;
}
});
}

private void createColumns() {
Expand Down Expand Up @@ -413,8 +442,17 @@ public void menuAboutToShow(IMenuManager manager) {
manager.add(AbapGitView.this.actionSwitchBranch);
//separator
manager.add(new Separator());
//copy to clip-board action
manager.add(AbapGitView.this.actionCopy);

// Create the sub-menu for Copy
MenuManager copySubMenu = new MenuManager("Copy");

// Enable "Copy Cell" only if a cell has focus
AbapGitView.this.actionCopyCell.setEnabled(AbapGitView.this.focusedColumnIndex != -1);

copySubMenu.add(AbapGitView.this.actionCopyCell);
copySubMenu.add(AbapGitView.this.actionCopyRow);
manager.add(copySubMenu);

//unlink action
if (AbapGitView.this.repoService.getURIFromAtomLink(repository, IRepositoryService.RELATION_PULL) != null) {
manager.add(new Separator());
Expand Down Expand Up @@ -487,6 +525,20 @@ public void run() {
this.actionCopy.setActionDefinitionId(ActionFactory.COPY.getCommandId());
this.actionCopy.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY));

this.actionCopyCell = new Action("Copy Cell") {
@Override
public void run() {
copyCell();
}
};

this.actionCopyRow = new Action("Copy Row") {
@Override
public void run() {
copyRow();
}
};

this.actionOpen = new Action() {
public void run() {
if (!AdtLogonServiceUIFactory.createLogonServiceUI().ensureLoggedOn(AbapGitView.this.lastProject).isOK()) {
Expand Down Expand Up @@ -524,8 +576,7 @@ public void run() {
return;
}
AbapGitWizard abapGitWizard = new AbapGitWizard(AbapGitView.this.lastProject);
WizardDialog wizardDialog = new WizardDialog(AbapGitView.this.viewer.getControl().getShell(),
abapGitWizard);
WizardDialog wizardDialog = new WizardDialog(AbapGitView.this.viewer.getControl().getShell(), abapGitWizard);
wizardDialog.open();
updateView(true);

Expand Down Expand Up @@ -655,7 +706,7 @@ private void updateView(boolean ensureLogon) {
setControlsEnabled(true);

//TODO: Remove this check once the 2302 back-end is updated
if(this.abapGitService.isFolderLogicAvailable(repos)) {
if (this.abapGitService.isFolderLogicAvailable(repos)) {
setFolderLogicColumnVisible(true);
} else {
setFolderLogicColumnVisible(false);
Expand Down Expand Up @@ -695,15 +746,47 @@ private void setControlsEnabled(boolean enabled) {
}

/**
* Copies the current selection to the clipboard.
*
* @param table
* the data source
* Copies the current selection to the clipboard using smart detection.
* Called by the toolbar and Ctrl+C keybinding.
*/
protected void copy() {
Object selection = AbapGitView.this.viewer.getStructuredSelection().getFirstElement();
if (selection != null && selection instanceof IRepository) {
IRepository currRepository = ((IRepository) selection);
// Check if a specific cell was clicked
if (this.focusedColumnIndex != -1) {
copyCell();
} else {
copyRow();
}
}

/**
* Copies only the content of the focused table cell to the clipboard.
*/
private void copyCell() {
final Clipboard clipboard = new Clipboard(this.viewer.getControl().getDisplay());
String textToCopy = null;

TableItem[] selection = this.viewer.getTable().getSelection();
if (selection.length > 0 && this.focusedColumnIndex != -1) {
textToCopy = selection[0].getText(this.focusedColumnIndex);
}

if (textToCopy != null && !textToCopy.isEmpty()) {
clipboard.setContents(new String[] { textToCopy }, new TextTransfer[] { TextTransfer.getInstance() });
}
clipboard.dispose();
}

/**
* Copies a formatted string representing the entire selected row to the
* clipboard.
*/
private void copyRow() {
final Clipboard clipboard = new Clipboard(this.viewer.getControl().getDisplay());
String textToCopy = null;

Object selection = this.viewer.getStructuredSelection().getFirstElement();
if (selection instanceof IRepository) {
IRepository currRepository = (IRepository) selection;

String repoStatusString = currRepository.getStatusText() == null ? "" : currRepository.getStatusText(); //$NON-NLS-1$
String repoUserString = currRepository.getCreatedEmail() == null ? currRepository.getCreatedBy()
Expand All @@ -716,13 +799,17 @@ protected void copy() {
String repoLastChangedString = getFormattedDate(lastChangedAt);

final StringBuilder data = new StringBuilder();
data.append(currRepository.getPackage() + " " + currRepository.getUrl() + " " + currRepository.getBranchName() + " " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ repoUserString + " " + repoLastChangedString + " " + repoStatusString); //$NON-NLS-1$ //$NON-NLS-2$
data.append(currRepository.getPackage()).append("\t").append(currRepository.getUrl()).append("\t") //$NON-NLS-1$ //$NON-NLS-2$
.append(currRepository.getBranchName()).append("\t").append(repoUserString).append("\t") //$NON-NLS-1$ //$NON-NLS-2$
.append(repoLastChangedString).append("\t").append(repoStatusString); //$NON-NLS-1$

textToCopy = data.toString();
}

final Clipboard clipboard = new Clipboard(AbapGitView.this.viewer.getControl().getDisplay());
clipboard.setContents(new String[] { data.toString() }, new TextTransfer[] { TextTransfer.getInstance() });
clipboard.dispose();
if (textToCopy != null && !textToCopy.isEmpty()) {
clipboard.setContents(new String[] { textToCopy }, new TextTransfer[] { TextTransfer.getInstance() });
}
clipboard.dispose();
}

private String getFormattedDate(String lastChangedAt) {
Expand Down Expand Up @@ -835,8 +922,7 @@ public void run() {
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
RepositoryServiceFactory
.createRepositoryService(AbapGitView.this.abapGitService.getDestination(UnlinkAction.this.project),
monitor)
.createRepositoryService(AbapGitView.this.abapGitService.getDestination(UnlinkAction.this.project), monitor)
.unlinkRepository(UnlinkAction.this.repository.getKey(), monitor);
}
});
Expand Down Expand Up @@ -879,8 +965,8 @@ public void run() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {

IAbapObjects abapObjects = RepositoryServiceFactory
.createRepositoryService(
AbapGitView.this.abapGitService.getDestination(GetObjLogAction.this.project), monitor)
.createRepositoryService(AbapGitView.this.abapGitService.getDestination(GetObjLogAction.this.project),
monitor)
.getRepoObjLog(monitor, GetObjLogAction.this.repository);

objectLogItems.addAll(
Expand Down
70 changes: 70 additions & 0 deletions ...t.ui.test/src/org/abapgit/adt/ui/internal/repositories/TestsPdeAbapGitViewCopyAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package org.abapgit.adt.ui.internal.repositories;

import static org.junit.Assert.*;

import org.abapgit.adt.backend.model.abapgitrepositories.IRepository;
import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

public class TestsPdeAbapGitViewCopyAction {
private AbapGitView abapGitView;
private TestsPdeAbapGitRepositoriesUtil util;
private Display display;

@Before
public void setUp() throws Exception {
util = new TestsPdeAbapGitRepositoriesUtil();
abapGitView = util.initializeView();
display = Display.getDefault();
}

@After
public void tearDown() {
if (abapGitView != null && abapGitView.viewer != null) {
abapGitView.viewer.getControl().dispose();
}
}

@Test
public void testCopyActionRowSelection() {
IRepository repo = util.createDummyRepository();
abapGitView.viewer.setInput(java.util.Arrays.asList(repo));
Table table = abapGitView.viewer.getTable();
table.select(0);
TableItem item = table.getItem(0);
item.setData(repo);
abapGitView.focusedColumnIndex = -1; // Simulate row selection
abapGitView.copy();
Clipboard clipboard = new Clipboard(display);
String result = (String) clipboard.getContents(TextTransfer.getInstance());
assertTrue(result.contains("$AP_GITHUB"));
assertTrue(result.contains("https://github.com/dummy_url"));
assertTrue(result.contains("refs/heads/master"));
assertTrue(result.contains("[email protected]"));
assertTrue(result.contains("2020-03-22 18:05:03"));
assertTrue(result.contains("dummy_status"));
clipboard.dispose();
}

@Test
public void testCopyActionCellSelection() {
IRepository repo = util.createDummyRepository();
abapGitView.viewer.setInput(java.util.Arrays.asList(repo));
Table table = abapGitView.viewer.getTable();
table.select(0);
TableItem item = table.getItem(0);
item.setData(repo);
abapGitView.focusedColumnIndex = 0; // Simulate cell selection (Package column)
abapGitView.copy();
Clipboard clipboard = new Clipboard(display);
String result = (String) clipboard.getContents(TextTransfer.getInstance());
assertEquals("$AP_GITHUB", result);
clipboard.dispose();
}
}