Include eclipse.ide (damn it)

Former-commit-id: ee801e83

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

@@ -108,9 +108,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.core.expressions,
  org.eclipse.ui,
+ org.eclipse.ui.editors,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench,
  org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
  org.eclipse.swt,
  org.eclipse.jface,
  org.eclipse.jface.text,

plugins/org.jkiss.dbeaver.core/plugin.xml

@@ -1872,6 +1872,7 @@
     </extension>
 
     <extension point="org.eclipse.ui.workbench.texteditor.rulerColumns">
+<!--
         <column class="org.jkiss.dbeaver.ui.editors.text.LineNumberColumn"
             enabled="false"
             global="true"
@@ -1881,6 +1882,7 @@
             <placement gravity="0.9"/>
             <targetClass class="org.jkiss.dbeaver.ui.editors.text.BaseTextEditor"/>
         </column>
+-->
         <column class="org.jkiss.dbeaver.ui.editors.text.ScriptPositionColumn"
             enabled="false"
             global="false"

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java

@@ -275,14 +275,10 @@ public abstract class SQLEditorBase extends BaseTextEditor {
                 styles);
     }
 
-    private IAnnotationAccess getAnnotationAccess()
-    {
-        if (annotationAccess == null) {
-            annotationAccess = new SQLMarkerAnnotationAccess();
-        }
-        return annotationAccess;
+    @Override
+    protected IAnnotationAccess createAnnotationAccess() {
+        return new SQLMarkerAnnotationAccess();
     }
-
 /*
     protected void adjustHighlightRange(int offset, int length)
     {
@@ -414,6 +410,7 @@ public abstract class SQLEditorBase extends BaseTextEditor {
             }
         }
 
+/*
         Color fgColor = ruleManager.getColor(SQLConstants.CONFIG_COLOR_TEXT);
         Color bgColor = ruleManager.getColor(getDataSource() == null ?
             SQLConstants.CONFIG_COLOR_DISABLED :
@@ -423,6 +420,7 @@ public abstract class SQLEditorBase extends BaseTextEditor {
             textWidget.setForeground(fgColor);
         }
         textWidget.setBackground(bgColor);
+*/
 
         // Update configuration
         if (getSourceViewerConfiguration() instanceof SQLEditorSourceViewerConfiguration) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/text/BaseTextEditor.java

@@ -23,40 +23,27 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IUndoManager;
 import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.text.source.CompositeRuler;
 import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
+import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
 import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.ui.texteditor.StatusTextEditor;
-import org.eclipse.ui.texteditor.rulers.*;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
-import org.jkiss.dbeaver.utils.RuntimeUtils;
 import org.jkiss.dbeaver.ui.ICommentsSupport;
 import org.jkiss.dbeaver.ui.ISingleControlEditor;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dialogs.DialogUtils;
 import org.jkiss.dbeaver.ui.editors.EditorUtils;
 import org.jkiss.dbeaver.ui.editors.sql.SQLEditorInput;
-import org.jkiss.dbeaver.ui.preferences.PreferenceStoreDelegate;
 import org.jkiss.dbeaver.ui.resources.ResourceUtils;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.dbeaver.utils.GeneralUtils;
@@ -65,20 +52,18 @@ import org.jkiss.utils.IOUtils;
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 /**
  * Abstract text editor.
  * Contains some common dbeaver text editor adaptions.
  */
-public abstract class BaseTextEditor extends StatusTextEditor implements ISingleControlEditor {
+public abstract class BaseTextEditor extends AbstractDecoratedTextEditor implements ISingleControlEditor {
 
-    private final static String LINE_NUMBER_RULER = "lineNumberRule";
-
-    private LineNumberColumn fLineColumn;
-    private ScriptPositionColumn fScriptColumn;
+//    private final static String LINE_NUMBER_RULER = "lineNumberRule";
+//
+//    private LineNumberColumn fLineColumn;
+//    private ScriptPositionColumn fScriptColumn;
 
     private static Map<String, Integer> ACTION_TRANSLATE_MAP;
 
@@ -104,15 +89,15 @@ public abstract class BaseTextEditor extends StatusTextEditor implements ISingle
         return editor.getAdapter(BaseTextEditor.class);
     }
 
-    protected ScriptPositionColumn getScriptColumn()
-    {
-        return fScriptColumn;
-    }
+//    protected ScriptPositionColumn getScriptColumn()
+//    {
+//        return fScriptColumn;
+//    }
 
     @Override
     public void dispose()
     {
-        fLineColumn = null;
+//        fLineColumn = null;
         super.dispose();
     }
 
@@ -133,7 +118,7 @@ public abstract class BaseTextEditor extends StatusTextEditor implements ISingle
     @Override
     public void createPartControl(Composite parent)
     {
-        setPreferenceStore(new PreferenceStoreDelegate(DBeaverCore.getGlobalPreferenceStore()));
+        //setPreferenceStore(new PreferenceStoreDelegate(DBeaverCore.getGlobalPreferenceStore()));
 
         super.createPartControl(parent);
     }
@@ -174,20 +159,15 @@ public abstract class BaseTextEditor extends StatusTextEditor implements ISingle
 
     @Override
     protected void rulerContextMenuAboutToShow(IMenuManager menu) {
-        menu.add(new Separator(ITextEditorActionConstants.GROUP_RULERS));
-        menu.add(new Separator(ITextEditorActionConstants.GROUP_REST));
+//        menu.add(new Separator(ITextEditorActionConstants.GROUP_RULERS));
+//        menu.add(new Separator(ITextEditorActionConstants.GROUP_REST));
 
         super.rulerContextMenuAboutToShow(menu);
 
-        addRulerContributionActions(menu);
+        //addRulerContributionActions(menu);
     }
 
-    /**
-     * Adds "show" actions for all contributed rulers that support it.
-     *
-     * @param menu the ruler context menu
-     * @since 3.3
-     */
+/*
     private void addRulerContributionActions(IMenuManager menu) {
         // store directly in generic editor preferences
         final IColumnSupport support= (IColumnSupport) getAdapter(IColumnSupport.class);
@@ -215,7 +195,9 @@ public abstract class BaseTextEditor extends StatusTextEditor implements ISingle
             menu.appendToGroup(ITextEditorActionConstants.GROUP_RULERS, action);
         }
     }
+*/
 
+/*
     @Override
     public void showChangeInformation(boolean show)
     {
@@ -231,13 +213,17 @@ public abstract class BaseTextEditor extends StatusTextEditor implements ISingle
                 columnSupport.setColumnVisible(lineNumberColumnDescriptor, true);
         }
     }
+*/
 
+/*
     @Override
     public boolean isChangeInformationShowing()
     {
         return fLineColumn != null && fLineColumn.isShowingChangeInformation();
     }
+*/
 
+/*
     @Override
     protected final IColumnSupport createColumnSupport() {
         return new ColumnSupport(this, RulerColumnRegistry.getDefault()) {
@@ -262,7 +248,9 @@ public abstract class BaseTextEditor extends StatusTextEditor implements ISingle
             }
         };
     }
+*/
 
+/*
     @Override
     protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
 
@@ -287,12 +275,13 @@ public abstract class BaseTextEditor extends StatusTextEditor implements ISingle
             super.handlePreferenceStoreChanged(event);
         }
     }
+*/
 
-    @Override
-    protected IVerticalRuler createVerticalRuler()
-    {
-        return new CompositeRuler();
-    }
+//    @Override
+//    protected IVerticalRuler createVerticalRuler()
+//    {
+//        return new CompositeRuler();
+//    }
 
     @Nullable
     public ICommentsSupport getCommentsSupport()
@@ -354,13 +343,6 @@ public abstract class BaseTextEditor extends StatusTextEditor implements ISingle
                 @Override
                 public void run(final DBRProgressMonitor monitor) throws InvocationTargetException, InterruptedException
                 {
-//                    UIUtils.runInUI(getSite().getShell(), new Runnable() {
-//                        @Override
-//                        public void run()
-//                        {
-//                            doSave(RuntimeUtils.getNestedMonitor(monitor));
-//                        }
-//                    });
                     try {
                         ContentUtils.saveContentToFile(new StringReader(document.get()), saveFile, GeneralUtils.DEFAULT_FILE_CHARSET_NAME, monitor);
                     } catch (Exception e) {

plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF

@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.core,
- org.eclipse.ui.workbench.texteditor
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: JKISS

plugins/org.jkiss.dbeaver.ext.oracle/META-INF/MANIFEST.MF

@@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.jkiss.dbeaver.core,
  org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
  com.github.jsqlparser
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF

@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.jkiss.dbeaver.core,
  org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
  org.jkiss.dbeaver.ext.generic,
  net.sf.opencsv
 Bundle-ActivationPolicy: lazy