From 441dfe8272ec521e39c4ec7d1bb16013bc6f203b Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Wed, 26 Dec 2018 14:35:32 +0300 Subject: [PATCH] Panel API refactoring --- plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF | 1 - .../dbeaver/ui/controls/resultset/IResultSetController.java | 1 - .../ui/controls/resultset/{panel => }/IResultSetPanel.java | 2 +- .../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java | 1 - .../ui/controls/resultset/panel/ResultSetPanelDescriptor.java | 2 +- .../resultset/panel/aggregate/AggregateColumnsPanel.java | 2 +- .../ui/controls/resultset/panel/grouping/GroupingPanel.java | 2 +- .../ui/controls/resultset/panel/metadata/MetaDataPanel.java | 2 +- .../resultset/panel/valueviewer/ValueViewCommandHandler.java | 2 +- .../resultset/panel/valueviewer/ValueViewPropertyTester.java | 2 +- .../controls/resultset/panel/valueviewer/ValueViewerPanel.java | 2 +- 11 files changed, 8 insertions(+), 11 deletions(-) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/{panel => }/IResultSetPanel.java (95%) diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF index 4c00f52805..53fa29821f 100644 --- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF +++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF @@ -33,7 +33,6 @@ Export-Package: org.jkiss.dbeaver, org.jkiss.dbeaver.ui.controls.itemlist, org.jkiss.dbeaver.ui.controls.querylog, org.jkiss.dbeaver.ui.controls.resultset, - org.jkiss.dbeaver.ui.controls.resultset.panel, org.jkiss.dbeaver.ui.controls.resultset.plaintext, org.jkiss.dbeaver.ui.controls.resultset.spreadsheet, org.jkiss.dbeaver.ui.controls.resultset.view, diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/IResultSetController.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/IResultSetController.java index f926a7792d..bdb73b5739 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/IResultSetController.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/IResultSetController.java @@ -36,7 +36,6 @@ import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.struct.DBSDataContainer; import org.jkiss.dbeaver.model.struct.DBSEntityAssociation; -import org.jkiss.dbeaver.ui.controls.resultset.panel.IResultSetPanel; import java.util.List; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/IResultSetPanel.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/IResultSetPanel.java similarity index 95% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/IResultSetPanel.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/IResultSetPanel.java index 2944b62a08..1700369503 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/IResultSetPanel.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/IResultSetPanel.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jkiss.dbeaver.ui.controls.resultset.panel; +package org.jkiss.dbeaver.ui.controls.resultset; import org.eclipse.jface.action.IContributionManager; import org.eclipse.swt.widgets.Composite; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java index 0b32e71728..2b32889663 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java @@ -84,7 +84,6 @@ import org.jkiss.dbeaver.tools.transfer.registry.DataTransferRegistry; import org.jkiss.dbeaver.ui.*; import org.jkiss.dbeaver.ui.controls.ToolbarSeparatorContribution; import org.jkiss.dbeaver.ui.controls.autorefresh.AutoRefreshControl; -import org.jkiss.dbeaver.ui.controls.resultset.panel.IResultSetPanel; import org.jkiss.dbeaver.ui.controls.resultset.panel.ResultSetPanelDescriptor; import org.jkiss.dbeaver.ui.controls.resultset.valuefilter.FilterValueEditDialog; import org.jkiss.dbeaver.ui.controls.resultset.valuefilter.FilterValueEditPopup; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/ResultSetPanelDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/ResultSetPanelDescriptor.java index 0e62195dea..11d7c10b63 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/ResultSetPanelDescriptor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/ResultSetPanelDescriptor.java @@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.DBPImage; import org.jkiss.dbeaver.registry.AbstractContextDescriptor; import org.jkiss.dbeaver.registry.RegistryConstants; import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPresentation; -import org.jkiss.dbeaver.ui.controls.resultset.panel.IResultSetPanel; +import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPanel; import org.jkiss.utils.CommonUtils; import java.util.ArrayList; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/aggregate/AggregateColumnsPanel.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/aggregate/AggregateColumnsPanel.java index 583d187fe8..3d50de7352 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/aggregate/AggregateColumnsPanel.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/aggregate/AggregateColumnsPanel.java @@ -38,7 +38,7 @@ import org.jkiss.dbeaver.ui.DBeaverIcons; import org.jkiss.dbeaver.ui.UIIcon; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.controls.resultset.*; -import org.jkiss.dbeaver.ui.controls.resultset.panel.IResultSetPanel; +import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPanel; import java.math.BigDecimal; import java.text.DecimalFormat; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingPanel.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingPanel.java index 5f841ff2a1..663be53dc9 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingPanel.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingPanel.java @@ -36,7 +36,7 @@ import org.jkiss.dbeaver.ui.DBeaverIcons; import org.jkiss.dbeaver.ui.UIIcon; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.controls.resultset.*; -import org.jkiss.dbeaver.ui.controls.resultset.panel.IResultSetPanel; +import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPanel; import org.jkiss.utils.CommonUtils; import java.util.Collections; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/metadata/MetaDataPanel.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/metadata/MetaDataPanel.java index e6133a0d63..964cae7008 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/metadata/MetaDataPanel.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/metadata/MetaDataPanel.java @@ -38,7 +38,7 @@ import org.jkiss.dbeaver.ui.LoadingJob; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.controls.TreeContentProvider; import org.jkiss.dbeaver.ui.controls.itemlist.DatabaseObjectListControl; -import org.jkiss.dbeaver.ui.controls.resultset.panel.IResultSetPanel; +import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPanel; import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPresentation; import org.jkiss.utils.CommonUtils; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewCommandHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewCommandHandler.java index 4f0f1d2ba0..999ff4d383 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewCommandHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewCommandHandler.java @@ -23,7 +23,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.jkiss.code.Nullable; import org.jkiss.dbeaver.core.CoreCommands; -import org.jkiss.dbeaver.ui.controls.resultset.panel.IResultSetPanel; +import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPanel; import org.jkiss.dbeaver.ui.controls.resultset.ResultSetHandlerMain; import org.jkiss.dbeaver.ui.controls.resultset.ResultSetViewer; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewPropertyTester.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewPropertyTester.java index ef853f1e83..86f843f2da 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewPropertyTester.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewPropertyTester.java @@ -18,7 +18,7 @@ package org.jkiss.dbeaver.ui.controls.resultset.panel.valueviewer; import org.eclipse.core.expressions.PropertyTester; import org.eclipse.ui.IWorkbenchPart; -import org.jkiss.dbeaver.ui.controls.resultset.panel.IResultSetPanel; +import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPanel; import org.jkiss.dbeaver.ui.controls.resultset.ResultSetHandlerMain; import org.jkiss.dbeaver.ui.controls.resultset.ResultSetViewer; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewerPanel.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewerPanel.java index 48e4dddbf4..e4a2f44272 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewerPanel.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewerPanel.java @@ -43,7 +43,7 @@ import org.jkiss.dbeaver.ui.DBeaverIcons; import org.jkiss.dbeaver.ui.UIIcon; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.controls.resultset.*; -import org.jkiss.dbeaver.ui.controls.resultset.panel.IResultSetPanel; +import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPanel; import org.jkiss.dbeaver.ui.data.IValueController; import org.jkiss.dbeaver.ui.data.IValueEditor; import org.jkiss.dbeaver.ui.data.IValueManager; -- GitLab