From 8e9c7fa12c319b2213b2228a7ffebf79ae0a54fb Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Sat, 27 Feb 2016 19:57:28 +0300 Subject: [PATCH] Include eclipse.ide (damn it) Former-commit-id: ee801e83143cb0a020573692daf2fd472db60123 --- .../org.jkiss.dbeaver.rcp.feature/feature.xml | 1050 +++++------------ .../META-INF/MANIFEST.MF | 2 + plugins/org.jkiss.dbeaver.core/plugin.xml | 2 + .../dbeaver/ui/editors/sql/SQLEditorBase.java | 12 +- .../ui/editors/text/BaseTextEditor.java | 78 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + 8 files changed, 322 insertions(+), 827 deletions(-) diff --git a/features/org.jkiss.dbeaver.rcp.feature/feature.xml b/features/org.jkiss.dbeaver.rcp.feature/feature.xml index 65736dc022..97bb5a97c2 100644 --- a/features/org.jkiss.dbeaver.rcp.feature/feature.xml +++ b/features/org.jkiss.dbeaver.rcp.feature/feature.xml @@ -8,776 +8,284 @@ Feature for standalone DBeaver RCP - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF index 2dfeece8ee..d078d085c6 100644 --- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF +++ b/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, diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml index 934832d240..a3892c7225 100644 --- a/plugins/org.jkiss.dbeaver.core/plugin.xml +++ b/plugins/org.jkiss.dbeaver.core/plugin.xml @@ -1872,6 +1872,7 @@ + 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) { diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF index af3cdf5d30..8e82896e2a 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.oracle/META-INF/MANIFEST.MF index ff3cbf983f..4cf00d2542 100644 --- a/plugins/org.jkiss.dbeaver.ext.oracle/META-INF/MANIFEST.MF +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF index 5e73a293f5..08ffcf348a 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF +++ b/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 -- GitLab