提交 354a0bb9 编写于 作者: J jurgen

Remove jface colors from model.

Former-commit-id: 0e3d3324
上级 ded38d76
......@@ -117,8 +117,8 @@
properties="dirty,canUndo,canRedo"
type="org.jkiss.dbeaver.ui.editors.entity.EntityEditor"/>
<propertyTester
class="org.jkiss.dbeaver.model.runtime.DBRProcessPropertyTester"
id="org.jkiss.dbeaver.model.runtime.DBRProcessPropertyTester"
class="org.jkiss.dbeaver.ui.views.process.ProcessPropertyTester"
id="org.jkiss.dbeaver.ui.views.process.ProcessPropertyTester"
namespace="org.jkiss.dbeaver.runtime.process"
properties="running"
type="org.jkiss.dbeaver.model.runtime.DBRProcessController"/>
......
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)
{
......
......@@ -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);
}
}
......
......@@ -42,7 +42,7 @@ import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
/**
* NavigatorUtils
* Action utils
*/
public class ActionUtils
{
......
......@@ -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();
}
......
......@@ -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);
}
}
......@@ -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();
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册