diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java index 840f018572089171c38258e41e7d7c8112fa07ec..7e7a6319a15be98623bf113b5310d3bb5a660d43 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverPreferencesInitializer.java @@ -18,12 +18,12 @@ package org.jkiss.dbeaver.core; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.jkiss.dbeaver.DBeaverPreferences; +import org.jkiss.dbeaver.model.DBConstants; import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose; import org.jkiss.dbeaver.model.impl.preferences.BundlePreferenceStore; import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore; import org.jkiss.dbeaver.model.qm.QMConstants; import org.jkiss.dbeaver.model.qm.QMObjectType; -import org.jkiss.dbeaver.registry.formatter.DataFormatterProfile; import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.dbeaver.utils.PrefUtils; import org.jkiss.dbeaver.utils.RuntimeUtils; @@ -31,7 +31,6 @@ import org.jkiss.dbeaver.utils.SystemVariablesResolver; import java.io.File; import java.util.Arrays; -import java.util.Locale; public class DBeaverPreferencesInitializer extends AbstractPreferenceInitializer { @@ -78,7 +77,7 @@ public class DBeaverPreferencesInitializer extends AbstractPreferenceInitializer // Logs PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.LOGS_DEBUG_ENABLED, true); PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.LOGS_DEBUG_LOCATION, - "${" + SystemVariablesResolver.VAR_WORKSPACE + "}" + File.separator + ".metadata" + File.separator + "dbeaver-debug.log"); + "${" + SystemVariablesResolver.VAR_WORKSPACE + "}" + File.separator + ".metadata" + File.separator + DBConstants.DEBUG_LOG_FILE_NAME); } } diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBConstants.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBConstants.java index 21afa61cafe8beb54da5da46ae73eee9f8f98217..145d5def6462461cfe1f8ad88b783202ceecddda 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBConstants.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBConstants.java @@ -120,4 +120,6 @@ public class DBConstants { public static final String WORKSPACE_PROPS_FILE = "dbeaver-workspace.properties"; //$NON-NLS-1$ public static final String LABEL_NA = "N/A"; + + public static final String DEBUG_LOG_FILE_NAME = "dbeaver-debug.log"; } diff --git a/plugins/org.jkiss.dbeaver.ui.app.standalone/src/org/jkiss/dbeaver/ui/app/standalone/DBeaverApplication.java b/plugins/org.jkiss.dbeaver.ui.app.standalone/src/org/jkiss/dbeaver/ui/app/standalone/DBeaverApplication.java index cf5ba27f254f786ecfdfbd5e46d851c5f2f0d4fd..01256c03afd65403d5405bfc9e93ba3505c8627c 100644 --- a/plugins/org.jkiss.dbeaver.ui.app.standalone/src/org/jkiss/dbeaver/ui/app/standalone/DBeaverApplication.java +++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/src/org/jkiss/dbeaver/ui/app/standalone/DBeaverApplication.java @@ -35,6 +35,7 @@ import org.eclipse.ui.internal.ide.ChooseWorkspaceDialog; import org.jkiss.code.NotNull; import org.jkiss.dbeaver.DBeaverPreferences; import org.jkiss.dbeaver.Log; +import org.jkiss.dbeaver.model.DBConstants; import org.jkiss.dbeaver.model.app.DBASecureStorage; import org.jkiss.dbeaver.model.app.DBPApplicationController; import org.jkiss.dbeaver.model.impl.app.DefaultSecureStorage; @@ -533,7 +534,7 @@ public class DBeaverApplication extends BaseApplicationImpl implements DBPApplic } String logLocation = preferenceStore.getString(DBeaverPreferences.LOGS_DEBUG_LOCATION); if (CommonUtils.isEmpty(logLocation)) { - logLocation = new File(GeneralUtils.getMetadataFolder(), "dbeaver-debug.log").getAbsolutePath(); //$NON-NLS-1$ + logLocation = new File(GeneralUtils.getMetadataFolder(), DBConstants.DEBUG_LOG_FILE_NAME).getAbsolutePath(); //$NON-NLS-1$ } logLocation = GeneralUtils.replaceVariables(logLocation, new SystemVariablesResolver()); File debugLogFile = new File(logLocation);