From 354a0bb92f775119e858918bb05f4bf53a2e304e Mon Sep 17 00:00:00 2001 From: jurgen Date: Tue, 23 Jun 2015 13:08:57 +0000 Subject: [PATCH] Remove jface colors from model. Former-commit-id: 0e3d3324af77bac261f8af8557803db9e744836f --- plugins/org.jkiss.dbeaver.core/plugin.xml | 4 ++-- .../src/org/jkiss/dbeaver/model/DBPConnectionType.java | 10 +--------- .../dbeaver/model/runtime/DBRProcessDescriptor.java | 3 ++- .../src/org/jkiss/dbeaver/ui/ActionUtils.java | 2 +- .../src/org/jkiss/dbeaver/ui/UIUtils.java | 4 ++-- .../ui/preferences/PrefPageConnectionTypes.java | 8 ++------ .../views/process/ProcessPropertyTester.java} | 9 +++++---- 7 files changed, 15 insertions(+), 25 deletions(-) rename plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/{model/runtime/DBRProcessPropertyTester.java => ui/views/process/ProcessPropertyTester.java} (85%) diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml index f9f287462a..769c95269b 100644 --- a/plugins/org.jkiss.dbeaver.core/plugin.xml +++ b/plugins/org.jkiss.dbeaver.core/plugin.xml @@ -117,8 +117,8 @@ properties="dirty,canUndo,canRedo" type="org.jkiss.dbeaver.ui.editors.entity.EntityEditor"/> diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionType.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionType.java index f31351d068..90d41a2b9b 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionType.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPConnectionType.java @@ -1,11 +1,9 @@ package org.jkiss.dbeaver.model; -import org.eclipse.core.runtime.IAdaptable; - /** * Connection type */ -public class DBPConnectionType implements IAdaptable { +public class DBPConnectionType { public static final DBPConnectionType DEV = new DBPConnectionType("dev", "Development", "255,255,255", "Regular development database", true, false, true); public static final DBPConnectionType TEST = new DBPConnectionType("test", "Test", "196,255,181", "Test (QA) database", true, false, true); @@ -103,12 +101,6 @@ public class DBPConnectionType implements IAdaptable { this.confirmExecute = confirmExecute; } - @Override - public Object getAdapter(Class adapter) - { - return null; - } - @Override public boolean equals(Object obj) { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRProcessDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRProcessDescriptor.java index da20ef4cc6..7ae85de072 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRProcessDescriptor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRProcessDescriptor.java @@ -19,6 +19,7 @@ package org.jkiss.dbeaver.model.runtime; import org.jkiss.dbeaver.DBException; +import org.jkiss.dbeaver.ui.views.process.ProcessPropertyTester; import org.jkiss.dbeaver.utils.TextUtils; import java.io.IOException; @@ -104,7 +105,7 @@ public class DBRProcessDescriptor } //exitValue = process.exitValue(); process = null; - DBRProcessPropertyTester.firePropertyChange(DBRProcessPropertyTester.PROP_RUNNING); + ProcessPropertyTester.firePropertyChange(ProcessPropertyTester.PROP_RUNNING); } } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/ActionUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/ActionUtils.java index 4a5f9d77e1..d9c1a3e0dd 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/ActionUtils.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/ActionUtils.java @@ -42,7 +42,7 @@ import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; /** - * NavigatorUtils + * Action utils */ public class ActionUtils { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java index 1f425fe92f..709cccd997 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIUtils.java @@ -969,9 +969,9 @@ public class UIUtils { window.getShell().setText(title); } - public static void showPreferencesFor(Shell shell, IAdaptable element, String defPageID) + public static void showPreferencesFor(Shell shell, Object element, String defPageID) { - PreferenceDialog propDialog = PreferencesUtil.createPropertyDialogOn(shell, element, defPageID, null, null); + PreferenceDialog propDialog = PreferencesUtil.createPropertyDialogOn(shell, element, defPageID, null, null, PreferencesUtil.OPTION_NONE); if (propDialog != null) { propDialog.open(); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnectionTypes.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnectionTypes.java index 472cb5f576..070613e669 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnectionTypes.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConnectionTypes.java @@ -365,17 +365,13 @@ public class PrefPageConnectionTypes extends PreferencePage implements IWorkbenc @Override public IAdaptable getElement() { - return selectedType; + return null; } @Override public void setElement(IAdaptable element) { - if (element instanceof DBPConnectionType) { - selectedType = (DBPConnectionType) element; - } else { - selectedType = null; - } + selectedType = (DBPConnectionType) element.getAdapter(DBPConnectionType.class); } } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRProcessPropertyTester.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/process/ProcessPropertyTester.java similarity index 85% rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRProcessPropertyTester.java rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/process/ProcessPropertyTester.java index 56b1e4d4aa..3a5e9ea2ab 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/runtime/DBRProcessPropertyTester.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/process/ProcessPropertyTester.java @@ -15,21 +15,22 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package org.jkiss.dbeaver.model.runtime; +package org.jkiss.dbeaver.ui.views.process; import org.eclipse.core.expressions.PropertyTester; +import org.jkiss.dbeaver.model.runtime.DBRProcessController; import org.jkiss.dbeaver.ui.ActionUtils; /** - * DBRProcessPropertyTester + * ProcessPropertyTester */ -public class DBRProcessPropertyTester extends PropertyTester +public class ProcessPropertyTester extends PropertyTester { public static final String NAMESPACE = "org.jkiss.dbeaver.runtime.process"; public static final String PROP_RUNNING = "running"; - public DBRProcessPropertyTester() { + public ProcessPropertyTester() { super(); } -- GitLab