Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '15406_data_extract' into 'master'
15406 data extract See merge request codekeeper/codekeeper!302
- Loading branch information
Showing
10 changed files
with
262 additions
and
10 deletions.
There are no files selected for viewing
3 changes: 3 additions & 0 deletions
3
apgdiff/src/main/java/cz/startnet/utils/pgdiff/IProgressReporter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,11 @@ | ||
| package cz.startnet.utils.pgdiff; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public interface IProgressReporter { | ||
| void writeMessage(String message); | ||
| void writeWarning(String message); | ||
| void writeError(String message); | ||
| void terminate(); | ||
| void showData(String query, List<List<Object>> Object); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
172 changes: 172 additions & 0 deletions
172
ru.taximaxim.codekeeper.ui/src/ru/taximaxim/codekeeper/ui/views/ResultSetView.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| package ru.taximaxim.codekeeper.ui.views; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import org.eclipse.jface.viewers.ArrayContentProvider; | ||
| import org.eclipse.jface.viewers.ColumnLabelProvider; | ||
| import org.eclipse.jface.viewers.ColumnViewer; | ||
| import org.eclipse.jface.viewers.IStructuredSelection; | ||
| import org.eclipse.jface.viewers.TableViewer; | ||
| import org.eclipse.jface.viewers.TableViewerColumn; | ||
| import org.eclipse.jface.viewers.ViewerCell; | ||
| import org.eclipse.jface.viewers.ViewerColumn; | ||
| import org.eclipse.swt.SWT; | ||
| import org.eclipse.swt.custom.CTabFolder; | ||
| import org.eclipse.swt.custom.CTabItem; | ||
| import org.eclipse.swt.dnd.Clipboard; | ||
| import org.eclipse.swt.dnd.TextTransfer; | ||
| import org.eclipse.swt.dnd.Transfer; | ||
| import org.eclipse.swt.events.KeyAdapter; | ||
| import org.eclipse.swt.events.KeyEvent; | ||
| import org.eclipse.swt.layout.GridData; | ||
| import org.eclipse.swt.layout.GridLayout; | ||
| import org.eclipse.swt.widgets.Composite; | ||
| import org.eclipse.swt.widgets.Label; | ||
| import org.eclipse.ui.part.ViewPart; | ||
|
|
||
| import cz.startnet.utils.pgdiff.PgDiffUtils; | ||
| import ru.taximaxim.codekeeper.apgdiff.fileutils.FileUtils; | ||
| import ru.taximaxim.codekeeper.ui.UIConsts; | ||
|
|
||
| public class ResultSetView extends ViewPart { | ||
|
|
||
| private CTabFolder tabFolder; | ||
|
|
||
| @Override | ||
| public void createPartControl(Composite parent) { | ||
| tabFolder = new CTabFolder(parent, SWT.BOTTOM); | ||
| GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); | ||
| gd.widthHint = 700; | ||
| tabFolder.setLayoutData(gd); | ||
| } | ||
|
|
||
| public void addData(String query, List<List<Object>> results) { | ||
| if (results.isEmpty()) { | ||
| return; | ||
| } | ||
|
|
||
| Composite tabComposite = new Composite(tabFolder, SWT.NONE); | ||
| tabComposite.setLayout(new GridLayout()); | ||
| tabComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); | ||
|
|
||
| CTabItem tabItem = new CTabItem(tabFolder, SWT.CLOSE); | ||
| tabItem.setText(FileUtils.getFileDate()); | ||
| tabItem.setControl(tabComposite); | ||
|
|
||
| Label l = new Label(tabComposite, SWT.NONE); | ||
|
|
||
| String preview = query.replaceAll("\\s+", " ").trim(); //$NON-NLS-1$ //$NON-NLS-2$ | ||
| l.setText(preview.length() > 60 ? preview.substring(0, 60) + " <...> " : preview); //$NON-NLS-1$ | ||
| l.setToolTipText(query); | ||
|
|
||
| TableViewer viewer = new TableViewer(tabComposite); | ||
|
|
||
| viewer.setContentProvider(ArrayContentProvider.getInstance()); | ||
| viewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH)); | ||
| viewer.getTable().setLinesVisible(true); | ||
| viewer.getTable().setHeaderVisible(true); | ||
|
|
||
| viewer.getTable().addKeyListener(new KeyAdapter() { | ||
|
|
||
| @Override | ||
| public void keyPressed(KeyEvent e) { | ||
| IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); | ||
| if (selection.isEmpty() || (e.stateMask & SWT.CTRL) != SWT.CTRL || e.keyCode != 'c') { | ||
| return; | ||
| } | ||
|
|
||
| StringBuilder sb = new StringBuilder(); | ||
| for (Object r : selection.toList()) { | ||
| List<?> row = (List<?>) r; | ||
| for (Object val : row) { | ||
| sb.append(valueForCsv(val)); | ||
| sb.append(','); | ||
| } | ||
| // remove trailing comma | ||
| sb.setLength(sb.length() - 1); | ||
| sb.append(UIConsts._NL); | ||
| } | ||
|
|
||
| final Clipboard cb = new Clipboard(viewer.getControl().getDisplay()); | ||
| cb.setContents(new Object[] {sb.toString()}, new Transfer[] {TextTransfer.getInstance()}); | ||
| } | ||
| }); | ||
|
|
||
|
|
||
| List<Object> names = results.get(0); | ||
|
|
||
| TableViewerColumn num = new TableViewerColumn(viewer, SWT.LEFT); | ||
| num.getColumn().setResizable(true); | ||
| num.setLabelProvider(new RowNumberLabelProvider()); | ||
| num.getColumn().setWidth(40); | ||
|
|
||
| for (int i = 0; i < names.size(); i++) { | ||
| TableViewerColumn col = new TableViewerColumn(viewer, SWT.LEFT); | ||
| col.getColumn().setResizable(true); | ||
| col.getColumn().setMoveable(true); | ||
| col.getColumn().setText(names.get(i).toString()); | ||
| col.setLabelProvider(new IndexedColumnLabelProvider(i)); | ||
| col.getColumn().setWidth(150); | ||
| } | ||
|
|
||
| viewer.setInput(results.subList(1, results.size())); | ||
| tabFolder.setSelection(tabItem); | ||
| } | ||
|
|
||
| @Override | ||
| public void setFocus() { | ||
| tabFolder.setFocus(); | ||
| } | ||
|
|
||
| private String valueForCsv(Object val) { | ||
| if (val == null) { | ||
| return ""; //$NON-NLS-1$ | ||
| } | ||
| String s = val.toString(); | ||
| if (s.isEmpty() || s.indexOf(',') != -1 || s.indexOf(';') != -1 | ||
| || s.indexOf('\n') != -1 || s.indexOf('"') != -1) { | ||
| return PgDiffUtils.quoteName(s); | ||
| } else { | ||
| return s; | ||
| } | ||
| } | ||
|
|
||
| private static class IndexedColumnLabelProvider extends ColumnLabelProvider { | ||
| private final int i; | ||
|
|
||
| private IndexedColumnLabelProvider(int i) { | ||
| this.i = i; | ||
| } | ||
|
|
||
| @Override | ||
| public String getText(Object element) { | ||
| List<?> l = (List<?>) element; | ||
| Object obj = l.get(i); | ||
| return obj == null ? "<NULL>" : obj.toString(); //$NON-NLS-1$ | ||
| } | ||
| } | ||
|
|
||
| private static class RowNumberLabelProvider extends ColumnLabelProvider { | ||
|
|
||
| private TableViewer viewer; | ||
|
|
||
| @Override | ||
| protected void initialize(ColumnViewer viewer, ViewerColumn column) { | ||
| super.initialize(viewer, column); | ||
| this.viewer = null; | ||
| if (viewer instanceof TableViewer) { | ||
| this.viewer = (TableViewer) viewer; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void update(ViewerCell cell) { | ||
| super.update(cell); | ||
| if (viewer != null) { | ||
| int index = Arrays.asList(viewer.getTable().getItems()).indexOf(cell.getItem()); | ||
| cell.setText("" + (index + 1)); //$NON-NLS-1$ | ||
| } | ||
| } | ||
| } | ||
| } |