#10 Data editors plugin extraction

Former-commit-id: 9aebc488

plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF

@@ -122,6 +122,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.ui;visibility:=reexport,
  org.jkiss.dbeaver.ui.editors.base;visibility:=reexport,
+ org.jkiss.dbeaver.ui.editors.data;visibility:=reexport,
  org.jkiss.utils;visibility:=reexport,
  org.jkiss.dbeaver.data.transfer,
  org.jkiss.bundle.bouncycastle;resolution:=optional

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java

@@ -1375,9 +1375,6 @@ public class CoreMessages extends NLS {
 	public static String toolbar_cmd_redo_name;
 	//toolbar editor menu item
 
-	public static String grid_tooltip_sort_by_column;
-	public static String grid_tooltip_filter_by_column;
-
 	public static String CreateLinkHandler_e_create_link_message;
 	public static String CreateLinkHandler_e_create_link_title;
 	public static String CreateLinkHandler_e_create_link_validation;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties

@@ -1329,9 +1329,6 @@ toolbar_cmd_undo_name = Undo
 toolbar_cmd_redo_name = Redo
 ##toolbar editor menu item##
 
-grid_tooltip_sort_by_column = Sort by column
-grid_tooltip_filter_by_column = Filter by column value
-
 CreateLinkHandler_e_create_link_message=Unable to create link
 CreateLinkHandler_e_create_link_title=Create link
 CreateLinkHandler_e_create_link_validation=Unable to create link inside {0}

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties

@@ -1475,10 +1475,6 @@ editors_sql_status_statement_executed_no_rows_updated = Anweisung ausgef\u00FChr
 
 editors_sql_staus_connected_to = Verbunden mit ''
 
-grid_tooltip_filter_by_column = Filtern mit Spaltenwert
-
-grid_tooltip_sort_by_column = Sortieren mit Spalte
-
 model_html_read_database_meta_data = Datenbank Metadaten lesen
 
 model_jdbc_bad_content_value_ = Schlechter Inhaltswert:

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_fr.properties

@@ -1825,6 +1825,3 @@ pref_page_error_handle_recover_retry_count_tip = Nombre de tentatives de reconne
 toolbar_cmd_undo_name = Annuler
 toolbar_cmd_redo_name = Refaire
 ##toolbar editor menu item##
-
-grid_tooltip_sort_by_column = Trier par colonne
-grid_tooltip_filter_by_column = Filtrer par la valeur de colonne

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties

@@ -1478,10 +1478,6 @@ editors_sql_status_statement_executed_no_rows_updated = \u8BED\u53E5\u5DF2\u6267
 
 editors_sql_staus_connected_to = \u8FDE\u63A5\u5230 ''
 
-grid_tooltip_filter_by_column = \u6309\u5217\u503C\u8FC7\u6EE4
-
-grid_tooltip_sort_by_column = \u6309\u5217\u8FC7\u6EE4
-
 model_html_read_database_meta_data = \u8BFB\u53D6\u6570\u636E\u5E93\u5143\u6570\u636E
 
 model_jdbc_bad_content_value_ = \u65E0\u6548\u5185\u5BB9: 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/panel/grouping/GroupingResultsDecorator.java

@@ -29,8 +29,6 @@ import org.jkiss.dbeaver.model.DBPEvaluationContext;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.sql.SQLDialect;
 import org.jkiss.dbeaver.model.sql.SQLUtils;
-import org.jkiss.dbeaver.model.struct.DBSDataContainer;
-import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
 import org.jkiss.dbeaver.ui.controls.lightgrid.LightGrid;
 import org.jkiss.dbeaver.ui.controls.resultset.IResultSetDecorator;

plugins/org.jkiss.dbeaver.ui.editors.data/META-INF/MANIFEST.MF

@@ -7,6 +7,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Release-Date: 20181224
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.jkiss.dbeaver.ui.editors.data.internal.DataEditorsActivator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.core.expressions,
@@ -15,4 +16,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ui.editors.base
 Bundle-ClassPath: .
-Export-Package: org.jkiss.dbeaver.ui.editors.data
+Export-Package: org.jkiss.dbeaver.ui.controls.lightgrid,
+ org.jkiss.dbeaver.ui.controls.resultset,
+ org.jkiss.dbeaver.ui.editors.data

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridCellRenderer.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridCellRenderer.java

@@ -19,12 +19,10 @@ package org.jkiss.dbeaver.ui.controls.lightgrid;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.*;
-import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.TextUtils;
 import org.jkiss.dbeaver.ui.UIIcon;
-import org.jkiss.dbeaver.ui.UIUtils;
 
 /**
  * Grid cell renderer

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java

@@ -30,10 +30,10 @@ import org.eclipse.ui.progress.UIJob;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dnd.LocalObjectTransfer;
+import org.jkiss.dbeaver.ui.editors.data.internal.DataEditorsMessages;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.IntKeyMap;
@@ -3727,9 +3727,9 @@ public abstract class LightGrid extends Canvas {
             } else if (columnHeadersVisible && hoveringColumn != null && y <= headerHeight) {
                 // get column header specific tooltip
                 if (hoveringOnColumnSorter) {
-                    newTip = NLS.bind(CoreMessages.grid_tooltip_sort_by_column, getLabelProvider().getText(hoveringColumn.getElement()));
+                    newTip = NLS.bind(DataEditorsMessages.grid_tooltip_sort_by_column, getLabelProvider().getText(hoveringColumn.getElement()));
                 } else if (hoveringOnColumnFilter) {
-                    newTip = NLS.bind(CoreMessages.grid_tooltip_filter_by_column, getLabelProvider().getText(hoveringColumn.getElement()));
+                    newTip = NLS.bind(DataEditorsMessages.grid_tooltip_filter_by_column, getLabelProvider().getText(hoveringColumn.getElement()));
                 } else {
                     newTip = hoveringColumn.getHeaderTooltip();
                 }

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsActivator.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jkiss.dbeaver.ui.editors.data.internal;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.jkiss.dbeaver.runtime.DBeaverNotifications;
+import org.jkiss.dbeaver.ui.notifications.NotificationUtils;
+import org.osgi.framework.BundleContext;
+
+public class DataEditorsActivator extends AbstractUIPlugin {
+
+    // The plug-in ID
+    public static final String PLUGIN_ID = "org.jkiss.dbeaver.ui.editors.data";
+
+    // The shared instance
+    private static DataEditorsActivator plugin;
+
+    public DataEditorsActivator() {
+    }
+
+    @Override
+    public void start(BundleContext context) throws Exception {
+        super.start(context);
+        plugin = this;
+    }
+
+    @Override
+    public void stop(BundleContext context) throws Exception {
+        plugin = null;
+        super.stop(context);
+    }
+
+    public static DataEditorsActivator getDefault() {
+        return plugin;
+    }
+
+    public static ImageDescriptor getImageDescriptor(String path) {
+        return imageDescriptorFromPlugin(PLUGIN_ID, path);
+    }
+}

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsMessages.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
+ * Copyright (C) 2011-2012 Eugene Fradkin (eugene.fradkin@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jkiss.dbeaver.ui.editors.data.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+public class DataEditorsMessages extends NLS {
+	static final String BUNDLE_NAME = "org.jkiss.dbeaver.ui.editors.data.internal.DataEditorsResources"; //$NON-NLS-1$
+
+	public static String grid_tooltip_sort_by_column;
+	public static String grid_tooltip_filter_by_column;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, DataEditorsMessages.class);
+	}
+
+	private DataEditorsMessages() {
+	}
+}

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources.properties

+grid_tooltip_sort_by_column = Sort by column
+grid_tooltip_filter_by_column = Filter by column value
+

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_de.properties

+grid_tooltip_filter_by_column = Filtern mit Spaltenwert
+grid_tooltip_sort_by_column = Sortieren mit Spalte

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_fr.properties

+grid_tooltip_sort_by_column = Trier par colonne
+grid_tooltip_filter_by_column = Filtrer par la valeur de colonne

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_ru.properties

+grid_tooltip_sort_by_column = \u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0430 \u043F\u043E \u043A\u043E\u043B\u043E\u043D\u043A\u0435
+grid_tooltip_filter_by_column = \u0424\u0438\u043B\u044C\u0442\u0440 \u043F\u043E \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044E \u043A\u043E\u043B\u043E\u043D\u043A\u0438

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_zh.properties

+grid_tooltip_filter_by_column = \u6309\u5217\u503C\u8FC7\u6EE4
+grid_tooltip_sort_by_column = \u6309\u5217\u8FC7\u6EE4
+

plugins/org.jkiss.dbeaver.ui/META-INF/MANIFEST.MF

@@ -6,7 +6,7 @@ Bundle-SymbolicName: org.jkiss.dbeaver.ui;singleton:=true
 Bundle-Version: 5.1.15.qualifier
 Bundle-Release-Date: 20190107
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Activator: org.jkiss.dbeaver.bundle.UIActivator
+Bundle-Activator: org.jkiss.dbeaver.ui.internal.UIActivator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.jkiss.dbeaver.runtime,
  org.jkiss.dbeaver.ui,

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/ContextSearchAction.java

@@ -17,10 +17,7 @@
 package org.jkiss.dbeaver.ui;
 
 import org.eclipse.jface.action.Action;
-import org.jkiss.dbeaver.bundle.UIMessages;
-import org.jkiss.dbeaver.ui.DBeaverIcons;
-import org.jkiss.dbeaver.ui.ISearchContextProvider;
-import org.jkiss.dbeaver.ui.UIIcon;
+import org.jkiss.dbeaver.ui.internal.UIMessages;
 
 /**
  * Context search action

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/LoadingJob.java

@@ -19,7 +19,7 @@ package org.jkiss.dbeaver.ui;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.bundle.UIActivator;
+import org.jkiss.dbeaver.ui.internal.UIActivator;
 import org.jkiss.dbeaver.model.runtime.AbstractJob;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIUtils.java

@@ -63,7 +63,7 @@ import org.eclipse.ui.swt.IFocusService;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.bundle.UIActivator;
+import org.jkiss.dbeaver.ui.internal.UIActivator;
 import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.DBPNamedObject;

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/autorefresh/AutoRefreshControl.java

@@ -26,7 +26,7 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
-import org.jkiss.dbeaver.bundle.UIMessages;
+import org.jkiss.dbeaver.ui.internal.UIMessages;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.UIIcon;

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/dialogs/DialogUtils.java

@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.*;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.bundle.UIMessages;
+import org.jkiss.dbeaver.ui.internal.UIMessages;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
 import org.jkiss.dbeaver.ui.UIUtils;

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/bundle/UIActivator.java → plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIActivator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.bundle;
+package org.jkiss.dbeaver.ui.internal;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/bundle/UIMessages.java → plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.java

@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.bundle;
+package org.jkiss.dbeaver.ui.internal;
 
 import org.eclipse.osgi.util.NLS;
 
 public class UIMessages extends NLS {
-    static final String BUNDLE_NAME = "org.jkiss.dbeaver.bundle.UIMessages"; //$NON-NLS-1$
+    static final String BUNDLE_NAME = "org.jkiss.dbeaver.ui.internal.UIMessages"; //$NON-NLS-1$
 
     public static String output_label_directory;
 

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/properties/PropertyTreeViewer.java

@@ -36,7 +36,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.views.properties.IPropertySource2;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.bundle.UIMessages;
+import org.jkiss.dbeaver.ui.internal.UIMessages;
 import org.jkiss.dbeaver.model.DBPObject;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;