Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
3215a327
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
3215a327
编写于
3月 06, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Composire folders redesign
上级
8e4756a1
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
146 addition
and
126 deletion
+146
-126
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderComposite.java
...rg/jkiss/dbeaver/ui/controls/folders/FolderComposite.java
+141
-121
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java
.../ui/editors/entity/properties/ObjectPropertiesEditor.java
+3
-3
plugins/org.jkiss.dbeaver.generic/plugin.xml
plugins/org.jkiss.dbeaver.generic/plugin.xml
+1
-1
plugins/org.jkiss.dbeaver.mysql/plugin.xml
plugins/org.jkiss.dbeaver.mysql/plugin.xml
+1
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderComposite.java
浏览文件 @
3215a327
/*******************************************************************************
* Copyright (c) 2001, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
* Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 259553
* Amit Joglekar <joglekar@us.ibm.com> - Support for dynamic images (bug 385795)
*
/*
* Copyright (C) 2010-2015 Serge Rieder
* serge@jkiss.org
*
...
...
@@ -31,13 +20,15 @@
package
org.jkiss.dbeaver.ui.controls.folders
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.events.*
;
import
org.eclipse.swt.events.DisposeEvent
;
import
org.eclipse.swt.events.DisposeListener
;
import
org.eclipse.swt.events.SelectionAdapter
;
import
org.eclipse.swt.events.SelectionEvent
;
import
org.eclipse.swt.layout.FillLayout
;
import
org.eclipse.swt.layout.GridData
;
import
org.eclipse.swt.layout.GridLayout
;
import
org.eclipse.swt.widgets.Composite
;
import
org.eclipse.swt.widgets.Control
;
import
org.eclipse.swt.widgets.Label
;
import
org.eclipse.swt.widgets.Sash
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
...
...
@@ -53,53 +44,53 @@ import java.util.Map;
* Folders composite.
* Styles:
* SWT.LEFT, SWT.RIGHT - tabs orientation
* SWT.SINGLE, SWT.MULTI - use single-page or multi-page mode
*/
public
class
FolderComposite
extends
Composite
implements
IFolderContainer
{
@Nullable
private
FolderList
folderList
;
@NotNull
private
final
Composite
p
ane
;
private
final
Composite
compositeP
ane
;
@Nullable
private
FolderInfo
[]
folders
;
@Nullable
private
IFolder
curFolder
;
@Nullable
private
Control
curContent
;
private
final
Map
<
FolderInfo
,
Composite
>
contentsMap
=
new
HashMap
<
FolderInfo
,
Composite
>();
private
List
<
IFolderListener
>
listeners
=
new
ArrayList
<
IFolderListener
>();
private
List
<
FolderPane
>
folderPanes
=
new
ArrayList
<
FolderPane
>();
public
FolderComposite
(
Composite
parent
,
int
style
)
{
super
(
parent
,
style
);
private
class
FolderPane
extends
Composite
{
FolderInfo
[]
folders
;
FolderList
folderList
;
Composite
pane
;
@Nullable
private
Control
curContent
;
@Nullable
private
IFolder
curFolder
;
public
FolderPane
(
Composite
parent
)
{
super
(
parent
,
SWT
.
NONE
);
this
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
GridLayout
gl
=
new
GridLayout
(
2
,
false
);
gl
.
marginWidth
=
0
;
gl
.
marginHeight
=
0
;
gl
.
horizontalSpacing
=
0
;
gl
.
verticalSpacing
=
0
;
gl
.
marginHeight
=
0
;
gl
.
marginWidth
=
0
;
setLayout
(
gl
);
this
.
setLayout
(
gl
);
boolean
single
=
(
style
&
SWT
.
SINGLE
)
!=
0
;
if
(!
single
&&
((
style
&
SWT
.
LEFT
)
!=
0
||
(
style
&
SWT
.
RIGHT
)
==
0
))
{
folderList
=
new
FolderList
(
this
);
folderList
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_VERTICAL
));
}
this
.
folderList
=
new
FolderList
(
this
);
GridData
gd
=
new
GridData
(
GridData
.
FILL_VERTICAL
);
gd
.
verticalSpan
=
2
;
this
.
folderList
.
setLayoutData
(
gd
);
pane
=
new
Composite
(
this
,
SWT
.
NONE
);
gl
=
new
GridLayout
(
1
,
false
);
gl
.
horizontalSpacing
=
0
;
gl
.
verticalSpacing
=
0
;
gl
.
marginHeight
=
0
;
gl
.
marginWidth
=
0
;
pane
.
setLayout
(
gl
);
pane
=
UIUtils
.
createPlaceholder
(
this
,
1
);
pane
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
if
(!
single
&&
(
style
&
SWT
.
RIGHT
)
!=
0
)
{
folderList
=
new
FolderList
(
this
);
folderList
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_VERTICAL
));
{
Sash
horizontalLine
=
new
Sash
(
this
,
SWT
.
NONE
);
gd
=
new
GridData
(
GridData
.
FILL_HORIZONTAL
);
gd
.
heightHint
=
5
;
horizontalLine
.
setLayoutData
(
gd
);
}
if
(!
single
)
{
folderList
.
addSelectionListener
(
new
SelectionAdapter
()
{
@Override
public
void
widgetSelected
(
SelectionEvent
e
)
{
...
...
@@ -108,14 +99,10 @@ public class FolderComposite extends Composite implements IFolderContainer {
});
}
addDisposeListener
(
new
DisposeListener
()
{
@Override
public
void
widgetDisposed
(
DisposeEvent
e
)
{
for
(
FolderInfo
folderDescription
:
contentsMap
.
keySet
())
{
folderDescription
.
getContents
().
dispose
();
}
}
});
public
void
setFolders
(
FolderInfo
[]
folders
)
{
this
.
folders
=
folders
;
this
.
folderList
.
setFolders
(
this
.
folders
);
this
.
folderList
.
select
(
0
);
}
private
void
onFolderSwitch
(
FolderInfo
folder
)
{
...
...
@@ -146,10 +133,76 @@ public class FolderComposite extends Composite implements IFolderContainer {
}
}
}
public
FolderComposite
(
Composite
parent
,
int
style
)
{
super
(
parent
,
style
);
GridLayout
gl
=
new
GridLayout
(
2
,
false
);
gl
.
horizontalSpacing
=
0
;
gl
.
verticalSpacing
=
0
;
gl
.
marginHeight
=
0
;
gl
.
marginWidth
=
0
;
setLayout
(
gl
);
compositePane
=
new
Composite
(
this
,
SWT
.
NONE
);
gl
=
new
GridLayout
(
1
,
false
);
gl
.
horizontalSpacing
=
0
;
gl
.
verticalSpacing
=
0
;
gl
.
marginHeight
=
0
;
gl
.
marginWidth
=
0
;
compositePane
.
setLayout
(
gl
);
compositePane
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
addDisposeListener
(
new
DisposeListener
()
{
@Override
public
void
widgetDisposed
(
DisposeEvent
e
)
{
for
(
FolderInfo
folderDescription
:
contentsMap
.
keySet
())
{
folderDescription
.
getContents
().
dispose
();
}
}
});
}
public
void
setFolders
(
@NotNull
final
FolderInfo
[]
folders
)
{
this
.
folders
=
folders
;
if
(
this
.
folderList
==
null
)
{
createFlatFolders
(
folders
);
List
<
List
<
FolderInfo
>>
groups
=
new
ArrayList
<
List
<
FolderInfo
>>();
List
<
FolderInfo
>
curGroup
=
null
;
for
(
FolderInfo
folder
:
folders
)
{
if
(
folder
.
isEmbeddable
())
{
groups
.
add
(
curGroup
=
new
ArrayList
<
FolderInfo
>());
curGroup
.
add
(
folder
);
curGroup
=
null
;
}
else
{
if
(
curGroup
==
null
)
{
groups
.
add
(
curGroup
=
new
ArrayList
<
FolderInfo
>());
}
curGroup
.
add
(
folder
);
}
}
for
(
List
<
FolderInfo
>
group
:
groups
)
{
FolderPane
folderPane
=
new
FolderPane
(
compositePane
);
folderPane
.
setFolders
(
group
.
toArray
(
new
FolderInfo
[
group
.
size
()]));
folderPanes
.
add
(
folderPane
);
}
// Make all sub folders the same size
int
maxWidth
=
0
;
for
(
FolderPane
folderPane
:
folderPanes
)
{
int
width
=
folderPane
.
folderList
.
computeSize
(-
1
,
-
1
,
false
).
x
;
if
(
width
>
maxWidth
)
{
maxWidth
=
width
;
}
}
for
(
FolderPane
folderPane
:
folderPanes
)
{
((
GridData
)
folderPane
.
folderList
.
getLayoutData
()).
widthHint
=
maxWidth
;
}
// Re-layout
compositePane
.
layout
();
/*
getShell().getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
...
...
@@ -159,33 +212,15 @@ public class FolderComposite extends Composite implements IFolderContainer {
}
}
});
}
else
{
boolean
firstTime
=
folderList
.
getNumberOfElements
()
==
0
;
folderList
.
setFolders
(
folders
);
folderList
.
select
(
0
);
if
(
firstTime
)
{
layout
();
}
}
*/
}
private
void
createFlatFolders
(
FolderInfo
[]
folders
)
{
FolderList
[]
subFolders
=
new
FolderList
[
folders
.
length
];
for
(
int
i
=
0
;
i
<
folders
.
length
;
i
++)
{
FolderInfo
folder
=
folders
[
i
];
Composite
folderGroup
=
UIUtils
.
createPlaceholder
(
p
ane
,
2
);
Composite
folderGroup
=
UIUtils
.
createPlaceholder
(
compositeP
ane
,
2
);
folderGroup
.
setLayoutData
(
new
GridData
(
GridData
.
FILL_BOTH
));
folderGroup
.
addFocusListener
(
new
FocusAdapter
()
{
@Override
public
void
focusGained
(
FocusEvent
e
)
{
super
.
focusGained
(
e
);
}
@Override
public
void
focusLost
(
FocusEvent
e
)
{
super
.
focusLost
(
e
);
}
});
FolderList
nestedFolders
=
new
FolderList
(
folderGroup
);
GridData
gd
=
new
GridData
(
GridData
.
FILL_VERTICAL
);
...
...
@@ -212,20 +247,6 @@ public class FolderComposite extends Composite implements IFolderContainer {
horizontalLine
.
setLayoutData
(
gd
);
}
}
int
maxWidth
=
0
;
for
(
FolderList
f
:
subFolders
)
{
int
width
=
f
.
computeSize
(-
1
,
-
1
,
false
).
x
;
if
(
width
>
maxWidth
)
{
maxWidth
=
width
;
}
}
for
(
FolderList
f
:
subFolders
)
{
((
GridData
)
f
.
getLayoutData
()).
widthHint
=
maxWidth
;
}
// Make all sub folders the same size
pane
.
layout
();
}
@Nullable
...
...
@@ -235,22 +256,21 @@ public class FolderComposite extends Composite implements IFolderContainer {
@Override
public
IFolder
getActiveFolder
()
{
return
folderList
==
null
?
null
:
folderList
.
getElementAt
(
folderList
.
getSelectionIndex
()).
getInfo
().
getContents
();
return
null
;
//return folderList == null ? null : folderList.getElementAt(folderList.getSelectionIndex()).getInfo().getContents();
}
@Override
public
void
switchFolder
(
String
folderId
)
{
if
(
folderList
==
null
)
{
return
;
}
for
(
int
i
=
0
;
i
<
folderList
.
getNumberOfElements
();
i
++)
{
if
(
folderList
.
getElementAt
(
i
).
getInfo
().
getId
().
equals
(
folderId
))
{
folderList
.
select
(
i
);
//folderList.getElementAt(i).getInfo();
for
(
FolderPane
folderPane
:
folderPanes
)
{
for
(
int
i
=
0
;
i
<
folderPane
.
folderList
.
getNumberOfElements
();
i
++)
{
if
(
folderPane
.
folderList
.
getElementAt
(
i
).
getInfo
().
getId
().
equals
(
folderId
))
{
folderPane
.
folderList
.
select
(
i
);
break
;
}
}
}
}
@Override
public
void
addFolderListener
(
IFolderListener
listener
)
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java
浏览文件 @
3215a327
...
...
@@ -375,7 +375,7 @@ public class ObjectPropertiesEditor extends AbstractDatabaseObjectEditor<DBSObje
CoreMessages
.
ui_properties_category_information
,
DBIcon
.
TREE_INFO
.
getImage
(),
"General information"
,
tru
e
,
fals
e
,
new
FolderPageProperties
(
getEditorInput
())));
}
...
...
@@ -440,7 +440,7 @@ public class ObjectPropertiesEditor extends AbstractDatabaseObjectEditor<DBSObje
folder
.
getNodeName
(),
folder
.
getNodeIconDefault
(),
child
.
getNodeDescription
(),
folder
.
getMeta
().
isInline
(),
f
alse
,
//f
older.getMeta().isInline(),
new
FolderPageNode
(
part
,
folder
,
null
)
));
}
...
...
@@ -466,7 +466,7 @@ public class ObjectPropertiesEditor extends AbstractDatabaseObjectEditor<DBSObje
nodeName
,
node
.
getNodeIconDefault
(),
node
.
getNodeDescription
(),
child
.
isInline
()
,
false
,
new
FolderPageNode
(
part
,
node
,
child
)));
}
}
catch
(
DBException
e
)
{
...
...
plugins/org.jkiss.dbeaver.generic/plugin.xml
浏览文件 @
3215a327
...
...
@@ -88,7 +88,7 @@
</items>
</items>
<items
label=
"%tree.procedures.node.name"
itemLabel=
"%tree.procedure.node.name"
path=
"procedure"
property=
"procedures"
icon=
"#procedure"
>
<items
label=
"%tree.procedure_columns.node.name"
itemLabel=
"%tree.column.node.name"
path=
"column"
property=
"parameters"
navigable=
"false"
inline=
"true"
/>
<items
label=
"%tree.procedure_columns.node.name"
itemLabel=
"%tree.column.node.name"
path=
"column"
property=
"parameters"
navigable=
"false"
/>
</items>
</folder>
</items>
...
...
plugins/org.jkiss.dbeaver.mysql/plugin.xml
浏览文件 @
3215a327
...
...
@@ -284,7 +284,7 @@
<editor
id=
"source.view"
class=
"org.jkiss.dbeaver.ext.mysql.editors.MySQLSourceViewEditor"
label=
"%editor.source.name"
description=
"%editor.source.name"
icon=
"#sql_text"
position=
"additions_middle"
contributor=
"org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested"
type=
"folder"
>
contributor=
"org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested"
type=
"folder"
embeddable=
"true"
>
<objectType
name=
"org.jkiss.dbeaver.ext.mysql.model.MySQLSourceObject"
/>
</editor>
<editor
id=
"source.ddl"
class=
"org.jkiss.dbeaver.ext.mysql.editors.MySQLDDLViewEditor"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录