Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 25180317 编写于 作者: J jurgen
浏览文件
操作

Preferences constants refactoring

上级 b4750655
隐藏空白更改
内联 并排
Showing with 350 addition and 340 deletion
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/ApplicationWorkbenchAdvisor.java
浏览文件 @ 25180317
......@@ -29,6 +29,7 @@ import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
import org.eclipse.ui.application.WorkbenchAdvisor;
import org.eclipse.ui.application.WorkbenchWindowAdvisor;
import org.eclipse.ui.keys.IBindingService;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.core.DBeaverVersionChecker;
......@@ -39,7 +40,6 @@ import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import java.lang.reflect.InvocationTargetException;
import java.util.Calendar;
......@@ -106,13 +106,13 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor
private void startVersionChecker()
{
if (DBeaverCore.getGlobalPreferenceStore().getBoolean(PrefConstants.UI_AUTO_UPDATE_CHECK)) {
if (DBeaverCore.getGlobalPreferenceStore().getBoolean(DBeaverPreferences.UI_AUTO_UPDATE_CHECK)) {
if (new Random().nextInt(4) != 0) {
// check for update with 25% chance
// to avoid too high load on server in release days
return;
}
long lastVersionCheckTime = DBeaverCore.getGlobalPreferenceStore().getLong(PrefConstants.UI_UPDATE_CHECK_TIME);
long lastVersionCheckTime = DBeaverCore.getGlobalPreferenceStore().getLong(DBeaverPreferences.UI_UPDATE_CHECK_TIME);
if (lastVersionCheckTime > 0) {
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(lastVersionCheckTime);
......@@ -123,7 +123,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor
return;
}
}
DBeaverCore.getGlobalPreferenceStore().setValue(PrefConstants.UI_UPDATE_CHECK_TIME, System.currentTimeMillis());
DBeaverCore.getGlobalPreferenceStore().setValue(DBeaverPreferences.UI_UPDATE_CHECK_TIME, System.currentTimeMillis());
DBeaverVersionChecker checker = new DBeaverVersionChecker(false);
checker.schedule(3000);
}
......
plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/ApplicationWorkbenchWindowAdvisor.java
浏览文件 @ 25180317
......@@ -41,7 +41,7 @@ import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
import org.jkiss.dbeaver.ui.dialogs.connection.CreateConnectionDialog;
import org.jkiss.dbeaver.ui.dialogs.connection.NewConnectionWizard;
import org.jkiss.dbeaver.ui.editors.content.ContentEditorInput;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor implements DBPProjectListener {
//static final Log log = LogFactory.getLog(ApplicationWorkbenchWindowAdvisor.class);
......@@ -126,7 +126,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor im
IWorkbenchWindow window = getWindowConfigurer().getWindow();
try {
if (!ConfirmationDialog.confirmAction(window.getShell(), PrefConstants.CONFIRM_EXIT)) {
if (!ConfirmationDialog.confirmAction(window.getShell(), DBeaverPreferences.CONFIRM_EXIT)) {
return false;
}
// Close al content editors
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefConstants.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/DBeaverPreferences.java
浏览文件 @ 25180317
......@@ -16,12 +16,12 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package org.jkiss.dbeaver.ui.preferences;
package org.jkiss.dbeaver;
/**
* PrefConstants
* Preferences constants
*/
public final class PrefConstants
public final class DBeaverPreferences
{
public static final String AGENT_ENABLED = "agent.enabled"; //$NON-NLS-1$
public static final String AGENT_LONG_OPERATION_NOTIFY = "agent.long.operation.notify"; //$NON-NLS-1$
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java
浏览文件 @ 25180317
......@@ -5,6 +5,7 @@ import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.texteditor.AbstractTextEditor;
import org.jkiss.dbeaver.DBeaverConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.model.data.DBDBinaryFormatter;
import org.jkiss.dbeaver.model.data.DBDValueController;
import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose;
......@@ -17,7 +18,6 @@ import org.jkiss.dbeaver.runtime.sql.SQLScriptCommitType;
import org.jkiss.dbeaver.runtime.sql.SQLScriptErrorHandling;
import org.jkiss.dbeaver.ui.editors.binary.HexEditControl;
import org.jkiss.dbeaver.ui.editors.sql.SQLPreferenceConstants;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.utils.ContentUtils;
import java.io.File;
......@@ -39,43 +39,43 @@ public class DBeaverPreferencesInitializer extends AbstractPreferenceInitializer
}
// Agent
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.AGENT_ENABLED, true);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.AGENT_LONG_OPERATION_NOTIFY, true);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.AGENT_LONG_OPERATION_TIMEOUT, 30);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.AGENT_ENABLED, true);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.AGENT_LONG_OPERATION_NOTIFY, true);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.AGENT_LONG_OPERATION_TIMEOUT, 30);
// Navigator
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.NAVIGATOR_EXPAND_ON_CONNECT, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.NAVIGATOR_SORT_ALPHABETICALLY, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.NAVIGATOR_GROUP_BY_DRIVER, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.NAVIGATOR_EDITOR_FULL_NAME, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NAVIGATOR_EXPAND_ON_CONNECT, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NAVIGATOR_SORT_ALPHABETICALLY, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NAVIGATOR_GROUP_BY_DRIVER, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME, false);
// Common
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.DEFAULT_AUTO_COMMIT, true);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.KEEP_STATEMENT_OPEN, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.QUERY_ROLLBACK_ON_ERROR, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.DEFAULT_AUTO_COMMIT, true);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.KEEP_STATEMENT_OPEN, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.QUERY_ROLLBACK_ON_ERROR, false);
// SQL execution
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.SCRIPT_COMMIT_TYPE, SQLScriptCommitType.NO_COMMIT.name());
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.SCRIPT_COMMIT_LINES, 1000);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.SCRIPT_ERROR_HANDLING, SQLScriptErrorHandling.STOP_ROLLBACK.name());
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.SCRIPT_FETCH_RESULT_SETS, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.SCRIPT_AUTO_FOLDERS, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.STATEMENT_INVALIDATE_BEFORE_EXECUTE, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.STATEMENT_TIMEOUT, 10 * 1000);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.MEMORY_CONTENT_MAX_SIZE, 10000);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.READ_EXPENSIVE_PROPERTIES, true);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.META_SEPARATE_CONNECTION, true);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.META_CASE_SENSITIVE, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RS_EDIT_USE_ALL_COLUMNS, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RS_EDIT_MAX_TEXT_SIZE, 10 * 1000000);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RS_EDIT_LONG_AS_LOB, true);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.CONTENT_HEX_ENCODING, ContentUtils.getDefaultFileEncoding());
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RS_COMMIT_ON_EDIT_APPLY, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RS_COMMIT_ON_CONTENT_APPLY, false);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.TEXT_EDIT_UNDO_LEVEL, 200);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.SCRIPT_COMMIT_TYPE, SQLScriptCommitType.NO_COMMIT.name());
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.SCRIPT_COMMIT_LINES, 1000);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.SCRIPT_ERROR_HANDLING, SQLScriptErrorHandling.STOP_ROLLBACK.name());
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.SCRIPT_FETCH_RESULT_SETS, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.SCRIPT_AUTO_FOLDERS, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.STATEMENT_INVALIDATE_BEFORE_EXECUTE, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.STATEMENT_TIMEOUT, 10 * 1000);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.MEMORY_CONTENT_MAX_SIZE, 10000);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.READ_EXPENSIVE_PROPERTIES, true);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.META_SEPARATE_CONNECTION, true);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.META_CASE_SENSITIVE, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RS_EDIT_USE_ALL_COLUMNS, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RS_EDIT_MAX_TEXT_SIZE, 10 * 1000000);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RS_EDIT_LONG_AS_LOB, true);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.CONTENT_HEX_ENCODING, ContentUtils.getDefaultFileEncoding());
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RS_COMMIT_ON_EDIT_APPLY, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RS_COMMIT_ON_CONTENT_APPLY, false);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.TEXT_EDIT_UNDO_LEVEL, 200);
RuntimeUtils.setDefaultPreferenceValue(store, SQLPreferenceConstants.ENABLE_AUTO_ACTIVATION, true);
RuntimeUtils.setDefaultPreferenceValue(store, SQLPreferenceConstants.AUTO_ACTIVATION_DELAY, 500);
......@@ -101,29 +101,29 @@ public class DBeaverPreferencesInitializer extends AbstractPreferenceInitializer
// Text editor default preferences
RuntimeUtils.setDefaultPreferenceValue(store, AbstractTextEditor.PREFERENCE_TEXT_DRAG_AND_DROP_ENABLED, true);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.HEX_FONT_NAME, HexEditControl.DEFAULT_FONT_NAME);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.HEX_FONT_SIZE, 10);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.HEX_FONT_NAME, HexEditControl.DEFAULT_FONT_NAME);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.HEX_FONT_SIZE, 10);
// General UI
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.UI_AUTO_UPDATE_CHECK, true);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.UI_PROXY_HOST, "");
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.UI_PROXY_PORT, 0);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.UI_PROXY_USER, "");
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.UI_PROXY_PASSWORD, "");
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.UI_DRIVERS_HOME, "");
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.UI_DRIVERS_SOURCES, DBeaverConstants.DEFAULT_DRIVERS_SOURCE);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_AUTO_UPDATE_CHECK, true);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_PROXY_HOST, "");
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_PROXY_PORT, 0);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_PROXY_USER, "");
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_PROXY_PASSWORD, "");
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_DRIVERS_HOME, "");
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_DRIVERS_SOURCES, DBeaverConstants.DEFAULT_DRIVERS_SOURCE);
// Network
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.NET_TUNNEL_PORT_MIN, 10000);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.NET_TUNNEL_PORT_MAX, 60000);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NET_TUNNEL_PORT_MIN, 10000);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.NET_TUNNEL_PORT_MAX, 60000);
// ResultSet
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RESULT_SET_MAX_ROWS, 200);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RESULT_SET_BINARY_PRESENTATION, DBDBinaryFormatter.FORMATS[0].getId());
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RESULT_SET_BINARY_SHOW_STRINGS, true);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RESULT_SET_BINARY_EDITOR_TYPE, DBDValueController.EditType.EDITOR);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RESULT_SET_BINARY_STRING_MAX_LEN, 32);
RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.RESULT_SET_ORDER_SERVER_SIDE, true);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_SET_MAX_ROWS, 200);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_SET_BINARY_PRESENTATION, DBDBinaryFormatter.FORMATS[0].getId());
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_SET_BINARY_SHOW_STRINGS, true);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_SET_BINARY_EDITOR_TYPE, DBDValueController.EditType.EDITOR);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_SET_BINARY_STRING_MAX_LEN, 32);
RuntimeUtils.setDefaultPreferenceValue(store, DBeaverPreferences.RESULT_SET_ORDER_SERVER_SIDE, true);
// QM
RuntimeUtils.setDefaultPreferenceValue(store, QMConstants.PROP_HISTORY_DAYS, 90);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverUI.java
浏览文件 @ 25180317
......@@ -21,7 +21,7 @@ import org.jkiss.dbeaver.runtime.AbstractUIJob;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
import org.jkiss.dbeaver.ui.SharedTextColors;
import org.jkiss.dbeaver.ui.TrayIconHandler;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.osgi.framework.Bundle;
import java.lang.reflect.InvocationTargetException;
......@@ -233,7 +233,7 @@ public class DBeaverUI {
public static void notifyAgent(String message, int status)
{
if (!DBeaverCore.getGlobalPreferenceStore().getBoolean(PrefConstants.AGENT_LONG_OPERATION_NOTIFY)) {
if (!DBeaverCore.getGlobalPreferenceStore().getBoolean(DBeaverPreferences.AGENT_LONG_OPERATION_NOTIFY)) {
// Notifications disabled
return;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java
浏览文件 @ 25180317
......@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.swt.widgets.Shell;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.ext.IDatabasePersistAction;
import org.jkiss.dbeaver.model.data.*;
......@@ -40,7 +41,6 @@ import org.jkiss.dbeaver.ui.DBIcon;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.actions.datasource.DataSourceInvalidateHandler;
import org.jkiss.dbeaver.ui.editors.sql.SQLConstants;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.utils.CommonUtils;
......@@ -1003,7 +1003,7 @@ public final class DBUtils {
public static DBDBinaryFormatter getBinaryPresentation(DBPDataSource dataSource)
{
String id = dataSource.getContainer().getPreferenceStore().getString(PrefConstants.RESULT_SET_BINARY_PRESENTATION);
String id = dataSource.getContainer().getPreferenceStore().getString(DBeaverPreferences.RESULT_SET_BINARY_PRESENTATION);
if (id != null) {
DBDBinaryFormatter formatter = getBinaryPresentation(id);
if (formatter != null) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/DBObjectNameCaseTransformer.java
浏览文件 @ 25180317
......@@ -22,7 +22,7 @@ import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.DBPDataSourceInfo;
import org.jkiss.dbeaver.model.meta.IPropertyValueTransformer;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
/**
* Object name case transformer
......@@ -42,7 +42,7 @@ public class DBObjectNameCaseTransformer implements IPropertyValueTransformer<DB
public static String transformName(DBPDataSource dataSource, String value)
{
final boolean isNameCaseSensitive = dataSource.getContainer().getPreferenceStore().getBoolean(PrefConstants.META_CASE_SENSITIVE);
final boolean isNameCaseSensitive = dataSource.getContainer().getPreferenceStore().getBoolean(DBeaverPreferences.META_CASE_SENSITIVE);
if (isNameCaseSensitive) {
return value;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java
浏览文件 @ 25180317
......@@ -20,6 +20,7 @@ package org.jkiss.dbeaver.model.impl.jdbc;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.*;
import org.jkiss.dbeaver.model.exec.*;
......@@ -35,7 +36,6 @@ import org.jkiss.dbeaver.model.struct.DBSDataType;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.utils.CommonUtils;
import java.sql.*;
......@@ -236,7 +236,7 @@ public abstract class JDBCDataSource
public synchronized void initialize(DBRProgressMonitor monitor)
throws DBException
{
if (container.getPreferenceStore().getBoolean(PrefConstants.META_SEPARATE_CONNECTION)) {
if (container.getPreferenceStore().getBoolean(DBeaverPreferences.META_SEPARATE_CONNECTION)) {
this.metaContext = new JDBCExecutionContext(this, "Metadata reader", false);
this.metaContext.connect(monitor, true, null);
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCContentBLOB.java
浏览文件 @ 25180317
......@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.impl.BytesContentStorage;
import org.jkiss.dbeaver.model.impl.TemporaryContentStorage;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.dbeaver.utils.MimeTypes;
......@@ -82,12 +82,12 @@ public class JDBCContentBLOB extends JDBCContentLOB {
{
if (storage == null && blob != null) {
long contentLength = getContentLength();
if (contentLength < DBeaverCore.getGlobalPreferenceStore().getInt(PrefConstants.MEMORY_CONTENT_MAX_SIZE)) {
if (contentLength < DBeaverCore.getGlobalPreferenceStore().getInt(DBeaverPreferences.MEMORY_CONTENT_MAX_SIZE)) {
try {
storage = BytesContentStorage.createFromStream(
blob.getBinaryStream(),
contentLength,
DBeaverCore.getGlobalPreferenceStore().getString(PrefConstants.CONTENT_HEX_ENCODING));
DBeaverCore.getGlobalPreferenceStore().getString(DBeaverPreferences.CONTENT_HEX_ENCODING));
}
catch (SQLException e) {
throw new DBCException(e, dataSource);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCContentBytes.java
浏览文件 @ 25180317
......@@ -21,7 +21,6 @@ package org.jkiss.dbeaver.model.impl.jdbc.data;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.model.data.DBDBinaryFormatter;
......@@ -33,7 +32,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.dbeaver.utils.MimeTypes;
......@@ -198,7 +197,7 @@ public class JDBCContentBytes extends JDBCContentAbstract implements DBDContentS
return null;
}
DBDBinaryFormatter formatter = DBUtils.getBinaryPresentation(dataSource);
int maxLength = dataSource.getContainer().getPreferenceStore().getInt(PrefConstants.RESULT_SET_BINARY_STRING_MAX_LEN);
int maxLength = dataSource.getContainer().getPreferenceStore().getInt(DBeaverPreferences.RESULT_SET_BINARY_STRING_MAX_LEN);
// Convert bytes to string
int length = data.length;
if (format == DBDDisplayFormat.UI && length > maxLength) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCContentCLOB.java
浏览文件 @ 25180317
......@@ -21,6 +21,7 @@ package org.jkiss.dbeaver.model.impl.jdbc.data;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.core.resources.IFile;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.data.DBDContent;
......@@ -33,7 +34,6 @@ import org.jkiss.dbeaver.model.impl.StringContentStorage;
import org.jkiss.dbeaver.model.impl.TemporaryContentStorage;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.dbeaver.utils.MimeTypes;
......@@ -83,7 +83,7 @@ public class JDBCContentCLOB extends JDBCContentLOB implements DBDContent {
{
if (storage == null && clob != null) {
long contentLength = getContentLength();
if (contentLength < DBeaverCore.getGlobalPreferenceStore().getInt(PrefConstants.MEMORY_CONTENT_MAX_SIZE)) {
if (contentLength < DBeaverCore.getGlobalPreferenceStore().getInt(DBeaverPreferences.MEMORY_CONTENT_MAX_SIZE)) {
try {
storage = StringContentStorage.createFromReader(clob.getCharacterStream(), contentLength);
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCContentValueHandler.java
浏览文件 @ 25180317
......@@ -57,7 +57,7 @@ import org.jkiss.dbeaver.ui.editors.content.parts.ContentBinaryEditorPart;
import org.jkiss.dbeaver.ui.editors.content.parts.ContentImageEditorPart;
import org.jkiss.dbeaver.ui.editors.content.parts.ContentTextEditorPart;
import org.jkiss.dbeaver.ui.editors.content.parts.ContentXMLEditorPart;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.ui.properties.PropertySourceAbstract;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.dbeaver.utils.MimeTypes;
......@@ -335,7 +335,7 @@ public class JDBCContentValueHandler extends JDBCAbstractValueHandler {
// Open LOB editor
Object value = controller.getValue();
DBDValueController.EditType binaryEditType = DBDValueController.EditType.valueOf(
controller.getDataSource().getContainer().getPreferenceStore().getString(PrefConstants.RESULT_SET_BINARY_EDITOR_TYPE));
controller.getDataSource().getContainer().getPreferenceStore().getString(DBeaverPreferences.RESULT_SET_BINARY_EDITOR_TYPE));
if (binaryEditType != DBDValueController.EditType.EDITOR && value instanceof DBDContentCached) {
// Use string editor for cached content
return new TextViewDialog(controller);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/exec/JDBCStatementImpl.java
浏览文件 @ 25180317
......@@ -21,6 +21,7 @@ package org.jkiss.dbeaver.model.impl.jdbc.exec;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet;
......@@ -29,7 +30,6 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCStatement;
import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
import org.jkiss.dbeaver.model.qm.QMUtils;
import org.jkiss.dbeaver.model.sql.SQLUtils;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import java.sql.*;
......@@ -297,7 +297,7 @@ public class JDBCStatementImpl<STATEMENT extends Statement> implements JDBCState
protected SQLException handleExecuteError(Throwable ex)
{
executeError = ex;
if (connection.getDataSource().getContainer().getPreferenceStore().getBoolean(PrefConstants.QUERY_ROLLBACK_ON_ERROR)) {
if (connection.getDataSource().getContainer().getPreferenceStore().getBoolean(DBeaverPreferences.QUERY_ROLLBACK_ON_ERROR)) {
try {
if (!connection.isClosed() && !connection.getAutoCommit()) {
connection.rollback();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/GlobalProxyAuthenticator.java
浏览文件 @ 25180317
......@@ -22,6 +22,7 @@ import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.widgets.Shell;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
......@@ -34,7 +35,6 @@ import org.jkiss.dbeaver.runtime.RunnableWithResult;
import org.jkiss.dbeaver.ui.DBIcon;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.connection.BaseAuthDialog;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.utils.CommonUtils;
import java.net.Authenticator;
......@@ -50,58 +50,62 @@ public class GlobalProxyAuthenticator extends Authenticator {
@Nullable
@Override
protected PasswordAuthentication getPasswordAuthentication() {
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
// 1. Check for drivers download proxy
final String proxyHost = store.getString(PrefConstants.UI_PROXY_HOST);
if (!CommonUtils.isEmpty(proxyHost) && proxyHost.equalsIgnoreCase(getRequestingHost()) &&
store.getInt(PrefConstants.UI_PROXY_PORT) == getRequestingPort())
{
String userName = store.getString(PrefConstants.UI_PROXY_USER);
String userPassword = decryptPassword(store.getString(PrefConstants.UI_PROXY_PASSWORD));
if (CommonUtils.isEmpty(userName) || CommonUtils.isEmpty(userPassword)) {
BaseAuthDialog.AuthInfo authInfo = readCredentialsInUI("Auth proxy '" + proxyHost + "'", userName, userPassword);
if (authInfo != null) {
userName = authInfo.userName;
userPassword = authInfo.userPassword;
if (authInfo.savePassword) {
// Save in preferences
store.setValue(PrefConstants.UI_PROXY_USER, userName);
store.setValue(PrefConstants.UI_PROXY_PASSWORD, encryptPassword(userPassword));
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
// 1. Check for drivers download proxy
final String proxyHost = store.getString(DBeaverPreferences.UI_PROXY_HOST);
if (!CommonUtils.isEmpty(proxyHost) && proxyHost.equalsIgnoreCase(getRequestingHost()) &&
store.getInt(DBeaverPreferences.UI_PROXY_PORT) == getRequestingPort())
{
String userName = store.getString(DBeaverPreferences.UI_PROXY_USER);
String userPassword = decryptPassword(store.getString(DBeaverPreferences.UI_PROXY_PASSWORD));
if (CommonUtils.isEmpty(userName) || CommonUtils.isEmpty(userPassword)) {
BaseAuthDialog.AuthInfo authInfo = readCredentialsInUI("Auth proxy '" + proxyHost + "'", userName, userPassword);
if (authInfo != null) {
userName = authInfo.userName;
userPassword = authInfo.userPassword;
if (authInfo.savePassword) {
// Save in preferences
store.setValue(DBeaverPreferences.UI_PROXY_USER, userName);
store.setValue(DBeaverPreferences.UI_PROXY_PASSWORD, encryptPassword(userPassword));
}
}
}
}
if (!CommonUtils.isEmpty(userName) && !CommonUtils.isEmpty(userPassword)) {
return new PasswordAuthentication(userName, userPassword.toCharArray());
if (!CommonUtils.isEmpty(userName) && !CommonUtils.isEmpty(userPassword)) {
return new PasswordAuthentication(userName, userPassword.toCharArray());
}
}
}
// 2. Check for connections' proxies
String requestingProtocol = getRequestingProtocol();
if (SocksConstants.PROTOCOL_SOCKS5.equals(requestingProtocol) || SocksConstants.PROTOCOL_SOCKS4.equals(requestingProtocol)) {
DBCExecutionContext activeContext = DBCExecutionContext.ACTIVE_CONTEXT.get();
if (activeContext != null) {
DBSDataSourceContainer container = activeContext.getDataSource().getContainer();
for (DBWHandlerConfiguration networkHandler : container.getConnectionInfo().getDeclaredHandlers()) {
if (networkHandler.isEnabled() && networkHandler.getType() == DBWHandlerType.PROXY) {
String userName = networkHandler.getUserName();
String userPassword = networkHandler.getPassword();
if (CommonUtils.isEmpty(userName) || CommonUtils.isEmpty(userPassword)) {
BaseAuthDialog.AuthInfo authInfo = readCredentialsInUI(getRequestingPrompt(), userName, userPassword);
if (authInfo != null) {
userName = authInfo.userName;
userPassword = authInfo.userPassword;
if (authInfo.savePassword) {
// Save DS config
networkHandler.setUserName(userName);
networkHandler.setPassword(userPassword);
networkHandler.setSavePassword(true);
container.getRegistry().flushConfig();
{
// 2. Check for connections' proxies
String requestingProtocol = getRequestingProtocol();
if (SocksConstants.PROTOCOL_SOCKS5.equals(requestingProtocol) || SocksConstants.PROTOCOL_SOCKS4.equals(requestingProtocol)) {
DBCExecutionContext activeContext = DBCExecutionContext.ACTIVE_CONTEXT.get();
if (activeContext != null) {
DBSDataSourceContainer container = activeContext.getDataSource().getContainer();
for (DBWHandlerConfiguration networkHandler : container.getConnectionInfo().getDeclaredHandlers()) {
if (networkHandler.isEnabled() && networkHandler.getType() == DBWHandlerType.PROXY) {
String userName = networkHandler.getUserName();
String userPassword = networkHandler.getPassword();
if (CommonUtils.isEmpty(userName) || CommonUtils.isEmpty(userPassword)) {
BaseAuthDialog.AuthInfo authInfo = readCredentialsInUI(getRequestingPrompt(), userName, userPassword);
if (authInfo != null) {
userName = authInfo.userName;
userPassword = authInfo.userPassword;
if (authInfo.savePassword) {
// Save DS config
networkHandler.setUserName(userName);
networkHandler.setPassword(userPassword);
networkHandler.setSavePassword(true);
container.getRegistry().flushConfig();
}
}
}
}
if (!CommonUtils.isEmpty(userName) && !CommonUtils.isEmpty(userPassword)) {
return new PasswordAuthentication(userName, userPassword.toCharArray());
if (!CommonUtils.isEmpty(userName) && !CommonUtils.isEmpty(userPassword)) {
return new PasswordAuthentication(userName, userPassword.toCharArray());
}
}
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java
浏览文件 @ 25180317
......@@ -25,13 +25,13 @@ import com.jcraft.jsch.UserInfo;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.SWT;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.DBPConnectionInfo;
import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
import org.jkiss.dbeaver.model.net.DBWTunnel;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.utils.CommonUtils;
import org.jkiss.utils.SecurityUtils;
......@@ -150,8 +150,8 @@ public class SSHTunnelImpl implements DBWTunnel {
private int findFreePort()
{
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
int minPort = store.getInt(PrefConstants.NET_TUNNEL_PORT_MIN);
int maxPort = store.getInt(PrefConstants.NET_TUNNEL_PORT_MAX);
int minPort = store.getInt(DBeaverPreferences.NET_TUNNEL_PORT_MIN);
int maxPort = store.getInt(DBeaverPreferences.NET_TUNNEL_PORT_MAX);
int portRange = Math.abs(maxPort - minPort);
while (true) {
int portNum = minPort + SecurityUtils.getRandom().nextInt(portRange);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java
浏览文件 @ 25180317
......@@ -27,6 +27,7 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
import org.eclipse.ui.IWorkbenchWindow;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.navigator.DBNResource;
......@@ -34,7 +35,6 @@ import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
import org.jkiss.dbeaver.ui.DBIcon;
import org.jkiss.dbeaver.ui.editors.sql.SQLEditor;
import org.jkiss.dbeaver.ui.editors.sql.SQLEditorInput;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.utils.CommonUtils;
......@@ -107,7 +107,7 @@ public class ScriptsHandlerImpl extends AbstractResourceHandler {
IFolder scriptsFolder = folder;
if (scriptsFolder == null) {
scriptsFolder = ScriptsHandlerImpl.getScriptsFolder(project, true);
if (dataSourceContainer != null && dataSourceContainer.getPreferenceStore().getBoolean(PrefConstants.SCRIPT_AUTO_FOLDERS)) {
if (dataSourceContainer != null && dataSourceContainer.getPreferenceStore().getBoolean(DBeaverPreferences.SCRIPT_AUTO_FOLDERS)) {
IFolder dbFolder = scriptsFolder.getFolder(CommonUtils.escapeFileName(dataSourceContainer.getName()));
if (dbFolder != null) {
if (!dbFolder.exists()) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
浏览文件 @ 25180317
......@@ -27,6 +27,7 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISaveablePart;
import org.eclipse.ui.IWorkbenchWindow;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.ext.ui.IObjectImageProvider;
......@@ -60,7 +61,6 @@ import org.jkiss.dbeaver.ui.actions.DataSourcePropertyTester;
import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
import org.jkiss.dbeaver.ui.dialogs.connection.EditConnectionDialog;
import org.jkiss.dbeaver.ui.dialogs.connection.EditConnectionWizard;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.utils.AbstractPreferenceStore;
import org.jkiss.utils.CommonUtils;
......@@ -285,8 +285,8 @@ public class DataSourceDescriptor
@Override
public boolean isDefaultAutoCommit()
{
if (getPreferenceStore().contains(PrefConstants.DEFAULT_AUTO_COMMIT)) {
return getPreferenceStore().getBoolean(PrefConstants.DEFAULT_AUTO_COMMIT);
if (getPreferenceStore().contains(DBeaverPreferences.DEFAULT_AUTO_COMMIT)) {
return getPreferenceStore().getBoolean(DBeaverPreferences.DEFAULT_AUTO_COMMIT);
} else {
return getConnectionInfo().getConnectionType().isAutocommit();
}
......@@ -324,9 +324,9 @@ public class DataSourceDescriptor
}
// Save in preferences
if (autoCommit == getConnectionInfo().getConnectionType().isAutocommit()) {
getPreferenceStore().setToDefault(PrefConstants.DEFAULT_AUTO_COMMIT);
getPreferenceStore().setToDefault(DBeaverPreferences.DEFAULT_AUTO_COMMIT);
} else {
getPreferenceStore().setValue(PrefConstants.DEFAULT_AUTO_COMMIT, autoCommit);
getPreferenceStore().setValue(DBeaverPreferences.DEFAULT_AUTO_COMMIT, autoCommit);
}
}
......@@ -374,7 +374,7 @@ public class DataSourceDescriptor
{
try {
if (isolationLevel == null) {
getPreferenceStore().setToDefault(PrefConstants.DEFAULT_ISOLATION);
getPreferenceStore().setToDefault(DBeaverPreferences.DEFAULT_ISOLATION);
} else {
DBeaverUI.runInProgressService(new DBRRunnableWithProgress() {
@Override
......@@ -385,7 +385,7 @@ public class DataSourceDescriptor
try {
if (!txnManager.getTransactionIsolation().equals(isolationLevel)) {
txnManager.setTransactionIsolation(isolationLevel);
getPreferenceStore().setValue(PrefConstants.DEFAULT_ISOLATION, isolationLevel.getCode());
getPreferenceStore().setValue(DBeaverPreferences.DEFAULT_ISOLATION, isolationLevel.getCode());
}
} catch (DBCException e) {
throw new InvocationTargetException(e);
......@@ -634,17 +634,17 @@ public class DataSourceDescriptor
boolean autoCommit = txnManager.isAutoCommit();
AbstractPreferenceStore store = getPreferenceStore();
boolean newAutoCommit;
if (!store.contains(PrefConstants.DEFAULT_AUTO_COMMIT)) {
if (!store.contains(DBeaverPreferences.DEFAULT_AUTO_COMMIT)) {
newAutoCommit = connectionInfo.getConnectionType().isAutocommit();
} else {
newAutoCommit = store.getBoolean(PrefConstants.DEFAULT_AUTO_COMMIT);
newAutoCommit = store.getBoolean(DBeaverPreferences.DEFAULT_AUTO_COMMIT);
}
if (autoCommit != newAutoCommit) {
// Change auto-commit state
txnManager.setAutoCommit(newAutoCommit);
}
if (store.contains(PrefConstants.DEFAULT_ISOLATION)) {
int isolationCode = store.getInt(PrefConstants.DEFAULT_ISOLATION);
if (store.contains(DBeaverPreferences.DEFAULT_ISOLATION)) {
int isolationCode = store.getInt(DBeaverPreferences.DEFAULT_ISOLATION);
Collection<DBPTransactionIsolation> supportedLevels = dataSource.getInfo().getSupportedTransactionsIsolation();
if (!CommonUtils.isEmpty(supportedLevels)) {
for (DBPTransactionIsolation level : supportedLevels) {
......@@ -1108,7 +1108,7 @@ public class DataSourceDescriptor
{
result = ConfirmationDialog.showConfirmDialog(
null,
PrefConstants.CONFIRM_TXN_DISCONNECT,
DBeaverPreferences.CONFIRM_TXN_DISCONNECT,
ConfirmationDialog.QUESTION_WITH_CANCEL,
getName());
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
浏览文件 @ 25180317
......@@ -37,6 +37,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverActivator;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
......@@ -48,7 +49,6 @@ import org.jkiss.dbeaver.ui.OverlayImageDescriptor;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.AcceptLicenseDialog;
import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.ui.properties.IPropertyDescriptorEx;
import org.jkiss.dbeaver.ui.properties.PropertyDescriptorEx;
import org.jkiss.dbeaver.utils.ContentUtils;
......@@ -1013,10 +1013,10 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
private void downloadLibraryFile(IProgressMonitor monitor, DriverFileDescriptor file) throws IOException, InterruptedException
{
IPreferenceStore prefs = DBeaverCore.getGlobalPreferenceStore();
String proxyHost = prefs.getString(PrefConstants.UI_PROXY_HOST);
String proxyHost = prefs.getString(DBeaverPreferences.UI_PROXY_HOST);
Proxy proxy = null;
if (!CommonUtils.isEmpty(proxyHost)) {
int proxyPort = prefs.getInt(PrefConstants.UI_PROXY_PORT);
int proxyPort = prefs.getInt(DBeaverPreferences.UI_PROXY_PORT);
if (proxyPort <= 0) {
log.warn("Invalid proxy port: " + proxyPort);
}
......@@ -1235,7 +1235,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
{
File homeFolder;
// Try to use custom drivers path from preferences
String driversHome = DBeaverCore.getGlobalPreferenceStore().getString(PrefConstants.UI_DRIVERS_HOME);
String driversHome = DBeaverCore.getGlobalPreferenceStore().getString(DBeaverPreferences.UI_DRIVERS_HOME);
if (!CommonUtils.isEmpty(driversHome)) {
homeFolder = new File(driversHome);
} else {
......@@ -1252,14 +1252,14 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
public static String[] getDriversSources()
{
String sourcesString = DBeaverCore.getGlobalPreferenceStore().getString(PrefConstants.UI_DRIVERS_SOURCES);
String sourcesString = DBeaverCore.getGlobalPreferenceStore().getString(DBeaverPreferences.UI_DRIVERS_SOURCES);
List<String> pathList = CommonUtils.splitString(sourcesString, '|');
return pathList.toArray(new String[pathList.size()]);
}
public static String getDriversPrimarySource()
{
String sourcesString = DBeaverCore.getGlobalPreferenceStore().getString(PrefConstants.UI_DRIVERS_SOURCES);
String sourcesString = DBeaverCore.getGlobalPreferenceStore().getString(DBeaverPreferences.UI_DRIVERS_SOURCES);
int divPos = sourcesString.indexOf('|');
return divPos == -1 ? sourcesString : sourcesString.substring(0, divPos);
}
......@@ -1536,7 +1536,7 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
{
proceed = ConfirmationDialog.showConfirmDialog(
shell,
PrefConstants.CONFIRM_DRIVER_DOWNLOAD,
DBeaverPreferences.CONFIRM_DRIVER_DOWNLOAD,
ConfirmationDialog.QUESTION,
getName(),
libNames) == IDialogConstants.YES_ID;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/RuntimeUtils.java
浏览文件 @ 25180317
......@@ -37,6 +37,7 @@ import org.eclipse.swt.program.Program;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.*;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
......@@ -46,7 +47,6 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
import org.jkiss.dbeaver.model.runtime.DBRShellCommand;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.ui.views.process.ShellProcessView;
import org.jkiss.utils.CommonUtils;
......@@ -519,7 +519,7 @@ public class RuntimeUtils {
}
int confirmResult = ConfirmationDialog.showConfirmDialog(
shell,
PrefConstants.CONFIRM_EDITOR_CLOSE,
DBeaverPreferences.CONFIRM_EDITOR_CLOSE,
ConfirmationDialog.QUESTION_WITH_CANCEL,
saveableName);
switch (confirmResult) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryJob.java
浏览文件 @ 25180317
......@@ -25,6 +25,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.IWorkbenchPartSite;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.DBPDataKind;
import org.jkiss.dbeaver.model.DBPDataSource;
......@@ -40,7 +41,6 @@ import org.jkiss.dbeaver.runtime.exec.ExecutionQueueErrorJob;
import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
import org.jkiss.dbeaver.ui.DBIcon;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.utils.CommonUtils;
import java.util.ArrayList;
......@@ -94,10 +94,10 @@ public class SQLQueryJob extends DataSourceJob
{
// Read config form preference store
IPreferenceStore preferenceStore = getDataSource().getContainer().getPreferenceStore();
this.commitType = SQLScriptCommitType.valueOf(preferenceStore.getString(PrefConstants.SCRIPT_COMMIT_TYPE));
this.errorHandling = SQLScriptErrorHandling.valueOf(preferenceStore.getString(PrefConstants.SCRIPT_ERROR_HANDLING));
this.fetchResultSets = queries.size() == 1 || preferenceStore.getBoolean(PrefConstants.SCRIPT_FETCH_RESULT_SETS);
this.rsMaxRows = preferenceStore.getInt(PrefConstants.RESULT_SET_MAX_ROWS);
this.commitType = SQLScriptCommitType.valueOf(preferenceStore.getString(DBeaverPreferences.SCRIPT_COMMIT_TYPE));
this.errorHandling = SQLScriptErrorHandling.valueOf(preferenceStore.getString(DBeaverPreferences.SCRIPT_ERROR_HANDLING));
this.fetchResultSets = queries.size() == 1 || preferenceStore.getBoolean(DBeaverPreferences.SCRIPT_FETCH_RESULT_SETS);
this.rsMaxRows = preferenceStore.getInt(DBeaverPreferences.RESULT_SET_MAX_ROWS);
}
}
......@@ -295,7 +295,7 @@ public class SQLQueryJob extends DataSourceJob
closeStatement();
// Check and invalidate connection
if (!connectionInvalidated && getDataSource().getContainer().getPreferenceStore().getBoolean(PrefConstants.STATEMENT_INVALIDATE_BEFORE_EXECUTE)) {
if (!connectionInvalidated && getDataSource().getContainer().getPreferenceStore().getBoolean(DBeaverPreferences.STATEMENT_INVALIDATE_BEFORE_EXECUTE)) {
getDataSource().invalidateContext(session.getProgressMonitor());
connectionInvalidated = true;
}
......@@ -591,7 +591,7 @@ public class SQLQueryJob extends DataSourceJob
{
// Only in single query mode and if pref option set to true
return queries.size() == 1 &&
getDataSource().getContainer().getPreferenceStore().getBoolean(PrefConstants.KEEP_STATEMENT_OPEN);
getDataSource().getContainer().getPreferenceStore().getBoolean(DBeaverPreferences.KEEP_STATEMENT_OPEN);
}
private void closeStatement()
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectDelete.java
浏览文件 @ 25180317
......@@ -38,6 +38,7 @@ import org.eclipse.ui.commands.IElementUpdater;
import org.eclipse.ui.handlers.HandlerUtil;
import org.eclipse.ui.menus.UIElement;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverActivator;
import org.jkiss.dbeaver.core.DBeaverCore;
......@@ -51,7 +52,6 @@ import org.jkiss.dbeaver.ui.DBIcon;
import org.jkiss.dbeaver.ui.NavigatorUtils;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
......@@ -236,7 +236,7 @@ public class NavigatorHandlerObjectDelete extends NavigatorHandlerObjectBase imp
return deleteAll ? ConfirmResult.YES : ConfirmResult.NO;
}
ResourceBundle bundle = DBeaverActivator.getResourceBundle();
String objectType = node instanceof DBNLocalFolder ? PrefConstants.CONFIRM_LOCAL_FOLDER_DELETE : PrefConstants.CONFIRM_ENTITY_DELETE;
String objectType = node instanceof DBNLocalFolder ? DBeaverPreferences.CONFIRM_LOCAL_FOLDER_DELETE : DBeaverPreferences.CONFIRM_ENTITY_DELETE;
String titleKey = ConfirmationDialog.RES_CONFIRM_PREFIX + objectType + "_" + ConfirmationDialog.RES_KEY_TITLE; //$NON-NLS-1$
String messageKey = ConfirmationDialog.RES_CONFIRM_PREFIX + objectType + "_" + ConfirmationDialog.RES_KEY_MESSAGE; //$NON-NLS-1$
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @ 25180317
......@@ -60,6 +60,7 @@ import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.IPropertySourceProvider;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
......@@ -93,7 +94,6 @@ import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
import org.jkiss.dbeaver.ui.dialogs.EditTextDialog;
import org.jkiss.dbeaver.ui.dialogs.sql.ViewSQLDialog;
import org.jkiss.dbeaver.ui.dialogs.struct.EditConstraintDialog;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseGeneral;
import org.jkiss.dbeaver.ui.properties.PropertyCollector;
import org.jkiss.dbeaver.ui.properties.tabbed.PropertyPageStandard;
......@@ -1139,7 +1139,7 @@ public class ResultSetViewer extends Viewer implements IDataSourceProvider, ISpr
}
int result = ConfirmationDialog.showConfirmDialog(
spreadsheet.getShell(),
PrefConstants.CONFIRM_RS_EDIT_CLOSE,
DBeaverPreferences.CONFIRM_RS_EDIT_CLOSE,
ConfirmationDialog.QUESTION_WITH_CANCEL);
if (result == IDialogConstants.YES_ID) {
return ISaveablePart2.YES;
......@@ -1576,7 +1576,7 @@ public class ResultSetViewer extends Viewer implements IDataSourceProvider, ISpr
if (isServerSideFiltering() && supportsDataFilter()) {
if (!ConfirmationDialog.confirmActionWithParams(
spreadsheet.getShell(),
PrefConstants.CONFIRM_ORDER_RESULTSET,
DBeaverPreferences.CONFIRM_ORDER_RESULTSET,
metaColumn.getAttributeName()))
{
return;
......@@ -1724,7 +1724,7 @@ public class ResultSetViewer extends Viewer implements IDataSourceProvider, ISpr
private boolean isServerSideFiltering()
{
return
getPreferenceStore().getBoolean(PrefConstants.RESULT_SET_ORDER_SERVER_SIDE) &&
getPreferenceStore().getBoolean(DBeaverPreferences.RESULT_SET_ORDER_SERVER_SIDE) &&
(dataReceiver.isHasMoreData() || !CommonUtils.isEmpty(model.getDataFilter().getOrder()));
}
......@@ -1774,7 +1774,7 @@ public class ResultSetViewer extends Viewer implements IDataSourceProvider, ISpr
if (getDataContainer() == null) {
return 0;
}
return getPreferenceStore().getInt(PrefConstants.RESULT_SET_MAX_ROWS);
return getPreferenceStore().getInt(DBeaverPreferences.RESULT_SET_MAX_ROWS);
}
private IPreferenceStore getPreferenceStore()
......@@ -2838,7 +2838,7 @@ public class ResultSetViewer extends Viewer implements IDataSourceProvider, ISpr
@Override
public boolean isChecked()
{
return getPreferenceStore().getBoolean(PrefConstants.RESULT_SET_ORDER_SERVER_SIDE);
return getPreferenceStore().getBoolean(DBeaverPreferences.RESULT_SET_ORDER_SERVER_SIDE);
}
@Override
......@@ -2846,8 +2846,8 @@ public class ResultSetViewer extends Viewer implements IDataSourceProvider, ISpr
{
IPreferenceStore preferenceStore = getPreferenceStore();
preferenceStore.setValue(
PrefConstants.RESULT_SET_ORDER_SERVER_SIDE,
!preferenceStore.getBoolean(PrefConstants.RESULT_SET_ORDER_SERVER_SIDE));
DBeaverPreferences.RESULT_SET_ORDER_SERVER_SIDE,
!preferenceStore.getBoolean(DBeaverPreferences.RESULT_SET_ORDER_SERVER_SIDE));
}
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ValidateUniqueKeyUsageDialog.java
浏览文件 @ 25180317
......@@ -22,6 +22,7 @@ import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.eclipse.swt.widgets.Shell;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
import org.jkiss.dbeaver.model.exec.DBCEntityIdentifier;
......@@ -29,7 +30,6 @@ import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
import org.jkiss.dbeaver.model.virtual.DBVEntityConstraint;
import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.utils.CommonUtils;
import java.util.ArrayList;
......@@ -66,7 +66,7 @@ class ValidateUniqueKeyUsageDialog extends MessageDialogWithToggle {
@Override
protected void buttonPressed(int buttonId)
{
viewer.getDataSource().getContainer().getPreferenceStore().setValue(PrefConstants.RS_EDIT_USE_ALL_COLUMNS, getToggleState());
viewer.getDataSource().getContainer().getPreferenceStore().setValue(DBeaverPreferences.RS_EDIT_USE_ALL_COLUMNS, getToggleState());
switch (buttonId)
{
case IDialogConstants.CANCEL_ID:
......@@ -139,7 +139,7 @@ class ValidateUniqueKeyUsageDialog extends MessageDialogWithToggle {
return true;
}
if (viewer.getDataSource().getContainer().getPreferenceStore().getBoolean(PrefConstants.RS_EDIT_USE_ALL_COLUMNS)) {
if (viewer.getDataSource().getContainer().getPreferenceStore().getBoolean(DBeaverPreferences.RS_EDIT_USE_ALL_COLUMNS)) {
if (useAllColumns(viewer.getControl().getShell(), viewer)) {
return true;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/CursorViewDialog.java
浏览文件 @ 25180317
......@@ -25,6 +25,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.DBPDataSource;
......@@ -42,7 +43,6 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.ui.controls.resultset.ResultSetProvider;
import org.jkiss.dbeaver.ui.controls.resultset.ResultSetViewer;
import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
/**
* TextViewDialog
......@@ -69,12 +69,12 @@ public class CursorViewDialog extends ValueViewDialog implements ResultSetProvid
if (value != null) {
IPreferenceStore globalPreferenceStore = DBeaverCore.getGlobalPreferenceStore();
if (!globalPreferenceStore.getBoolean(PrefConstants.KEEP_STATEMENT_OPEN)) {
if (!globalPreferenceStore.getBoolean(DBeaverPreferences.KEEP_STATEMENT_OPEN)) {
if (ConfirmationDialog.showConfirmDialog(
getShell(),
PrefConstants.CONFIRM_KEEP_STATEMENT_OPEN,
DBeaverPreferences.CONFIRM_KEEP_STATEMENT_OPEN,
ConfirmationDialog.QUESTION) == IDialogConstants.YES_ID) {
globalPreferenceStore.setValue(PrefConstants.KEEP_STATEMENT_OPEN, true);
globalPreferenceStore.setValue(DBeaverPreferences.KEEP_STATEMENT_OPEN, true);
if (valueController.getValueSite().getPart() instanceof ResultSetProvider) {
((ResultSetProvider)valueController.getValueSite().getPart()).getResultSetViewer().refresh();
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorInput.java
浏览文件 @ 25180317
......@@ -24,6 +24,7 @@ import org.eclipse.ui.IPersistableElement;
import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.model.WorkbenchAdapter;
import org.eclipse.ui.views.properties.IPropertySource2;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.ext.IDataSourceContainerProvider;
import org.jkiss.dbeaver.ext.IDatabaseEditorInput;
......@@ -33,7 +34,6 @@ import org.jkiss.dbeaver.model.impl.edit.DBECommandContextImpl;
import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.ui.properties.PropertySourceEditable;
/**
......@@ -77,7 +77,7 @@ public abstract class DatabaseEditorInput<NODE extends DBNDatabaseNode> implemen
@Override
public String getName()
{
if (DBeaverCore.getGlobalPreferenceStore().getBoolean(PrefConstants.NAVIGATOR_EDITOR_FULL_NAME)) {
if (DBeaverCore.getGlobalPreferenceStore().getBoolean(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME)) {
return node.getNodeFullName();
} else {
return node.getName();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/binary/pref/HexPreferencesPage.java
浏览文件 @ 25180317
......@@ -25,9 +25,9 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.utils.CommonUtils;
......@@ -51,9 +51,9 @@ public class HexPreferencesPage extends PreferencePage implements IWorkbenchPref
public static FontData getPrefFontData()
{
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
String fontName = store.getString(PrefConstants.HEX_FONT_NAME);
int fontStyle = store.getInt(PrefConstants.HEX_FONT_STYLE);
int fontSize = store.getInt(PrefConstants.HEX_FONT_SIZE);
String fontName = store.getString(DBeaverPreferences.HEX_FONT_NAME);
int fontStyle = store.getInt(DBeaverPreferences.HEX_FONT_STYLE);
int fontSize = store.getInt(DBeaverPreferences.HEX_FONT_SIZE);
if (!CommonUtils.isEmpty(fontName) && fontSize > 0) {
return new FontData(fontName, fontSize, fontStyle);
}
......@@ -103,9 +103,9 @@ public class HexPreferencesPage extends PreferencePage implements IWorkbenchPref
{
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
FontData fontData = preferences.getFontData();
store.setValue(PrefConstants.HEX_FONT_NAME, fontData.getName());
store.setValue(PrefConstants.HEX_FONT_STYLE, fontData.getStyle());
store.setValue(PrefConstants.HEX_FONT_SIZE, fontData.getHeight());
store.setValue(DBeaverPreferences.HEX_FONT_NAME, fontData.getName());
store.setValue(DBeaverPreferences.HEX_FONT_STYLE, fontData.getStyle());
store.setValue(DBeaverPreferences.HEX_FONT_SIZE, fontData.getHeight());
store.firePropertyChangeEvent(PROP_FONT_DATA, null, fontData);
RuntimeUtils.savePreferenceStore(store);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/parts/ContentTextEditorPart.java
浏览文件 @ 25180317
......@@ -27,7 +27,7 @@ import org.jkiss.dbeaver.ui.DBIcon;
import org.jkiss.dbeaver.ui.editors.content.ContentEditorPart;
import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor;
import org.jkiss.dbeaver.ui.editors.text.FileRefDocumentProvider;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.utils.MimeTypes;
import javax.activation.MimeType;
......@@ -83,7 +83,7 @@ public class ContentTextEditorPart extends BaseTextEditor implements ContentEdit
public long getMaxContentLength()
{
if (contentEditor instanceof IDataSourceProvider) {
return ((IDataSourceProvider)contentEditor).getDataSource().getContainer().getPreferenceStore().getInt(PrefConstants.RS_EDIT_MAX_TEXT_SIZE);
return ((IDataSourceProvider)contentEditor).getDataSource().getContainer().getPreferenceStore().getInt(DBeaverPreferences.RS_EDIT_MAX_TEXT_SIZE);
}
return 10 * 1024 * 1024;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/parts/ContentXMLEditorPart.java
浏览文件 @ 25180317
......@@ -22,11 +22,11 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IEditorActionBarContributor;
import org.eclipse.ui.IEditorPart;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.ext.IDataSourceProvider;
import org.jkiss.dbeaver.ui.DBIcon;
import org.jkiss.dbeaver.ui.editors.content.ContentEditorPart;
import org.jkiss.dbeaver.ui.editors.xml.XMLEditor;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.utils.MimeTypes;
import javax.activation.MimeType;
......@@ -84,7 +84,7 @@ public class ContentXMLEditorPart extends XMLEditor implements ContentEditorPart
public long getMaxContentLength()
{
if (contentEditor instanceof IDataSourceProvider) {
return ((IDataSourceProvider)contentEditor).getDataSource().getContainer().getPreferenceStore().getInt(PrefConstants.RS_EDIT_MAX_TEXT_SIZE);
return ((IDataSourceProvider)contentEditor).getDataSource().getContainer().getPreferenceStore().getInt(DBeaverPreferences.RS_EDIT_MAX_TEXT_SIZE);
}
return 10 * 1024 * 1024;
}
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java
浏览文件 @ 25180317
......@@ -27,6 +27,7 @@ import org.eclipse.ui.*;
import org.eclipse.ui.internal.ErrorEditorPart;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
......@@ -67,7 +68,6 @@ import org.jkiss.dbeaver.ui.dialogs.sql.ViewSQLDialog;
import org.jkiss.dbeaver.ui.editors.DatabaseEditorInput;
import org.jkiss.dbeaver.ui.editors.ErrorEditorInput;
import org.jkiss.dbeaver.ui.editors.MultiPageDatabaseEditor;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.utils.CommonUtils;
import java.lang.reflect.InvocationTargetException;
......@@ -284,7 +284,7 @@ public class EntityEditor extends MultiPageDatabaseEditor
if (isDirty()) {
if (ConfirmationDialog.showConfirmDialog(
null,
PrefConstants.CONFIRM_ENTITY_REVERT,
DBeaverPreferences.CONFIRM_ENTITY_REVERT,
ConfirmationDialog.QUESTION,
getDatabaseObject().getName()) != IDialogConstants.YES_ID)
{
......@@ -305,7 +305,7 @@ public class EntityEditor extends MultiPageDatabaseEditor
// Let's ask user about it
if (ConfirmationDialog.showConfirmDialog(
null,
PrefConstants.CONFIRM_ENTITY_REJECT,
DBeaverPreferences.CONFIRM_ENTITY_REJECT,
ConfirmationDialog.QUESTION,
getDatabaseObject().getName()) != IDialogConstants.YES_ID)
{
......@@ -567,7 +567,7 @@ public class EntityEditor extends MultiPageDatabaseEditor
{
final int result = ConfirmationDialog.showConfirmDialog(
getSite().getShell(),
PrefConstants.CONFIRM_ENTITY_EDIT_CLOSE,
DBeaverPreferences.CONFIRM_ENTITY_EDIT_CLOSE,
ConfirmationDialog.QUESTION_WITH_CANCEL,
getEditorInput().getTreeNode().getNodeName());
if (result == IDialogConstants.YES_ID) {
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
浏览文件 @ 25180317
......@@ -84,7 +84,7 @@ import org.jkiss.dbeaver.ui.editors.sql.syntax.SQLSyntaxManager;
import org.jkiss.dbeaver.ui.editors.sql.syntax.tokens.SQLCommentToken;
import org.jkiss.dbeaver.ui.editors.sql.syntax.tokens.SQLDelimiterToken;
import org.jkiss.dbeaver.ui.editors.text.ScriptPositionColumn;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.ui.views.plan.ExplainPlanViewer;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.utils.CommonUtils;
......@@ -1262,7 +1262,7 @@ public class SQLEditor extends SQLEditorBase
}
}
if (result.getQueryTime() > DBeaverCore.getGlobalPreferenceStore().getLong(PrefConstants.AGENT_LONG_OPERATION_TIMEOUT) * 1000) {
if (result.getQueryTime() > DBeaverCore.getGlobalPreferenceStore().getLong(DBeaverPreferences.AGENT_LONG_OPERATION_TIMEOUT) * 1000) {
DBeaverUI.notifyAgent(
"Query completed [" + getEditorInput().getPath().lastSegment() + "]" + ContentUtils.getDefaultLineSeparator() +
CommonUtils.truncateString(result.getStatement().getQuery(), 200), !result.hasError() ? IStatus.INFO : IStatus.ERROR);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DataSourceManagementToolbar.java
浏览文件 @ 25180317
......@@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.*;
import org.eclipse.ui.*;
import org.eclipse.ui.menus.WorkbenchWindowControlContribution;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
......@@ -62,7 +63,6 @@ import org.jkiss.dbeaver.ui.DBIcon;
import org.jkiss.dbeaver.ui.IActionConstants;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.controls.CImageCombo;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.utils.ContentUtils;
import org.jkiss.utils.CommonUtils;
......@@ -406,7 +406,7 @@ public class DataSourceManagementToolbar implements DBPRegistryListener, DBPEven
resultSetSize.setText(""); //$NON-NLS-1$
} else {
resultSetSize.setEnabled(true);
resultSetSize.setText(String.valueOf(dataSourceContainer.getPreferenceStore().getInt(PrefConstants.RESULT_SET_MAX_ROWS)));
resultSetSize.setText(String.valueOf(dataSourceContainer.getPreferenceStore().getInt(DBeaverPreferences.RESULT_SET_MAX_ROWS)));
}
}
......@@ -424,7 +424,7 @@ public class DataSourceManagementToolbar implements DBPRegistryListener, DBPEven
rsSize = "1"; //$NON-NLS-1$
}
IPreferenceStore store = dsContainer.getPreferenceStore();
store.setValue(PrefConstants.RESULT_SET_MAX_ROWS, rsSize);
store.setValue(DBeaverPreferences.RESULT_SET_MAX_ROWS, rsSize);
RuntimeUtils.savePreferenceStore(store);
}
}
......@@ -628,7 +628,7 @@ public class DataSourceManagementToolbar implements DBPRegistryListener, DBPEven
@Override
public void propertyChange(PropertyChangeEvent event)
{
if (event.getProperty().equals(PrefConstants.RESULT_SET_MAX_ROWS) && !resultSetSize.isDisposed()) {
if (event.getProperty().equals(DBeaverPreferences.RESULT_SET_MAX_ROWS) && !resultSetSize.isDisposed()) {
if (event.getNewValue() != null) {
resultSetSize.setText(event.getNewValue().toString());
}
......@@ -789,7 +789,7 @@ public class DataSourceManagementToolbar implements DBPRegistryListener, DBPEven
resultSetSize.setToolTipText(CoreMessages.toolbar_datasource_selector_resultset_segment_size);
final DBSDataSourceContainer dataSourceContainer = getDataSourceContainer();
if (dataSourceContainer != null) {
resultSetSize.setText(String.valueOf(dataSourceContainer.getPreferenceStore().getInt(PrefConstants.RESULT_SET_MAX_ROWS)));
resultSetSize.setText(String.valueOf(dataSourceContainer.getPreferenceStore().getInt(DBeaverPreferences.RESULT_SET_MAX_ROWS)));
}
//resultSetSize.setDigits(7);
resultSetSize.setLayoutData(gd);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageConfirmations.java
浏览文件 @ 25180317
......@@ -28,6 +28,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverActivator;
import org.jkiss.dbeaver.core.DBeaverCore;
......@@ -63,21 +64,21 @@ public class PrefPageConfirmations extends PreferencePage implements IWorkbenchP
{
Group groupObjects = UIUtils.createControlGroup(filterSettings, CoreMessages.pref_page_confirmations_group_general_actions, 2, GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING, 0);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_EXIT);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_ORDER_RESULTSET);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_RS_EDIT_CLOSE);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_TXN_DISCONNECT);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_DRIVER_DOWNLOAD);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_VERSION_CHECK);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_EXIT);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_ORDER_RESULTSET);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_RS_EDIT_CLOSE);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_TXN_DISCONNECT);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_DRIVER_DOWNLOAD);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_VERSION_CHECK);
}
{
Group groupObjects = UIUtils.createControlGroup(filterSettings, CoreMessages.pref_page_confirmations_group_object_editor, 2, GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING, 0);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_ENTITY_EDIT_CLOSE);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_ENTITY_DELETE);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_ENTITY_REJECT);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_ENTITY_REVERT);
createConfirmCheckbox(groupObjects, PrefConstants.CONFIRM_KEEP_STATEMENT_OPEN);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_ENTITY_EDIT_CLOSE);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_ENTITY_DELETE);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_ENTITY_REJECT);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_ENTITY_REVERT);
createConfirmCheckbox(groupObjects, DBeaverPreferences.CONFIRM_KEEP_STATEMENT_OPEN);
}
performDefaults();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDataEditor.java
浏览文件 @ 25180317
......@@ -22,6 +22,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
......@@ -52,11 +53,11 @@ public class PrefPageDataEditor extends TargetPrefPage
{
AbstractPreferenceStore store = dataSourceDescriptor.getPreferenceStore();
return
store.contains(PrefConstants.RS_EDIT_USE_ALL_COLUMNS) ||
store.contains(PrefConstants.RS_EDIT_MAX_TEXT_SIZE) ||
store.contains(PrefConstants.RS_EDIT_LONG_AS_LOB) ||
store.contains(PrefConstants.RS_COMMIT_ON_EDIT_APPLY) ||
store.contains(PrefConstants.RS_COMMIT_ON_CONTENT_APPLY)
store.contains(DBeaverPreferences.RS_EDIT_USE_ALL_COLUMNS) ||
store.contains(DBeaverPreferences.RS_EDIT_MAX_TEXT_SIZE) ||
store.contains(DBeaverPreferences.RS_EDIT_LONG_AS_LOB) ||
store.contains(DBeaverPreferences.RS_COMMIT_ON_EDIT_APPLY) ||
store.contains(DBeaverPreferences.RS_COMMIT_ON_CONTENT_APPLY)
;
}
......@@ -116,12 +117,12 @@ public class PrefPageDataEditor extends TargetPrefPage
protected void loadPreferences(IPreferenceStore store)
{
try {
alwaysUseAllColumns.setSelection(store.getBoolean(PrefConstants.RS_EDIT_USE_ALL_COLUMNS));
maxTextContentSize.setSelection(store.getInt(PrefConstants.RS_EDIT_MAX_TEXT_SIZE));
editLongAsLobCheck.setSelection(store.getBoolean(PrefConstants.RS_EDIT_LONG_AS_LOB));
commitOnEditApplyCheck.setSelection(store.getBoolean(PrefConstants.RS_COMMIT_ON_EDIT_APPLY));
commitOnContentApplyCheck.setSelection(store.getBoolean(PrefConstants.RS_COMMIT_ON_CONTENT_APPLY));
UIUtils.setComboSelection(encodingCombo, store.getString(PrefConstants.CONTENT_HEX_ENCODING));
alwaysUseAllColumns.setSelection(store.getBoolean(DBeaverPreferences.RS_EDIT_USE_ALL_COLUMNS));
maxTextContentSize.setSelection(store.getInt(DBeaverPreferences.RS_EDIT_MAX_TEXT_SIZE));
editLongAsLobCheck.setSelection(store.getBoolean(DBeaverPreferences.RS_EDIT_LONG_AS_LOB));
commitOnEditApplyCheck.setSelection(store.getBoolean(DBeaverPreferences.RS_COMMIT_ON_EDIT_APPLY));
commitOnContentApplyCheck.setSelection(store.getBoolean(DBeaverPreferences.RS_COMMIT_ON_CONTENT_APPLY));
UIUtils.setComboSelection(encodingCombo, store.getString(DBeaverPreferences.CONTENT_HEX_ENCODING));
} catch (Exception e) {
log.warn(e);
}
......@@ -131,12 +132,12 @@ public class PrefPageDataEditor extends TargetPrefPage
protected void savePreferences(IPreferenceStore store)
{
try {
store.setValue(PrefConstants.RS_EDIT_USE_ALL_COLUMNS, alwaysUseAllColumns.getSelection());
store.setValue(PrefConstants.RS_EDIT_MAX_TEXT_SIZE, maxTextContentSize.getSelection());
store.setValue(PrefConstants.RS_EDIT_LONG_AS_LOB, editLongAsLobCheck.getSelection());
store.setValue(PrefConstants.RS_COMMIT_ON_EDIT_APPLY, commitOnEditApplyCheck.getSelection());
store.setValue(PrefConstants.RS_COMMIT_ON_CONTENT_APPLY, commitOnContentApplyCheck.getSelection());
store.setValue(PrefConstants.CONTENT_HEX_ENCODING, UIUtils.getComboSelection(encodingCombo));
store.setValue(DBeaverPreferences.RS_EDIT_USE_ALL_COLUMNS, alwaysUseAllColumns.getSelection());
store.setValue(DBeaverPreferences.RS_EDIT_MAX_TEXT_SIZE, maxTextContentSize.getSelection());
store.setValue(DBeaverPreferences.RS_EDIT_LONG_AS_LOB, editLongAsLobCheck.getSelection());
store.setValue(DBeaverPreferences.RS_COMMIT_ON_EDIT_APPLY, commitOnEditApplyCheck.getSelection());
store.setValue(DBeaverPreferences.RS_COMMIT_ON_CONTENT_APPLY, commitOnContentApplyCheck.getSelection());
store.setValue(DBeaverPreferences.CONTENT_HEX_ENCODING, UIUtils.getComboSelection(encodingCombo));
} catch (Exception e) {
log.warn(e);
}
......@@ -146,12 +147,12 @@ public class PrefPageDataEditor extends TargetPrefPage
@Override
protected void clearPreferences(IPreferenceStore store)
{
store.setToDefault(PrefConstants.RS_EDIT_USE_ALL_COLUMNS);
store.setToDefault(PrefConstants.RS_EDIT_MAX_TEXT_SIZE);
store.setToDefault(PrefConstants.RS_EDIT_LONG_AS_LOB);
store.setToDefault(PrefConstants.RS_COMMIT_ON_EDIT_APPLY);
store.setToDefault(PrefConstants.RS_COMMIT_ON_CONTENT_APPLY);
store.setToDefault(PrefConstants.CONTENT_HEX_ENCODING);
store.setToDefault(DBeaverPreferences.RS_EDIT_USE_ALL_COLUMNS);
store.setToDefault(DBeaverPreferences.RS_EDIT_MAX_TEXT_SIZE);
store.setToDefault(DBeaverPreferences.RS_EDIT_LONG_AS_LOB);
store.setToDefault(DBeaverPreferences.RS_COMMIT_ON_EDIT_APPLY);
store.setToDefault(DBeaverPreferences.RS_COMMIT_ON_CONTENT_APPLY);
store.setToDefault(DBeaverPreferences.CONTENT_HEX_ENCODING);
}
@Override
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseGeneral.java
浏览文件 @ 25180317
......@@ -27,6 +27,7 @@ import org.eclipse.swt.widgets.*;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.IWorkbenchPropertyPage;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
......@@ -98,13 +99,13 @@ public class PrefPageDatabaseGeneral extends PreferencePage implements IWorkbenc
{
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
automaticUpdateCheck.setSelection(store.getBoolean(PrefConstants.UI_AUTO_UPDATE_CHECK));
longOperationsCheck.setSelection(store.getBoolean(PrefConstants.AGENT_LONG_OPERATION_NOTIFY));
longOperationsTimeout.setSelection(store.getInt(PrefConstants.AGENT_LONG_OPERATION_TIMEOUT));
expandOnConnectCheck.setSelection(store.getBoolean(PrefConstants.NAVIGATOR_EXPAND_ON_CONNECT));
sortCaseInsensitiveCheck.setSelection(store.getBoolean(PrefConstants.NAVIGATOR_SORT_ALPHABETICALLY));
groupByDriverCheck.setSelection(store.getBoolean(PrefConstants.NAVIGATOR_GROUP_BY_DRIVER));
editorFullName.setSelection(store.getBoolean(PrefConstants.NAVIGATOR_EDITOR_FULL_NAME));
automaticUpdateCheck.setSelection(store.getBoolean(DBeaverPreferences.UI_AUTO_UPDATE_CHECK));
longOperationsCheck.setSelection(store.getBoolean(DBeaverPreferences.AGENT_LONG_OPERATION_NOTIFY));
longOperationsTimeout.setSelection(store.getInt(DBeaverPreferences.AGENT_LONG_OPERATION_TIMEOUT));
expandOnConnectCheck.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_EXPAND_ON_CONNECT));
sortCaseInsensitiveCheck.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_SORT_ALPHABETICALLY));
groupByDriverCheck.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_GROUP_BY_DRIVER));
editorFullName.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME));
}
@Override
......@@ -112,14 +113,14 @@ public class PrefPageDatabaseGeneral extends PreferencePage implements IWorkbenc
{
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
store.setValue(PrefConstants.UI_AUTO_UPDATE_CHECK, automaticUpdateCheck.getSelection());
//store.setValue(PrefConstants.AGENT_ENABLED, agentEnabledCheck.getSelection());
store.setValue(PrefConstants.AGENT_LONG_OPERATION_NOTIFY, longOperationsCheck.getSelection());
store.setValue(PrefConstants.AGENT_LONG_OPERATION_TIMEOUT, longOperationsTimeout.getSelection());
store.setValue(PrefConstants.NAVIGATOR_EXPAND_ON_CONNECT, expandOnConnectCheck.getSelection());
store.setValue(PrefConstants.NAVIGATOR_SORT_ALPHABETICALLY, sortCaseInsensitiveCheck.getSelection());
store.setValue(PrefConstants.NAVIGATOR_GROUP_BY_DRIVER, groupByDriverCheck.getSelection());
store.setValue(PrefConstants.NAVIGATOR_EDITOR_FULL_NAME, editorFullName.getSelection());
store.setValue(DBeaverPreferences.UI_AUTO_UPDATE_CHECK, automaticUpdateCheck.getSelection());
//store.setValue(DBeaverPreferences.AGENT_ENABLED, agentEnabledCheck.getSelection());
store.setValue(DBeaverPreferences.AGENT_LONG_OPERATION_NOTIFY, longOperationsCheck.getSelection());
store.setValue(DBeaverPreferences.AGENT_LONG_OPERATION_TIMEOUT, longOperationsTimeout.getSelection());
store.setValue(DBeaverPreferences.NAVIGATOR_EXPAND_ON_CONNECT, expandOnConnectCheck.getSelection());
store.setValue(DBeaverPreferences.NAVIGATOR_SORT_ALPHABETICALLY, sortCaseInsensitiveCheck.getSelection());
store.setValue(DBeaverPreferences.NAVIGATOR_GROUP_BY_DRIVER, groupByDriverCheck.getSelection());
store.setValue(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME, editorFullName.getSelection());
RuntimeUtils.savePreferenceStore(store);
return true;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDrivers.java
浏览文件 @ 25180317
......@@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.*;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.IWorkbenchPropertyPage;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.registry.DriverDescriptor;
......@@ -165,11 +166,11 @@ public class PrefPageDrivers extends PreferencePage implements IWorkbenchPrefere
{
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
proxyHostText.setText(store.getString(PrefConstants.UI_PROXY_HOST));
proxyPortSpinner.setSelection(store.getInt(PrefConstants.UI_PROXY_PORT));
proxyUserText.setText(store.getString(PrefConstants.UI_PROXY_USER));
proxyHostText.setText(store.getString(DBeaverPreferences.UI_PROXY_HOST));
proxyPortSpinner.setSelection(store.getInt(DBeaverPreferences.UI_PROXY_PORT));
proxyUserText.setText(store.getString(DBeaverPreferences.UI_PROXY_USER));
// Load and decrypt password
String passwordString = store.getString(PrefConstants.UI_PROXY_PASSWORD);
String passwordString = store.getString(DBeaverPreferences.UI_PROXY_PASSWORD);
if (!CommonUtils.isEmpty(passwordString) && encrypter != null) {
try {
passwordString = encrypter.decrypt(passwordString);
......@@ -190,9 +191,9 @@ public class PrefPageDrivers extends PreferencePage implements IWorkbenchPrefere
public boolean performOk()
{
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
store.setValue(PrefConstants.UI_PROXY_HOST, proxyHostText.getText());
store.setValue(PrefConstants.UI_PROXY_PORT, proxyPortSpinner.getSelection());
store.setValue(PrefConstants.UI_PROXY_USER, proxyUserText.getText());
store.setValue(DBeaverPreferences.UI_PROXY_HOST, proxyHostText.getText());
store.setValue(DBeaverPreferences.UI_PROXY_PORT, proxyPortSpinner.getSelection());
store.setValue(DBeaverPreferences.UI_PROXY_USER, proxyUserText.getText());
String password = proxyPasswordText.getText();
if (!CommonUtils.isEmpty(password) && encrypter != null) {
// Encrypt password
......@@ -202,15 +203,15 @@ public class PrefPageDrivers extends PreferencePage implements IWorkbenchPrefere
log.warn(e);
}
}
store.setValue(PrefConstants.UI_PROXY_PASSWORD, password);
store.setValue(PrefConstants.UI_DRIVERS_HOME, customDriversHome.getText());
store.setValue(DBeaverPreferences.UI_PROXY_PASSWORD, password);
store.setValue(DBeaverPreferences.UI_DRIVERS_HOME, customDriversHome.getText());
StringBuilder sources = new StringBuilder();
for (String item : sourceList.getItems()) {
if (sources.length() > 0) sources.append('|');
sources.append(item);
}
store.setValue(PrefConstants.UI_DRIVERS_SOURCES, sources.toString());
store.setValue(DBeaverPreferences.UI_DRIVERS_SOURCES, sources.toString());
RuntimeUtils.savePreferenceStore(store);
return super.performOk();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageMetaData.java
浏览文件 @ 25180317
......@@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
......@@ -51,9 +52,9 @@ public class PrefPageMetaData extends TargetPrefPage
{
AbstractPreferenceStore store = dataSourceDescriptor.getPreferenceStore();
return
store.contains(PrefConstants.READ_EXPENSIVE_PROPERTIES) ||
store.contains(PrefConstants.META_SEPARATE_CONNECTION) ||
store.contains(PrefConstants.META_CASE_SENSITIVE)
store.contains(DBeaverPreferences.READ_EXPENSIVE_PROPERTIES) ||
store.contains(DBeaverPreferences.META_SEPARATE_CONNECTION) ||
store.contains(DBeaverPreferences.META_CASE_SENSITIVE)
;
}
......@@ -84,9 +85,9 @@ public class PrefPageMetaData extends TargetPrefPage
protected void loadPreferences(IPreferenceStore store)
{
try {
readExpensiveCheck.setSelection(store.getBoolean(PrefConstants.READ_EXPENSIVE_PROPERTIES));
separateMetaConnectionCheck.setSelection(store.getBoolean(PrefConstants.META_SEPARATE_CONNECTION));
caseSensitiveNamesCheck.setSelection(store.getBoolean(PrefConstants.META_CASE_SENSITIVE));
readExpensiveCheck.setSelection(store.getBoolean(DBeaverPreferences.READ_EXPENSIVE_PROPERTIES));
separateMetaConnectionCheck.setSelection(store.getBoolean(DBeaverPreferences.META_SEPARATE_CONNECTION));
caseSensitiveNamesCheck.setSelection(store.getBoolean(DBeaverPreferences.META_CASE_SENSITIVE));
} catch (Exception e) {
log.warn(e);
}
......@@ -96,9 +97,9 @@ public class PrefPageMetaData extends TargetPrefPage
protected void savePreferences(IPreferenceStore store)
{
try {
store.setValue(PrefConstants.READ_EXPENSIVE_PROPERTIES, readExpensiveCheck.getSelection());
store.setValue(PrefConstants.META_SEPARATE_CONNECTION, separateMetaConnectionCheck.getSelection());
store.setValue(PrefConstants.META_CASE_SENSITIVE, caseSensitiveNamesCheck.getSelection());
store.setValue(DBeaverPreferences.READ_EXPENSIVE_PROPERTIES, readExpensiveCheck.getSelection());
store.setValue(DBeaverPreferences.META_SEPARATE_CONNECTION, separateMetaConnectionCheck.getSelection());
store.setValue(DBeaverPreferences.META_CASE_SENSITIVE, caseSensitiveNamesCheck.getSelection());
} catch (Exception e) {
log.warn(e);
}
......@@ -108,9 +109,9 @@ public class PrefPageMetaData extends TargetPrefPage
@Override
protected void clearPreferences(IPreferenceStore store)
{
store.setToDefault(PrefConstants.READ_EXPENSIVE_PROPERTIES);
store.setToDefault(PrefConstants.META_SEPARATE_CONNECTION);
store.setToDefault(PrefConstants.META_CASE_SENSITIVE);
store.setToDefault(DBeaverPreferences.READ_EXPENSIVE_PROPERTIES);
store.setToDefault(DBeaverPreferences.META_SEPARATE_CONNECTION);
store.setToDefault(DBeaverPreferences.META_CASE_SENSITIVE);
}
@Override
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageResources.java
浏览文件 @ 25180317
......@@ -127,7 +127,7 @@ public class PrefPageResources extends PreferencePage implements IWorkbenchPrefe
public boolean performOk()
{
IPreferenceStore store = DBeaverCore.getGlobalPreferenceStore();
//store.setValue(PrefConstants.UI_AUTO_UPDATE_CHECK, automaticUpdateCheck.getSelection());
//store.setValue(DBeaverPreferences.UI_AUTO_UPDATE_CHECK, automaticUpdateCheck.getSelection());
RuntimeUtils.savePreferenceStore(store);
return super.performOk();
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageResultSet.java
浏览文件 @ 25180317
......@@ -22,6 +22,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.model.data.DBDBinaryFormatter;
......@@ -61,15 +62,15 @@ public class PrefPageResultSet extends TargetPrefPage
{
AbstractPreferenceStore store = dataSourceDescriptor.getPreferenceStore();
return
store.contains(PrefConstants.RESULT_SET_MAX_ROWS) ||
store.contains(PrefConstants.QUERY_ROLLBACK_ON_ERROR) ||
store.contains(PrefConstants.KEEP_STATEMENT_OPEN) ||
store.contains(PrefConstants.MEMORY_CONTENT_MAX_SIZE) ||
store.contains(PrefConstants.RESULT_SET_BINARY_SHOW_STRINGS) ||
store.contains(PrefConstants.RESULT_SET_BINARY_PRESENTATION) ||
store.contains(PrefConstants.RESULT_SET_BINARY_EDITOR_TYPE) ||
store.contains(PrefConstants.RESULT_SET_BINARY_STRING_MAX_LEN) ||
store.contains(PrefConstants.RESULT_SET_ORDER_SERVER_SIDE)
store.contains(DBeaverPreferences.RESULT_SET_MAX_ROWS) ||
store.contains(DBeaverPreferences.QUERY_ROLLBACK_ON_ERROR) ||
store.contains(DBeaverPreferences.KEEP_STATEMENT_OPEN) ||
store.contains(DBeaverPreferences.MEMORY_CONTENT_MAX_SIZE) ||
store.contains(DBeaverPreferences.RESULT_SET_BINARY_SHOW_STRINGS) ||
store.contains(DBeaverPreferences.RESULT_SET_BINARY_PRESENTATION) ||
store.contains(DBeaverPreferences.RESULT_SET_BINARY_EDITOR_TYPE) ||
store.contains(DBeaverPreferences.RESULT_SET_BINARY_STRING_MAX_LEN) ||
store.contains(DBeaverPreferences.RESULT_SET_ORDER_SERVER_SIDE)
;
}
......@@ -151,13 +152,13 @@ public class PrefPageResultSet extends TargetPrefPage
protected void loadPreferences(IPreferenceStore store)
{
try {
resultSetSize.setSelection(store.getInt(PrefConstants.RESULT_SET_MAX_ROWS));
keepStatementOpenCheck.setSelection(store.getBoolean(PrefConstants.KEEP_STATEMENT_OPEN));
rollbackOnErrorCheck.setSelection(store.getBoolean(PrefConstants.QUERY_ROLLBACK_ON_ERROR));
memoryContentSize.setSelection(store.getInt(PrefConstants.MEMORY_CONTENT_MAX_SIZE));
binaryStringMaxLength.setSelection(store.getInt(PrefConstants.RESULT_SET_BINARY_STRING_MAX_LEN));
resultSetSize.setSelection(store.getInt(DBeaverPreferences.RESULT_SET_MAX_ROWS));
keepStatementOpenCheck.setSelection(store.getBoolean(DBeaverPreferences.KEEP_STATEMENT_OPEN));
rollbackOnErrorCheck.setSelection(store.getBoolean(DBeaverPreferences.QUERY_ROLLBACK_ON_ERROR));
memoryContentSize.setSelection(store.getInt(DBeaverPreferences.MEMORY_CONTENT_MAX_SIZE));
binaryStringMaxLength.setSelection(store.getInt(DBeaverPreferences.RESULT_SET_BINARY_STRING_MAX_LEN));
DBDBinaryFormatter formatter = DBUtils.getBinaryPresentation(store.getString(PrefConstants.RESULT_SET_BINARY_PRESENTATION));
DBDBinaryFormatter formatter = DBUtils.getBinaryPresentation(store.getString(DBeaverPreferences.RESULT_SET_BINARY_PRESENTATION));
for (int i = 0; i < binaryPresentationCombo.getItemCount(); i++) {
if (binaryPresentationCombo.getItem(i).equals(formatter.getTitle())) {
binaryPresentationCombo.select(i);
......@@ -165,14 +166,14 @@ public class PrefPageResultSet extends TargetPrefPage
}
}
DBDValueController.EditType editorType = DBDValueController.EditType.valueOf(store.getString(PrefConstants.RESULT_SET_BINARY_EDITOR_TYPE));
DBDValueController.EditType editorType = DBDValueController.EditType.valueOf(store.getString(DBeaverPreferences.RESULT_SET_BINARY_EDITOR_TYPE));
if (editorType == DBDValueController.EditType.EDITOR) {
binaryEditorType.select(0);
} else {
binaryEditorType.select(1);
}
serverSideOrderingCheck.setSelection(store.getBoolean(PrefConstants.RESULT_SET_ORDER_SERVER_SIDE));
serverSideOrderingCheck.setSelection(store.getBoolean(DBeaverPreferences.RESULT_SET_ORDER_SERVER_SIDE));
} catch (Exception e) {
log.warn(e);
}
......@@ -182,25 +183,25 @@ public class PrefPageResultSet extends TargetPrefPage
protected void savePreferences(IPreferenceStore store)
{
try {
store.setValue(PrefConstants.RESULT_SET_MAX_ROWS, resultSetSize.getSelection());
store.setValue(PrefConstants.KEEP_STATEMENT_OPEN, keepStatementOpenCheck.getSelection());
store.setValue(PrefConstants.QUERY_ROLLBACK_ON_ERROR, rollbackOnErrorCheck.getSelection());
store.setValue(PrefConstants.MEMORY_CONTENT_MAX_SIZE, memoryContentSize.getSelection());
store.setValue(DBeaverPreferences.RESULT_SET_MAX_ROWS, resultSetSize.getSelection());
store.setValue(DBeaverPreferences.KEEP_STATEMENT_OPEN, keepStatementOpenCheck.getSelection());
store.setValue(DBeaverPreferences.QUERY_ROLLBACK_ON_ERROR, rollbackOnErrorCheck.getSelection());
store.setValue(DBeaverPreferences.MEMORY_CONTENT_MAX_SIZE, memoryContentSize.getSelection());
String presentationTitle = binaryPresentationCombo.getItem(binaryPresentationCombo.getSelectionIndex());
for (DBDBinaryFormatter formatter : DBDBinaryFormatter.FORMATS) {
if (formatter.getTitle().equals(presentationTitle)) {
store.setValue(PrefConstants.RESULT_SET_BINARY_PRESENTATION, formatter.getId());
store.setValue(DBeaverPreferences.RESULT_SET_BINARY_PRESENTATION, formatter.getId());
break;
}
}
store.setValue(PrefConstants.RESULT_SET_BINARY_STRING_MAX_LEN, binaryStringMaxLength.getSelection());
store.setValue(PrefConstants.RESULT_SET_BINARY_EDITOR_TYPE,
store.setValue(DBeaverPreferences.RESULT_SET_BINARY_STRING_MAX_LEN, binaryStringMaxLength.getSelection());
store.setValue(DBeaverPreferences.RESULT_SET_BINARY_EDITOR_TYPE,
binaryEditorType.getSelectionIndex() == 0 ?
DBDValueController.EditType.EDITOR.name() :
DBDValueController.EditType.PANEL.name());
store.setValue(PrefConstants.RESULT_SET_ORDER_SERVER_SIDE, serverSideOrderingCheck.getSelection());
store.setValue(DBeaverPreferences.RESULT_SET_ORDER_SERVER_SIDE, serverSideOrderingCheck.getSelection());
} catch (Exception e) {
log.warn(e);
}
......@@ -210,15 +211,15 @@ public class PrefPageResultSet extends TargetPrefPage
@Override
protected void clearPreferences(IPreferenceStore store)
{
store.setToDefault(PrefConstants.RESULT_SET_MAX_ROWS);
store.setToDefault(PrefConstants.KEEP_STATEMENT_OPEN);
store.setToDefault(PrefConstants.QUERY_ROLLBACK_ON_ERROR);
store.setToDefault(PrefConstants.MEMORY_CONTENT_MAX_SIZE);
store.setToDefault(PrefConstants.RESULT_SET_BINARY_SHOW_STRINGS);
store.setToDefault(PrefConstants.RESULT_SET_BINARY_PRESENTATION);
store.setToDefault(PrefConstants.RESULT_SET_BINARY_STRING_MAX_LEN);
store.setToDefault(PrefConstants.RESULT_SET_BINARY_EDITOR_TYPE);
store.setToDefault(PrefConstants.RESULT_SET_ORDER_SERVER_SIDE);
store.setToDefault(DBeaverPreferences.RESULT_SET_MAX_ROWS);
store.setToDefault(DBeaverPreferences.KEEP_STATEMENT_OPEN);
store.setToDefault(DBeaverPreferences.QUERY_ROLLBACK_ON_ERROR);
store.setToDefault(DBeaverPreferences.MEMORY_CONTENT_MAX_SIZE);
store.setToDefault(DBeaverPreferences.RESULT_SET_BINARY_SHOW_STRINGS);
store.setToDefault(DBeaverPreferences.RESULT_SET_BINARY_PRESENTATION);
store.setToDefault(DBeaverPreferences.RESULT_SET_BINARY_STRING_MAX_LEN);
store.setToDefault(DBeaverPreferences.RESULT_SET_BINARY_EDITOR_TYPE);
store.setToDefault(DBeaverPreferences.RESULT_SET_ORDER_SERVER_SIDE);
}
@Override
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageSQLEditor.java
浏览文件 @ 25180317
......@@ -27,6 +27,7 @@ import org.eclipse.ui.texteditor.AbstractTextEditor;
import org.eclipse.ui.texteditor.rulers.RulerColumnDescriptor;
import org.eclipse.ui.texteditor.rulers.RulerColumnPreferenceAdapter;
import org.eclipse.ui.texteditor.rulers.RulerColumnRegistry;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
......@@ -73,13 +74,13 @@ public class PrefPageSQLEditor extends TargetPrefPage
{
AbstractPreferenceStore store = dataSourceDescriptor.getPreferenceStore();
return
store.contains(PrefConstants.STATEMENT_INVALIDATE_BEFORE_EXECUTE) ||
store.contains(PrefConstants.STATEMENT_TIMEOUT) ||
store.contains(PrefConstants.SCRIPT_COMMIT_TYPE) ||
store.contains(PrefConstants.SCRIPT_ERROR_HANDLING) ||
store.contains(PrefConstants.SCRIPT_COMMIT_LINES) ||
store.contains(PrefConstants.SCRIPT_FETCH_RESULT_SETS) ||
store.contains(PrefConstants.SCRIPT_AUTO_FOLDERS) ||
store.contains(DBeaverPreferences.STATEMENT_INVALIDATE_BEFORE_EXECUTE) ||
store.contains(DBeaverPreferences.STATEMENT_TIMEOUT) ||
store.contains(DBeaverPreferences.SCRIPT_COMMIT_TYPE) ||
store.contains(DBeaverPreferences.SCRIPT_ERROR_HANDLING) ||
store.contains(DBeaverPreferences.SCRIPT_COMMIT_LINES) ||
store.contains(DBeaverPreferences.SCRIPT_FETCH_RESULT_SETS) ||
store.contains(DBeaverPreferences.SCRIPT_AUTO_FOLDERS) ||
store.contains(SQLPreferenceConstants.SQLEDITOR_CLOSE_SINGLE_QUOTES) ||
store.contains(SQLPreferenceConstants.SQLEDITOR_CLOSE_DOUBLE_QUOTES) ||
store.contains(SQLPreferenceConstants.SQLEDITOR_CLOSE_BRACKETS)
......@@ -213,14 +214,14 @@ public class PrefPageSQLEditor extends TargetPrefPage
protected void loadPreferences(IPreferenceStore store)
{
try {
invalidateBeforeExecuteCheck.setSelection(store.getBoolean(PrefConstants.STATEMENT_INVALIDATE_BEFORE_EXECUTE));
executeTimeoutText.setSelection(store.getInt(PrefConstants.STATEMENT_TIMEOUT));
commitTypeCombo.select(SQLScriptCommitType.valueOf(store.getString(PrefConstants.SCRIPT_COMMIT_TYPE)).ordinal());
errorHandlingCombo.select(SQLScriptErrorHandling.valueOf(store.getString(PrefConstants.SCRIPT_ERROR_HANDLING)).ordinal());
commitLinesText.setSelection(store.getInt(PrefConstants.SCRIPT_COMMIT_LINES));
fetchResultSetsCheck.setSelection(store.getBoolean(PrefConstants.SCRIPT_FETCH_RESULT_SETS));
autoFoldersCheck.setSelection(store.getBoolean(PrefConstants.SCRIPT_AUTO_FOLDERS));
invalidateBeforeExecuteCheck.setSelection(store.getBoolean(DBeaverPreferences.STATEMENT_INVALIDATE_BEFORE_EXECUTE));
executeTimeoutText.setSelection(store.getInt(DBeaverPreferences.STATEMENT_TIMEOUT));
commitTypeCombo.select(SQLScriptCommitType.valueOf(store.getString(DBeaverPreferences.SCRIPT_COMMIT_TYPE)).ordinal());
errorHandlingCombo.select(SQLScriptErrorHandling.valueOf(store.getString(DBeaverPreferences.SCRIPT_ERROR_HANDLING)).ordinal());
commitLinesText.setSelection(store.getInt(DBeaverPreferences.SCRIPT_COMMIT_LINES));
fetchResultSetsCheck.setSelection(store.getBoolean(DBeaverPreferences.SCRIPT_FETCH_RESULT_SETS));
autoFoldersCheck.setSelection(store.getBoolean(DBeaverPreferences.SCRIPT_AUTO_FOLDERS));
csAutoActivationCheck.setSelection(store.getBoolean(SQLPreferenceConstants.ENABLE_AUTO_ACTIVATION));
csAutoActivationDelaySpinner.setSelection(store.getInt(SQLPreferenceConstants.AUTO_ACTIVATION_DELAY));
csAutoInsertCheck.setSelection(store.getBoolean(SQLPreferenceConstants.INSERT_SINGLE_PROPOSALS_AUTO));
......@@ -245,19 +246,19 @@ public class PrefPageSQLEditor extends TargetPrefPage
protected void savePreferences(IPreferenceStore store)
{
try {
store.setValue(PrefConstants.STATEMENT_INVALIDATE_BEFORE_EXECUTE, invalidateBeforeExecuteCheck.getSelection());
store.setValue(PrefConstants.STATEMENT_TIMEOUT, executeTimeoutText.getSelection());
store.setValue(DBeaverPreferences.STATEMENT_INVALIDATE_BEFORE_EXECUTE, invalidateBeforeExecuteCheck.getSelection());
store.setValue(DBeaverPreferences.STATEMENT_TIMEOUT, executeTimeoutText.getSelection());
store.setValue(SQLPreferenceConstants.ENABLE_AUTO_ACTIVATION, csAutoActivationCheck.getSelection());
store.setValue(SQLPreferenceConstants.AUTO_ACTIVATION_DELAY, csAutoActivationDelaySpinner.getSelection());
store.setValue(SQLPreferenceConstants.INSERT_SINGLE_PROPOSALS_AUTO, csAutoInsertCheck.getSelection());
store.setValue(SQLPreferenceConstants.PROPOSAL_INSERT_CASE, csInsertCase.getSelectionIndex());
store.setValue(PrefConstants.SCRIPT_COMMIT_TYPE, SQLScriptCommitType.fromOrdinal(commitTypeCombo.getSelectionIndex()).name());
store.setValue(PrefConstants.SCRIPT_COMMIT_LINES, commitLinesText.getSelection());
store.setValue(PrefConstants.SCRIPT_ERROR_HANDLING, SQLScriptErrorHandling.fromOrdinal(errorHandlingCombo.getSelectionIndex()).name());
store.setValue(PrefConstants.SCRIPT_FETCH_RESULT_SETS, fetchResultSetsCheck.getSelection());
store.setValue(PrefConstants.SCRIPT_AUTO_FOLDERS, autoFoldersCheck.getSelection());
store.setValue(DBeaverPreferences.SCRIPT_COMMIT_TYPE, SQLScriptCommitType.fromOrdinal(commitTypeCombo.getSelectionIndex()).name());
store.setValue(DBeaverPreferences.SCRIPT_COMMIT_LINES, commitLinesText.getSelection());
store.setValue(DBeaverPreferences.SCRIPT_ERROR_HANDLING, SQLScriptErrorHandling.fromOrdinal(errorHandlingCombo.getSelectionIndex()).name());
store.setValue(DBeaverPreferences.SCRIPT_FETCH_RESULT_SETS, fetchResultSetsCheck.getSelection());
store.setValue(DBeaverPreferences.SCRIPT_AUTO_FOLDERS, autoFoldersCheck.getSelection());
store.setValue(SQLPreferenceConstants.SQLEDITOR_CLOSE_SINGLE_QUOTES, acSingleQuotesCheck.getSelection());
store.setValue(SQLPreferenceConstants.SQLEDITOR_CLOSE_DOUBLE_QUOTES, acDoubleQuotesCheck.getSelection());
......@@ -278,19 +279,19 @@ public class PrefPageSQLEditor extends TargetPrefPage
@Override
protected void clearPreferences(IPreferenceStore store)
{
store.setToDefault(PrefConstants.STATEMENT_INVALIDATE_BEFORE_EXECUTE);
store.setToDefault(PrefConstants.STATEMENT_TIMEOUT);
store.setToDefault(DBeaverPreferences.STATEMENT_INVALIDATE_BEFORE_EXECUTE);
store.setToDefault(DBeaverPreferences.STATEMENT_TIMEOUT);
store.setToDefault(SQLPreferenceConstants.ENABLE_AUTO_ACTIVATION);
store.setToDefault(SQLPreferenceConstants.AUTO_ACTIVATION_DELAY);
store.setToDefault(SQLPreferenceConstants.INSERT_SINGLE_PROPOSALS_AUTO);
store.setToDefault(SQLPreferenceConstants.PROPOSAL_INSERT_CASE);
store.setToDefault(PrefConstants.SCRIPT_COMMIT_TYPE);
store.setToDefault(PrefConstants.SCRIPT_COMMIT_LINES);
store.setToDefault(PrefConstants.SCRIPT_ERROR_HANDLING);
store.setToDefault(PrefConstants.SCRIPT_FETCH_RESULT_SETS);
store.setToDefault(PrefConstants.SCRIPT_AUTO_FOLDERS);
store.setToDefault(DBeaverPreferences.SCRIPT_COMMIT_TYPE);
store.setToDefault(DBeaverPreferences.SCRIPT_COMMIT_LINES);
store.setToDefault(DBeaverPreferences.SCRIPT_ERROR_HANDLING);
store.setToDefault(DBeaverPreferences.SCRIPT_FETCH_RESULT_SETS);
store.setToDefault(DBeaverPreferences.SCRIPT_AUTO_FOLDERS);
store.setToDefault(SQLPreferenceConstants.SQLEDITOR_CLOSE_SINGLE_QUOTES);
store.setToDefault(SQLPreferenceConstants.SQLEDITOR_CLOSE_DOUBLE_QUOTES);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/properties/DataSourcePropertyFilter.java
浏览文件 @ 25180317
......@@ -22,7 +22,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.IFilter;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
/**
* Datasource property filter
......@@ -36,7 +36,7 @@ public class DataSourcePropertyFilter implements IFilter {
IPreferenceStore store = dataSource != null ?
dataSource.getContainer().getPreferenceStore() :
DBeaverCore.getGlobalPreferenceStore();
this.showExpensive = store.getBoolean(PrefConstants.READ_EXPENSIVE_PROPERTIES);
this.showExpensive = store.getBoolean(DBeaverPreferences.READ_EXPENSIVE_PROPERTIES);
}
@Override
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/DatabaseNavigatorTree.java
浏览文件 @ 25180317
......@@ -35,6 +35,7 @@ import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.IWorkbenchCommandConstants;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.model.navigator.*;
......@@ -45,7 +46,6 @@ import org.jkiss.dbeaver.ui.ActionUtils;
import org.jkiss.dbeaver.ui.NavigatorUtils;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerObjectRename;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.utils.CommonUtils;
import java.lang.reflect.InvocationTargetException;
......@@ -203,7 +203,7 @@ public class DatabaseNavigatorTree extends Composite implements IDBNListener
private void expandNodeOnLoad(final DBNNode node)
{
if (node instanceof DBNDataSource && DBeaverCore.getGlobalPreferenceStore().getBoolean(PrefConstants.NAVIGATOR_EXPAND_ON_CONNECT)) {
if (node instanceof DBNDataSource && DBeaverCore.getGlobalPreferenceStore().getBoolean(DBeaverPreferences.NAVIGATOR_EXPAND_ON_CONNECT)) {
try {
DBRRunnableWithResult<DBNNode> runnable = new DBRRunnableWithResult<DBNNode>() {
@Override
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/load/TreeLoadService.java
浏览文件 @ 25180317
......@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.model.navigator.DBNContainer;
import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.runtime.load.DatabaseLoadService;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.utils.CommonUtils;
import java.lang.reflect.InvocationTargetException;
......@@ -96,7 +96,7 @@ public class TreeLoadService extends DatabaseLoadService<Object[]> {
{
// Sort children is we have this feature on in preferences
// and if children are not folders
if (!children.isEmpty() && DBeaverCore.getGlobalPreferenceStore().getBoolean(PrefConstants.NAVIGATOR_SORT_ALPHABETICALLY)) {
if (!children.isEmpty() && DBeaverCore.getGlobalPreferenceStore().getBoolean(DBeaverPreferences.NAVIGATOR_SORT_ALPHABETICALLY)) {
if (!(children.get(0) instanceof DBNContainer)) {
Collections.sort(children, new Comparator<DBNNode>() {
@Override
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/utils/ContentUtils.java
浏览文件 @ 25180317
......@@ -31,13 +31,13 @@ import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPathEditorInput;
import org.jkiss.dbeaver.DBeaverPreferences;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.data.DBDContent;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.preferences.PrefConstants;
import org.jkiss.utils.CommonUtils;
import javax.activation.MimeType;
......@@ -574,7 +574,7 @@ public class ContentUtils {
} else {
preferenceStore = dataSource.getContainer().getPreferenceStore();
}
String fileEncoding = preferenceStore.getString(PrefConstants.CONTENT_HEX_ENCODING);
String fileEncoding = preferenceStore.getString(DBeaverPreferences.CONTENT_HEX_ENCODING);
if (CommonUtils.isEmpty(fileEncoding)) {
fileEncoding = getDefaultFileEncoding();
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或