Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
db62c69a
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
db62c69a
编写于
4月 12, 2021
作者:
N
Nikita Akilov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#11895 add display format option to stream consumer settings
Former-commit-id:
570b2897
上级
4f5b4325
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
57 addition
and
23 deletion
+57
-23
plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageSettings.java
.../transfer/ui/pages/stream/StreamConsumerPageSettings.java
+11
-0
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamConsumerSettings.java
...dbeaver/tools/transfer/stream/StreamConsumerSettings.java
+15
-2
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
...dbeaver/tools/transfer/stream/StreamTransferConsumer.java
+4
-4
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/handler/ResultSetHandlerCopySpecial.java
...ntrols/resultset/handler/ResultSetHandlerCopySpecial.java
+1
-1
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages.java
...ver/ui/controls/resultset/internal/ResultSetMessages.java
+0
-5
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageResultSetPresentationPlainText.java
...a/preferences/PrefPageResultSetPresentationPlainText.java
+1
-1
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/ValueFormatSelector.java
...rc/org/jkiss/dbeaver/ui/controls/ValueFormatSelector.java
+10
-10
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.java
...aver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.java
+5
-0
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.properties
...i/src/org/jkiss/dbeaver/ui/internal/UIMessages.properties
+5
-0
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages_ru.properties
...rc/org/jkiss/dbeaver/ui/internal/UIMessages_ru.properties
+5
-0
未找到文件。
plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/stream/StreamConsumerPageSettings.java
浏览文件 @
db62c69a
...
...
@@ -53,6 +53,7 @@ import org.jkiss.dbeaver.ui.SharedTextColors;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.controls.CustomComboBoxCellEditor
;
import
org.jkiss.dbeaver.ui.controls.TreeContentProvider
;
import
org.jkiss.dbeaver.ui.controls.ValueFormatSelector
;
import
org.jkiss.dbeaver.ui.dialogs.ActiveWizardPage
;
import
org.jkiss.dbeaver.ui.dialogs.BaseDialog
;
import
org.jkiss.dbeaver.ui.properties.PropertyTreeViewer
;
...
...
@@ -81,6 +82,7 @@ public class StreamConsumerPageSettings extends ActiveWizardPage<DataTransferWiz
private
Combo
lobEncodingCombo
;
private
Combo
formatProfilesCombo
;
private
PropertySourceCustom
propertySource
;
private
ValueFormatSelector
valueFormatSelector
;
public
StreamConsumerPageSettings
()
{
super
(
DTMessages
.
data_transfer_wizard_settings_name
);
...
...
@@ -179,6 +181,15 @@ public class StreamConsumerPageSettings extends ActiveWizardPage<DataTransferWiz
}
});
valueFormatSelector
=
new
ValueFormatSelector
(
generalSettings
);
valueFormatSelector
.
select
(
settings
.
getValueFormat
());
valueFormatSelector
.
addSelectionListener
(
new
SelectionAdapter
()
{
@Override
public
void
widgetSelected
(
SelectionEvent
e
)
{
settings
.
setValueFormat
(
valueFormatSelector
.
getSelection
());
}
});
{
Composite
columnsPanel
=
UIUtils
.
createComposite
(
generalSettings
,
5
);
columnsPanel
.
setLayoutData
(
new
GridData
(
SWT
.
FILL
,
SWT
.
FILL
,
true
,
false
,
5
,
1
));
...
...
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamConsumerSettings.java
浏览文件 @
db62c69a
...
...
@@ -21,9 +21,9 @@ import org.jkiss.code.Nullable;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.data.DBDDataFormatterProfile
;
import
org.jkiss.dbeaver.model.data.DBDDisplayFormat
;
import
org.jkiss.dbeaver.model.data.json.JSONUtils
;
import
org.jkiss.dbeaver.model.runtime.DBRRunnableContext
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSDataContainer
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
...
...
@@ -60,7 +60,8 @@ public class StreamConsumerSettings implements IDataTransferSettings {
public
static
final
String
PROP_EXTRACT_IMAGES
=
"extractImages"
;
public
static
final
String
PROP_FILE_EXTENSION
=
"extension"
;
public
static
final
String
PROP_FORMAT
=
"format"
;
private
static
final
String
SETTING_VALUE_FORMAT
=
"valueFormat"
;
//$NON-NLS-1$
private
LobExtractType
lobExtractType
=
LobExtractType
.
SKIP
;
private
LobEncoding
lobEncoding
=
LobEncoding
.
HEX
;
...
...
@@ -72,6 +73,8 @@ public class StreamConsumerSettings implements IDataTransferSettings {
private
String
outputTimestampPattern
=
GeneralUtils
.
DEFAULT_TIMESTAMP_PATTERN
;
private
DBDDataFormatterProfile
formatterProfile
;
@NotNull
private
DBDDisplayFormat
valueFormat
=
DBDDisplayFormat
.
UI
;
private
boolean
outputClipboard
=
false
;
private
boolean
useSingleFile
=
false
;
...
...
@@ -253,6 +256,7 @@ public class StreamConsumerSettings implements IDataTransferSettings {
if
(!
CommonUtils
.
isEmpty
(
formatterProfile
))
{
this
.
formatterProfile
=
DBWorkbench
.
getPlatform
().
getDataFormatterRegistry
().
getCustomProfile
(
formatterProfile
);
}
valueFormat
=
DBDDisplayFormat
.
safeValueOf
(
CommonUtils
.
toString
(
settings
.
get
(
SETTING_VALUE_FORMAT
)));
final
Map
<
String
,
Object
>
mappings
=
JSONUtils
.
getObjectOrNull
(
settings
,
"mappings"
);
if
(
mappings
!=
null
&&
!
mappings
.
isEmpty
())
{
...
...
@@ -313,6 +317,7 @@ public class StreamConsumerSettings implements IDataTransferSettings {
}
else
{
settings
.
put
(
"formatterProfile"
,
""
);
}
settings
.
put
(
SETTING_VALUE_FORMAT
,
valueFormat
.
name
());
if
(!
dataMappings
.
isEmpty
())
{
final
Map
<
String
,
Object
>
mappings
=
new
LinkedHashMap
<>();
...
...
@@ -354,4 +359,12 @@ public class StreamConsumerSettings implements IDataTransferSettings {
return
summary
.
toString
();
}
@NotNull
public
DBDDisplayFormat
getValueFormat
()
{
return
valueFormat
;
}
public
void
setValueFormat
(
@NotNull
DBDDisplayFormat
valueFormat
)
{
this
.
valueFormat
=
valueFormat
;
}
}
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
浏览文件 @
db62c69a
...
...
@@ -69,6 +69,7 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
private
static
final
Log
log
=
Log
.
getLog
(
StreamTransferConsumer
.
class
);
private
static
final
String
LOB_DIRECTORY_NAME
=
"files"
;
//$NON-NLS-1$
private
static
final
String
PROP_FORMAT
=
"format"
;
//$NON-NLS-1$
public
static
final
String
VARIABLE_DATASOURCE
=
"datasource"
;
public
static
final
String
VARIABLE_CATALOG
=
"catalog"
;
...
...
@@ -613,12 +614,11 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
@Override
public
DBDDisplayFormat
getExportFormat
()
{
DBDDisplayFormat
format
=
DBDDisplayFormat
.
UI
;
Object
formatProp
=
processorProperties
.
get
(
StreamConsumerSettings
.
PROP_FORMAT
);
Object
formatProp
=
processorProperties
.
get
(
PROP_FORMAT
);
if
(
formatProp
!=
null
)
{
format
=
DBDDisplayFormat
.
valueOf
(
formatProp
.
toString
().
toUpperCase
(
Locale
.
ENGLISH
));
return
DBDDisplayFormat
.
valueOf
(
formatProp
.
toString
().
toUpperCase
(
Locale
.
ENGLISH
));
}
return
format
;
return
settings
.
getValueFormat
()
;
}
@Override
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/handler/ResultSetHandlerCopySpecial.java
浏览文件 @
db62c69a
...
...
@@ -29,10 +29,10 @@ import org.eclipse.ui.menus.UIElement;
import
org.jkiss.dbeaver.model.data.DBDDisplayFormat
;
import
org.jkiss.dbeaver.ui.IActionConstants
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.controls.ValueFormatSelector
;
import
org.jkiss.dbeaver.ui.controls.resultset.IResultSetController
;
import
org.jkiss.dbeaver.ui.controls.resultset.ResultSetCopySettings
;
import
org.jkiss.dbeaver.ui.controls.resultset.ResultSetUtils
;
import
org.jkiss.dbeaver.ui.controls.resultset.ValueFormatSelector
;
import
org.jkiss.dbeaver.ui.controls.resultset.internal.ResultSetMessages
;
import
org.jkiss.utils.CommonUtils
;
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages.java
浏览文件 @
db62c69a
...
...
@@ -284,11 +284,6 @@ public class ResultSetMessages extends NLS {
public
static
String
pref_page_database_general_use_column_names
;
public
static
String
pref_page_database_general_use_column_names_tip
;
public
static
String
value_format_selector_database_native
;
public
static
String
value_format_selector_display
;
public
static
String
value_format_selector_editable
;
public
static
String
value_format_selector_value
;
public
static
String
dialog_text_check_box_record
;
public
static
String
results_decorator_drag_and_drop_results_column
;
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageResultSetPresentationPlainText.java
浏览文件 @
db62c69a
...
...
@@ -24,8 +24,8 @@ import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import
org.jkiss.dbeaver.model.data.DBDDisplayFormat
;
import
org.jkiss.dbeaver.model.preferences.DBPPreferenceStore
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.controls.ValueFormatSelector
;
import
org.jkiss.dbeaver.ui.controls.resultset.ResultSetPreferences
;
import
org.jkiss.dbeaver.ui.controls.resultset.ValueFormatSelector
;
import
org.jkiss.dbeaver.ui.editors.data.internal.DataEditorsMessages
;
import
org.jkiss.dbeaver.ui.preferences.TargetPrefPage
;
import
org.jkiss.dbeaver.utils.PrefUtils
;
...
...
plugins/org.jkiss.dbeaver.ui
.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset
/ValueFormatSelector.java
→
plugins/org.jkiss.dbeaver.ui
/src/org/jkiss/dbeaver/ui/controls
/ValueFormatSelector.java
浏览文件 @
db62c69a
...
...
@@ -14,29 +14,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.ui.controls
.resultset
;
package
org.jkiss.dbeaver.ui.controls
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.events.SelectionListener
;
import
org.eclipse.swt.widgets.Combo
;
import
org.eclipse.swt.widgets.Composite
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.dbeaver.model.data.DBDDisplayFormat
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.
controls.resultset.internal.ResultSet
Messages
;
import
org.jkiss.dbeaver.ui.
internal.UI
Messages
;
/**
* ValueFormatSelector
*/
public
class
ValueFormatSelector
{
private
final
Combo
formatCombo
;
public
ValueFormatSelector
(
@NotNull
Composite
parent
)
{
UIUtils
.
createControlLabel
(
parent
,
ResultSet
Messages
.
value_format_selector_value
);
UIUtils
.
createControlLabel
(
parent
,
UI
Messages
.
value_format_selector_value
);
formatCombo
=
new
Combo
(
parent
,
SWT
.
BORDER
|
SWT
.
DROP_DOWN
|
SWT
.
READ_ONLY
);
formatCombo
.
add
(
ResultSet
Messages
.
value_format_selector_display
);
formatCombo
.
add
(
ResultSet
Messages
.
value_format_selector_editable
);
formatCombo
.
add
(
ResultSet
Messages
.
value_format_selector_database_native
);
formatCombo
.
add
(
UI
Messages
.
value_format_selector_display
);
formatCombo
.
add
(
UI
Messages
.
value_format_selector_editable
);
formatCombo
.
add
(
UI
Messages
.
value_format_selector_database_native
);
}
public
void
select
(
@NotNull
DBDDisplayFormat
format
)
{
...
...
@@ -52,4 +49,7 @@ public class ValueFormatSelector {
}
}
public
void
addSelectionListener
(
@NotNull
SelectionListener
selectionListener
)
{
formatCombo
.
addSelectionListener
(
selectionListener
);
}
}
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.java
浏览文件 @
db62c69a
...
...
@@ -77,6 +77,11 @@ public class UIMessages extends NLS {
public
static
String
control_label_connection_folder
;
public
static
String
value_format_selector_value
;
public
static
String
value_format_selector_display
;
public
static
String
value_format_selector_editable
;
public
static
String
value_format_selector_database_native
;
static
{
// initialize resource bundle
NLS
.
initializeMessages
(
BUNDLE_NAME
,
UIMessages
.
class
);
...
...
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages.properties
浏览文件 @
db62c69a
...
...
@@ -50,3 +50,8 @@ save_execution_plan = Save execution plan
load_execution_plan
=
Load execution plan
control_label_connection_folder
=
Connection folder
value_format_selector_database_native
=
Database native
value_format_selector_display
=
Display (default)
value_format_selector_editable
=
Editable
value_format_selector_value
=
Value Format
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/internal/UIMessages_ru.properties
浏览文件 @
db62c69a
...
...
@@ -43,3 +43,8 @@ ui_properties_name=\u0418\u043C\u044F
ui_properties_value
=
\u0417\u
043D
\u0430\u0447\u0435\u
043D
\u0438\u0435
control_label_connection_folder
=
\u
041F
\u0430\u
043F
\u
043A
\u0430
\u0441\u
043E
\u0435\u0434\u0438\u
043D
\u0435\u
043D
\u0438\u
044F
value_format_selector_database_native
=
\u0424\u
043E
\u0440\u
043C
\u0430\u0442
\u0441\u0435\u0440\u0432\u0435\u0440\u0430
\u0411\u0414
value_format_selector_display
=
\u0421\u0442\u0430\u
043D
\u0434\u0430\u0440\u0442\u
043D
\u
044B
\u0439
(
\u
043F
\u
043E
\u0443\u
043C
\u
043E
\u
043B
\u0447\u0430\u
043D
\u0438\u
044E)
value_format_selector_editable
=
\u
041F
\u0440\u
043E
\u0441\u0442\u
043E
\u0439
value_format_selector_value
=
\u0424\u
043E
\u0440\u
043C
\u0430\u0442
\u0437\u
043D
\u0430\u0447\u0435\u
043D
\u0438\u
044F
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录