Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

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

提交 fa488d7e 编写于 作者: S serge-rider
浏览文件
操作

#10 XML editor plugin, data managers model refactoring

上级 fc86ff49
展开全部 隐藏空白更改
内联 并排
Showing with 1918 addition and 1801 deletion
features/org.jkiss.dbeaver.core.feature/feature.xml
浏览文件 @ fa488d7e
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<plugin id="org.jkiss.dbeaver.ui.editors.hex" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin id="org.jkiss.dbeaver.ui.editors.hex" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.editors.image" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin id="org.jkiss.dbeaver.ui.editors.image" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.editors.sql" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin id="org.jkiss.dbeaver.ui.editors.sql" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.editors.xml" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.navigator" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin id="org.jkiss.dbeaver.ui.navigator" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ext.erd" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin id="org.jkiss.dbeaver.ext.erd" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ext.ui.colortheme" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin id="org.jkiss.dbeaver.ext.ui.colortheme" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
......
plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
浏览文件 @ fa488d7e
...@@ -36,15 +36,12 @@ Export-Package: org.jkiss.dbeaver, ...@@ -36,15 +36,12 @@ Export-Package: org.jkiss.dbeaver,
org.jkiss.dbeaver.ui.data.dialogs, org.jkiss.dbeaver.ui.data.dialogs,
org.jkiss.dbeaver.ui.data.editors, org.jkiss.dbeaver.ui.data.editors,
org.jkiss.dbeaver.ui.data.managers, org.jkiss.dbeaver.ui.data.managers,
org.jkiss.dbeaver.ui.data.managers.stream,
org.jkiss.dbeaver.ui.data.registry,
org.jkiss.dbeaver.ui.dialogs, org.jkiss.dbeaver.ui.dialogs,
org.jkiss.dbeaver.ui.dialogs.connection, org.jkiss.dbeaver.ui.dialogs.connection,
org.jkiss.dbeaver.ui.dialogs.driver, org.jkiss.dbeaver.ui.dialogs.driver,
org.jkiss.dbeaver.ui.dialogs.net, org.jkiss.dbeaver.ui.dialogs.net,
org.jkiss.dbeaver.ui.dialogs.tools, org.jkiss.dbeaver.ui.dialogs.tools,
org.jkiss.dbeaver.ui.e4, org.jkiss.dbeaver.ui.e4,
org.jkiss.dbeaver.ui.editors.content,
org.jkiss.dbeaver.ui.editors.data, org.jkiss.dbeaver.ui.editors.data,
org.jkiss.dbeaver.ui.editors.sql, org.jkiss.dbeaver.ui.editors.sql,
org.jkiss.dbeaver.ui.editors.sql.convert, org.jkiss.dbeaver.ui.editors.sql.convert,
...@@ -61,7 +58,6 @@ Export-Package: org.jkiss.dbeaver, ...@@ -61,7 +58,6 @@ Export-Package: org.jkiss.dbeaver,
org.jkiss.dbeaver.ui.editors.sql.syntax.tokens, org.jkiss.dbeaver.ui.editors.sql.syntax.tokens,
org.jkiss.dbeaver.ui.editors.sql.templates, org.jkiss.dbeaver.ui.editors.sql.templates,
org.jkiss.dbeaver.ui.editors.sql.util, org.jkiss.dbeaver.ui.editors.sql.util,
org.jkiss.dbeaver.ui.editors.xml,
org.jkiss.dbeaver.ui.perspective, org.jkiss.dbeaver.ui.perspective,
org.jkiss.dbeaver.ui.preferences, org.jkiss.dbeaver.ui.preferences,
org.jkiss.dbeaver.ui.resources, org.jkiss.dbeaver.ui.resources,
......
plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
浏览文件 @ fa488d7e
...@@ -388,9 +388,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name=Driver Name ...@@ -388,9 +388,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name=Driver Name
meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name=Description meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name=Description
meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name=Driver Class meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name=Driver Class
meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name=URL meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name=URL
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name=Type
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name=Name
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name=Columns
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name=Name meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name=Name
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name=Rows Found (>=) meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name=Rows Found (>=)
......
plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties
浏览文件 @ fa488d7e
...@@ -468,9 +468,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name = ...@@ -468,9 +468,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name =
meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name = Treiberklasse meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name = Treiberklasse
meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name = Treibername meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name = Treibername
meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name = URL meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name = URL
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name = Spalten
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name = Name
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name = Typ
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name = Gefundene Zeilen (>=) meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name = Gefundene Zeilen (>=)
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name = Name meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name = Name
......
plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_fr.properties
浏览文件 @ fa488d7e
...@@ -353,9 +353,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name ...@@ -353,9 +353,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name
meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name = Classe de pilote meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name = Classe de pilote
meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name = Nom du pilote meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name = Nom du pilote
meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name = URL meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name = URL
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name = Colonnes
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name = Nom
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name = Type
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name = Lignes trouv\u00E9es (>=) meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name = Lignes trouv\u00E9es (>=)
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name = Nom meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name = Nom
......
plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ja.properties
浏览文件 @ fa488d7e
...@@ -367,9 +367,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name=\u30C9\u30E9\u30A4\u3 ...@@ -367,9 +367,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name=\u30C9\u30E9\u30A4\u3
meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name=\u8AAC\u660E meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name=\u8AAC\u660E
meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name=\u30C9\u30E9\u30A4\u30D0\u30FC\u30AF\u30E9\u30B9 meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name=\u30C9\u30E9\u30A4\u30D0\u30FC\u30AF\u30E9\u30B9
meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name=URL meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name=URL
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name=\u30BF\u30A4\u30D7
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name=\u540D
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name=\u5217
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name=\u540D meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name=\u540D
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name=\u898B\u3064\u304B\u3063\u305F\u884C\uFF08>\uFF09 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name=\u898B\u3064\u304B\u3063\u305F\u884C\uFF08>\uFF09
......
plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ru.properties
浏览文件 @ fa488d7e
...@@ -279,9 +279,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name = ...@@ -279,9 +279,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name =
meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name = \u041A\u043B\u0430\u0441\u0441 \u0414\u0440\u0430\u0439\u0432\u0435\u0440\u0430 meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name = \u041A\u043B\u0430\u0441\u0441 \u0414\u0440\u0430\u0439\u0432\u0435\u0440\u0430
meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name = \u0418\u043C\u044F \u0414\u0440\u0430\u0439\u0432\u0435\u0440\u0430 meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name = \u0418\u043C\u044F \u0414\u0440\u0430\u0439\u0432\u0435\u0440\u0430
meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name = URL meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name = URL
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name = \u041A\u043E\u043B\u043E\u043D\u043A\u0438
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name = \u0418\u043C\u044F
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name = \u0422\u0438\u043F
search.page.label.db.fulltext = \u041F\u043E\u043B\u043D\u043E\u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0439 \u043F\u043E\u0438\u0441\u043A \u0411\u0414 search.page.label.db.fulltext = \u041F\u043E\u043B\u043D\u043E\u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0439 \u043F\u043E\u0438\u0441\u043A \u0411\u0414
search.page.label.db.metadata = \u041F\u043E\u0438\u0441\u043A \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0411\u0414 search.page.label.db.metadata = \u041F\u043E\u0438\u0441\u043A \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0411\u0414
......
plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties
浏览文件 @ fa488d7e
...@@ -467,9 +467,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name = ...@@ -467,9 +467,6 @@ meta.org.jkiss.dbeaver.registry.DriverDescriptor.description.name =
meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name = \u9A71\u52A8\u7C7B meta.org.jkiss.dbeaver.registry.DriverDescriptor.driverClassName.name = \u9A71\u52A8\u7C7B
meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name = \u9A71\u52A8\u540D\u79F0 meta.org.jkiss.dbeaver.registry.DriverDescriptor.name.name = \u9A71\u52A8\u540D\u79F0
meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name = URL meta.org.jkiss.dbeaver.registry.DriverDescriptor.sampleURL.name = URL
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.columns.name = \u5B57\u6BB5
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.name.name = \u540D\u79F0
meta.org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel$CellKeyInfo.type.name = \u7C7B\u578B
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name = \u627E\u5230\u7684\u884C(>=) meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.foundRows.name = \u627E\u5230\u7684\u884C(>=)
meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name = \u540D\u79F0 meta.org.jkiss.dbeaver.ui.search.data.SearchDataObject.name.name = \u540D\u79F0
......
plugins/org.jkiss.dbeaver.core/plugin.xml
浏览文件 @ fa488d7e
...@@ -3626,10 +3626,9 @@ ...@@ -3626,10 +3626,9 @@
<supports kind="ROWID"/> <supports kind="ROWID"/>
</manager> </manager>
--> -->
<streamManager class="org.jkiss.dbeaver.ui.data.managers.stream.TextStreamValueManager" id="plaintext" label="Text" primaryMime="text/plain" <manager class="org.jkiss.dbeaver.ui.data.managers.DefaultValueManager" id="DefaultValueManager">
description="Plain text" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/text.png"/> </manager>
<streamManager class="org.jkiss.dbeaver.ui.data.managers.stream.XMLStreamValueManager" id="xml" label="XML" primaryMime="text/xml"
description="XML" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/xml.png"/>
</extension> </extension>
<extension point="org.jkiss.dbeaver.resourceHandler"> <extension point="org.jkiss.dbeaver.resourceHandler">
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java
浏览文件 @ fa488d7e
...@@ -149,7 +149,6 @@ public class CoreMessages extends NLS { ...@@ -149,7 +149,6 @@ public class CoreMessages extends NLS {
public static String controls_client_homes_panel_label_path; public static String controls_client_homes_panel_label_path;
public static String controls_client_homes_panel_label_product_name; public static String controls_client_homes_panel_label_product_name;
public static String controls_client_homes_panel_label_product_version; public static String controls_client_homes_panel_label_product_version;
public static String controls_column_info_panel_property_key;
public static String controls_driver_tree_column_connections; public static String controls_driver_tree_column_connections;
public static String controls_driver_tree_column_name; public static String controls_driver_tree_column_name;
public static String controls_itemlist_action_copy; public static String controls_itemlist_action_copy;
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
浏览文件 @ fa488d7e
...@@ -124,7 +124,6 @@ controls_client_homes_panel_label_name = Name ...@@ -124,7 +124,6 @@ controls_client_homes_panel_label_name = Name
controls_client_homes_panel_label_path = Path controls_client_homes_panel_label_path = Path
controls_client_homes_panel_label_product_name = Product Name controls_client_homes_panel_label_product_name = Product Name
controls_client_homes_panel_label_product_version = Product Version controls_client_homes_panel_label_product_version = Product Version
controls_column_info_panel_property_key = Key
controls_connection_properties_action_add_property = Add new property controls_connection_properties_action_add_property = Add new property
controls_connection_properties_action_remove_property = Remove property controls_connection_properties_action_remove_property = Remove property
controls_connection_properties_category_user_properties = User Properties controls_connection_properties_category_user_properties = User Properties
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties
浏览文件 @ fa488d7e
...@@ -204,8 +204,6 @@ controls_client_homes_panel_label_product_name = Produktname ...@@ -204,8 +204,6 @@ controls_client_homes_panel_label_product_name = Produktname
controls_client_homes_panel_label_product_version = Produktversion controls_client_homes_panel_label_product_version = Produktversion
controls_column_info_panel_property_key = Schl\u00FCssel
controls_connection_properties_action_add_property = Neue Eigenschaft hinzuf\u00FCgen controls_connection_properties_action_add_property = Neue Eigenschaft hinzuf\u00FCgen
controls_connection_properties_action_remove_property = Eigenschaft entfernen controls_connection_properties_action_remove_property = Eigenschaft entfernen
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_fr.properties
浏览文件 @ fa488d7e
...@@ -153,8 +153,6 @@ controls_client_homes_panel_label_product_name = Nom du produit ...@@ -153,8 +153,6 @@ controls_client_homes_panel_label_product_name = Nom du produit
controls_client_homes_panel_label_product_version = Version du produit controls_client_homes_panel_label_product_version = Version du produit
controls_column_info_panel_property_key = Clef
controls_connection_properties_action_add_property = Ajouter une nouvelle propri\u00E9t\u00E9 controls_connection_properties_action_add_property = Ajouter une nouvelle propri\u00E9t\u00E9
controls_connection_properties_action_remove_property = Supprimer la propri\u00E9t\u00E9 controls_connection_properties_action_remove_property = Supprimer la propri\u00E9t\u00E9
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ja.properties
浏览文件 @ fa488d7e
...@@ -116,7 +116,6 @@ controls_client_homes_panel_label_name =\u540D ...@@ -116,7 +116,6 @@ controls_client_homes_panel_label_name =\u540D
controls_client_homes_panel_label_path =\u30D1\u30B9 controls_client_homes_panel_label_path =\u30D1\u30B9
controls_client_homes_panel_label_product_name =\u5546\u54C1\u540D controls_client_homes_panel_label_product_name =\u5546\u54C1\u540D
controls_client_homes_panel_label_product_version =\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3 controls_client_homes_panel_label_product_version =\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3
controls_column_info_panel_property_key =\u30AD\u30FC
controls_connection_properties_action_add_property =\u65B0\u3057\u3044\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3059\u308B controls_connection_properties_action_add_property =\u65B0\u3057\u3044\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8FFD\u52A0\u3059\u308B
controls_connection_properties_action_remove_property =\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u524A\u9664 controls_connection_properties_action_remove_property =\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u524A\u9664
controls_connection_properties_category_user_properties =\u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30ED\u30D1\u30C6\u30A3 controls_connection_properties_category_user_properties =\u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30ED\u30D1\u30C6\u30A3
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties
浏览文件 @ fa488d7e
...@@ -1015,7 +1015,6 @@ controls_client_homes_panel_button_remove_home=\u0423\u0434\u0430\u043B\u0438\u0 ...@@ -1015,7 +1015,6 @@ controls_client_homes_panel_button_remove_home=\u0423\u0434\u0430\u043B\u0438\u0
controls_client_homes_panel_confirm_remove_home_text=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B, \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u0430 "{0}"? controls_client_homes_panel_confirm_remove_home_text=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B, \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u0430 "{0}"?
controls_client_homes_panel_confirm_remove_home_title=\u0423\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u043A\u043B\u0438\u0435\u043D\u0442\u0430 controls_client_homes_panel_confirm_remove_home_title=\u0423\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u043A\u043B\u0438\u0435\u043D\u0442\u0430
controls_client_homes_panel_dialog_title=\u041A\u043B\u0438\u0435\u043D\u0442\u044B \u0411\u0414 controls_client_homes_panel_dialog_title=\u041A\u043B\u0438\u0435\u043D\u0442\u044B \u0411\u0414
controls_column_info_panel_property_key=\u041A\u043B\u044E\u0447
controls_driver_tree_column_connections=\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F controls_driver_tree_column_connections=\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F
controls_driver_tree_column_name=\u0418\u043C\u044F controls_driver_tree_column_name=\u0418\u043C\u044F
controls_rs_pump_job_name=\u0427\u0442\u0435\u043D\u0438\u0435 \u0434\u0430\u043D\u043D\u044B\u0445 controls_rs_pump_job_name=\u0427\u0442\u0435\u043D\u0438\u0435 \u0434\u0430\u043D\u043D\u044B\u0445
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties
浏览文件 @ fa488d7e
...@@ -204,8 +204,6 @@ controls_client_homes_panel_label_product_name = \u4EA7\u54C1\u540D\u79F0 ...@@ -204,8 +204,6 @@ controls_client_homes_panel_label_product_name = \u4EA7\u54C1\u540D\u79F0
controls_client_homes_panel_label_product_version = \u4EA7\u54C1\u7248\u672C controls_client_homes_panel_label_product_version = \u4EA7\u54C1\u7248\u672C
controls_column_info_panel_property_key = \u952E
controls_connection_properties_action_add_property = \u6DFB\u52A0\u65B0\u5C5E\u6027 controls_connection_properties_action_add_property = \u6DFB\u52A0\u65B0\u5C5E\u6027
controls_connection_properties_action_remove_property = \u5220\u9664\u5C5E\u6027 controls_connection_properties_action_remove_property = \u5220\u9664\u5C5E\u6027
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/dialogs/ValueViewDialog.java
浏览文件 @ fa488d7e
...@@ -44,7 +44,7 @@ import org.jkiss.dbeaver.runtime.DBWorkbench; ...@@ -44,7 +44,7 @@ import org.jkiss.dbeaver.runtime.DBWorkbench;
import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.data.*; import org.jkiss.dbeaver.ui.data.*;
import org.jkiss.dbeaver.ui.data.managers.BaseValueManager; import org.jkiss.dbeaver.ui.data.managers.BaseValueManager;
import org.jkiss.dbeaver.ui.dialogs.ColumnInfoPanel; import org.jkiss.dbeaver.ui.controls.ColumnInfoPanel;
import org.jkiss.utils.CommonUtils; import org.jkiss.utils.CommonUtils;
/** /**
......
plugins/org.jkiss.dbeaver.ui.editors.data/META-INF/MANIFEST.MF
浏览文件 @ fa488d7e
...@@ -12,11 +12,21 @@ Require-Bundle: org.eclipse.core.runtime, ...@@ -12,11 +12,21 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources, org.eclipse.core.resources,
org.eclipse.core.expressions, org.eclipse.core.expressions,
org.eclipse.ui, org.eclipse.ui,
org.eclipse.jface.text,
org.eclipse.ui.editors,
org.eclipse.ui.ide,
org.eclipse.ui.workbench.texteditor,
org.jkiss.dbeaver.model, org.jkiss.dbeaver.model,
org.jkiss.dbeaver.ui, org.jkiss.dbeaver.ui,
org.jkiss.dbeaver.ui.editors.base, org.jkiss.dbeaver.ui.editors.base,
org.jkiss.dbeaver.ui.navigator org.jkiss.dbeaver.ui.navigator
Bundle-ClassPath: . Bundle-ClassPath: .
Export-Package: org.jkiss.dbeaver.ui.controls.lightgrid, Export-Package: org.jkiss.dbeaver.ui.controls,
org.jkiss.dbeaver.ui.controls.lightgrid,
org.jkiss.dbeaver.ui.data, org.jkiss.dbeaver.ui.data,
org.jkiss.dbeaver.ui.data.managers,
org.jkiss.dbeaver.ui.data.managers.stream,
org.jkiss.dbeaver.ui.data.registry,
org.jkiss.dbeaver.ui.editors.content,
org.jkiss.dbeaver.ui.editors.data org.jkiss.dbeaver.ui.editors.data
plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties
浏览文件 @ fa488d7e
Bundle-Vendor = DBeaver Corp Bundle-Vendor = DBeaver Corp
Bundle-Name = DBeaver UI Editors - Data Bundle-Name = DBeaver UI Editors - Data
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name=Type
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name=Name
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name=Columns
plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties 0 → 100644
浏览文件 @ fa488d7e
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name = Spalten
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name = Name
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name = Typ
plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_fr.properties 0 → 100644
浏览文件 @ fa488d7e
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name = Colonnes
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name = Nom
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name = Type
plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ja.properties 0 → 100644
浏览文件 @ fa488d7e
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name=\u30BF\u30A4\u30D7
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name=\u540D
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name=\u5217
plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ru.properties 0 → 100644
浏览文件 @ fa488d7e
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name = \u041A\u043E\u043B\u043E\u043D\u043A\u0438
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name = \u0418\u043C\u044F
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name = \u0422\u0438\u043F
plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties 0 → 100644
浏览文件 @ fa488d7e
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name = \u5B57\u6BB5
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name = \u540D\u79F0
meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name = \u7C7B\u578B
plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
浏览文件 @ fa488d7e
...@@ -3,5 +3,10 @@ ...@@ -3,5 +3,10 @@
<plugin> <plugin>
<extension point="org.jkiss.dbeaver.dataManager">
<streamManager class="org.jkiss.dbeaver.ui.data.managers.stream.TextStreamValueManager" id="plaintext" label="Text" primaryMime="text/plain"
description="Plain text" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/text.png"/>
</extension>
</plugin> </plugin>
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/ColumnInfoPanel.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/ColumnInfoPanel.java
浏览文件 @ fa488d7e
...@@ -15,14 +15,13 @@ ...@@ -15,14 +15,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.dialogs; package org.jkiss.dbeaver.ui.controls;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.jkiss.code.NotNull; import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable; import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.model.DBConstants; import org.jkiss.dbeaver.model.DBConstants;
import org.jkiss.dbeaver.model.DBPNamedObject; import org.jkiss.dbeaver.model.DBPNamedObject;
import org.jkiss.dbeaver.model.DBPObject; import org.jkiss.dbeaver.model.DBPObject;
...@@ -34,6 +33,7 @@ import org.jkiss.dbeaver.runtime.properties.PropertyCollector; ...@@ -34,6 +33,7 @@ import org.jkiss.dbeaver.runtime.properties.PropertyCollector;
import org.jkiss.dbeaver.ui.data.IAttributeController; import org.jkiss.dbeaver.ui.data.IAttributeController;
import org.jkiss.dbeaver.ui.data.IRowController; import org.jkiss.dbeaver.ui.data.IRowController;
import org.jkiss.dbeaver.ui.data.IValueController; import org.jkiss.dbeaver.ui.data.IValueController;
import org.jkiss.dbeaver.ui.editors.data.internal.DataEditorsMessages;
import org.jkiss.dbeaver.ui.properties.PropertyTreeViewer; import org.jkiss.dbeaver.ui.properties.PropertyTreeViewer;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -63,7 +63,7 @@ public class ColumnInfoPanel extends Composite { ...@@ -63,7 +63,7 @@ public class ColumnInfoPanel extends Composite {
infoItem.addProperty( infoItem.addProperty(
null, null,
"Key", "Key",
CoreMessages.controls_column_info_panel_property_key, DataEditorsMessages.controls_column_info_panel_property_key,
new CellKeyInfo(valueController.getRowController(), rowIdentifier) new CellKeyInfo(valueController.getRowController(), rowIdentifier)
); );
} }
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/AbstractTextPanelEditor.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/managers/AbstractTextPanelEditor.java
浏览文件 @ fa488d7e
...@@ -14,12 +14,13 @@ ...@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.data.managers.stream; package org.jkiss.dbeaver.ui.data.managers;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.action.Action; import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IContributionManager; import org.eclipse.jface.action.IContributionManager;
import org.eclipse.jface.action.Separator; import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.text.IUndoManager; import org.eclipse.jface.text.IUndoManager;
import org.eclipse.jface.text.TextViewer; import org.eclipse.jface.text.TextViewer;
import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.ISourceViewer;
...@@ -31,19 +32,18 @@ import org.eclipse.ui.PartInitException; ...@@ -31,19 +32,18 @@ import org.eclipse.ui.PartInitException;
import org.jkiss.code.NotNull; import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.Log; import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.DBPDataKind;
import org.jkiss.dbeaver.model.DBPMessageType; import org.jkiss.dbeaver.model.DBPMessageType;
import org.jkiss.dbeaver.model.data.DBDContent; import org.jkiss.dbeaver.model.data.DBDContent;
import org.jkiss.dbeaver.model.exec.DBCException; import org.jkiss.dbeaver.model.exec.DBCException;
import org.jkiss.dbeaver.model.impl.StringContentStorage; import org.jkiss.dbeaver.model.impl.StringContentStorage;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.controls.resultset.panel.valueviewer.ValueViewerPanel;
import org.jkiss.dbeaver.ui.data.IStreamValueEditor; import org.jkiss.dbeaver.ui.data.IStreamValueEditor;
import org.jkiss.dbeaver.ui.data.IValueController; import org.jkiss.dbeaver.ui.data.IValueController;
import org.jkiss.dbeaver.ui.editors.StringEditorInput; import org.jkiss.dbeaver.ui.editors.StringEditorInput;
import org.jkiss.dbeaver.ui.editors.SubEditorSite; import org.jkiss.dbeaver.ui.editors.SubEditorSite;
import org.jkiss.dbeaver.ui.editors.content.ContentEditorInput; import org.jkiss.dbeaver.ui.editors.content.ContentEditorInput;
import org.jkiss.dbeaver.ui.editors.data.internal.DataEditorsActivator;
import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor; import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor;
import org.jkiss.dbeaver.utils.RuntimeUtils; import org.jkiss.dbeaver.utils.RuntimeUtils;
...@@ -97,7 +97,7 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp ...@@ -97,7 +97,7 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
boolean newWW = !editorControl.getWordWrap(); boolean newWW = !editorControl.getWordWrap();
setChecked(newWW); setChecked(newWW);
editorControl.setWordWrap(newWW); editorControl.setWordWrap(newWW);
ValueViewerPanel.getPanelSettings().put(PREF_TEXT_EDITOR_WORD_WRAP, newWW); getPanelSettings().put(PREF_TEXT_EDITOR_WORD_WRAP, newWW);
} }
}; };
wwAction.setChecked(editorControl.getWordWrap()); wwAction.setChecked(editorControl.getWordWrap());
...@@ -109,13 +109,13 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp ...@@ -109,13 +109,13 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
final Action afAction = new Action("Auto Format", Action.AS_CHECK_BOX) { final Action afAction = new Action("Auto Format", Action.AS_CHECK_BOX) {
@Override @Override
public void run() { public void run() {
boolean newAF = !ValueViewerPanel.getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT); boolean newAF = !getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT);
setChecked(newAF); setChecked(newAF);
ValueViewerPanel.getPanelSettings().put(PREF_TEXT_EDITOR_AUTO_FORMAT, newAF); getPanelSettings().put(PREF_TEXT_EDITOR_AUTO_FORMAT, newAF);
applyEditorStyle(); applyEditorStyle();
} }
}; };
afAction.setChecked(ValueViewerPanel.getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT)); afAction.setChecked(getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT));
manager.add(afAction); manager.add(afAction);
} }
} }
...@@ -125,7 +125,7 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp ...@@ -125,7 +125,7 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
} }
private void initEditorSettings(StyledText control) { private void initEditorSettings(StyledText control) {
boolean wwEnabled = ValueViewerPanel.getPanelSettings().getBoolean(PREF_TEXT_EDITOR_WORD_WRAP); boolean wwEnabled = getPanelSettings().getBoolean(PREF_TEXT_EDITOR_WORD_WRAP);
if (wwEnabled != control.getWordWrap()) { if (wwEnabled != control.getWordWrap()) {
control.setWordWrap(wwEnabled); control.setWordWrap(wwEnabled);
} }
...@@ -133,7 +133,7 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp ...@@ -133,7 +133,7 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
private void applyEditorStyle() { private void applyEditorStyle() {
BaseTextEditor textEditor = getTextEditor(); BaseTextEditor textEditor = getTextEditor();
if (textEditor != null && ValueViewerPanel.getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT)) { if (textEditor != null && getPanelSettings().getBoolean(PREF_TEXT_EDITOR_AUTO_FORMAT)) {
try { try {
if (textEditor.getViewer().canDoOperation(ISourceViewer.FORMAT)) { if (textEditor.getViewer().canDoOperation(ISourceViewer.FORMAT)) {
textEditor.getViewer().doOperation(ISourceViewer.FORMAT); textEditor.getViewer().doOperation(ISourceViewer.FORMAT);
...@@ -205,4 +205,15 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp ...@@ -205,4 +205,15 @@ public abstract class AbstractTextPanelEditor<EDITOR extends BaseTextEditor> imp
} }
} }
private static IDialogSettings viewerSettings;
public static IDialogSettings getPanelSettings() {
if (viewerSettings == null) {
viewerSettings = UIUtils.getSettingsSection(
DataEditorsActivator.getDefault().getDialogSettings(),
AbstractTextPanelEditor.class.getSimpleName());
}
return viewerSettings;
}
} }
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/TextEditorPart.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/managers/stream/TextEditorPart.java
浏览文件 @ fa488d7e
...@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.DBIcon; ...@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.DBIcon;
import org.jkiss.dbeaver.ui.DBeaverIcons; import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor; import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor;
import org.jkiss.dbeaver.ui.editors.text.FileRefDocumentProvider; import org.jkiss.dbeaver.ui.editors.text.FileRefDocumentProvider;
import org.jkiss.dbeaver.ui.editors.xml.XMLSourceViewerConfiguration;
/** /**
* CONTENT text editor * CONTENT text editor
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/TextPanelEditor.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/managers/stream/TextPanelEditor.java
浏览文件 @ fa488d7e
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
package org.jkiss.dbeaver.ui.data.managers.stream; package org.jkiss.dbeaver.ui.data.managers.stream;
import org.jkiss.dbeaver.ui.data.IValueController; import org.jkiss.dbeaver.ui.data.IValueController;
import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor; import org.jkiss.dbeaver.ui.data.managers.AbstractTextPanelEditor;
/** /**
* TextPanelEditor * TextPanelEditor
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/registry/StreamValueManagerDescriptor.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/registry/StreamValueManagerDescriptor.java
浏览文件 @ fa488d7e
...@@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IConfigurationElement; ...@@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.jkiss.code.NotNull; import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.model.DBPImage; import org.jkiss.dbeaver.model.DBPImage;
import org.jkiss.dbeaver.model.impl.AbstractDescriptor; import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
import org.jkiss.dbeaver.registry.RegistryConstants;
import org.jkiss.dbeaver.ui.data.IStreamValueManager; import org.jkiss.dbeaver.ui.data.IStreamValueManager;
import org.jkiss.utils.ArrayUtils; import org.jkiss.utils.ArrayUtils;
import org.jkiss.utils.CommonUtils; import org.jkiss.utils.CommonUtils;
...@@ -48,11 +47,11 @@ public class StreamValueManagerDescriptor extends AbstractDescriptor ...@@ -48,11 +47,11 @@ public class StreamValueManagerDescriptor extends AbstractDescriptor
{ {
super(config); super(config);
this.id = config.getAttribute(RegistryConstants.ATTR_ID); this.id = config.getAttribute("id");
this.implType = new ObjectType(config.getAttribute(RegistryConstants.ATTR_CLASS)); this.implType = new ObjectType(config.getAttribute("class"));
this.label = config.getAttribute(RegistryConstants.ATTR_LABEL); this.label = config.getAttribute("label");
this.description = config.getAttribute(RegistryConstants.ATTR_DESCRIPTION); this.description = config.getAttribute("description");
this.icon = iconToImage(config.getAttribute(RegistryConstants.ATTR_ICON)); this.icon = iconToImage(config.getAttribute("icon"));
this.primaryMime = config.getAttribute(ATTR_PRIMARY_MIME); this.primaryMime = config.getAttribute(ATTR_PRIMARY_MIME);
String supportedMimeString = config.getAttribute(ATTR_SUPPORTED_MIME); String supportedMimeString = config.getAttribute(ATTR_SUPPORTED_MIME);
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/registry/ValueManagerDescriptor.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/registry/ValueManagerDescriptor.java
浏览文件 @ fa488d7e
...@@ -22,12 +22,11 @@ import org.jkiss.code.Nullable; ...@@ -22,12 +22,11 @@ import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.Log; import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.DBPDataKind; import org.jkiss.dbeaver.model.DBPDataKind;
import org.jkiss.dbeaver.model.DBPDataSource; import org.jkiss.dbeaver.model.DBPDataSource;
import org.jkiss.dbeaver.model.connection.DBPDriver;
import org.jkiss.dbeaver.model.impl.AbstractDescriptor; import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
import org.jkiss.dbeaver.model.struct.DBSDataType; import org.jkiss.dbeaver.model.struct.DBSDataType;
import org.jkiss.dbeaver.model.struct.DBSTypedObject; import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.dbeaver.model.struct.DBSTypedObjectEx; import org.jkiss.dbeaver.model.struct.DBSTypedObjectEx;
import org.jkiss.dbeaver.registry.RegistryConstants;
import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
import org.jkiss.dbeaver.ui.data.IValueManager; import org.jkiss.dbeaver.ui.data.IValueManager;
import org.jkiss.utils.CommonUtils; import org.jkiss.utils.CommonUtils;
...@@ -68,8 +67,8 @@ public class ValueManagerDescriptor extends AbstractDescriptor ...@@ -68,8 +67,8 @@ public class ValueManagerDescriptor extends AbstractDescriptor
{ {
super(config); super(config);
this.id = config.getAttribute(RegistryConstants.ATTR_ID); this.id = config.getAttribute("id");
this.implType = new ObjectType(config.getAttribute(RegistryConstants.ATTR_CLASS)); this.implType = new ObjectType(config.getAttribute("class"));
IConfigurationElement[] typeElements = config.getChildren(TAG_SUPPORTS); IConfigurationElement[] typeElements = config.getChildren(TAG_SUPPORTS);
for (IConfigurationElement typeElement : typeElements) { for (IConfigurationElement typeElement : typeElements) {
...@@ -128,7 +127,7 @@ public class ValueManagerDescriptor extends AbstractDescriptor ...@@ -128,7 +127,7 @@ public class ValueManagerDescriptor extends AbstractDescriptor
final DBPDataKind dataKind = typedObject.getDataKind(); final DBPDataKind dataKind = typedObject.getDataKind();
for (SupportInfo info : supportInfos) { for (SupportInfo info : supportInfos) {
if (dataSource != null && info.dataSource != null) { if (dataSource != null && info.dataSource != null) {
DriverDescriptor driver = (DriverDescriptor) dataSource.getContainer().getDriver(); DBPDriver driver = dataSource.getContainer().getDriver();
if (!info.dataSource.equals(driver.getProviderId()) && !info.dataSource.equals(dataSource.getClass().getName())) { if (!info.dataSource.equals(driver.getProviderId()) && !info.dataSource.equals(dataSource.getClass().getName())) {
continue; continue;
} }
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/registry/ValueManagerRegistry.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/registry/ValueManagerRegistry.java
浏览文件 @ fa488d7e
...@@ -28,7 +28,6 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; ...@@ -28,7 +28,6 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSTypedObject; import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.dbeaver.ui.data.IStreamValueManager; import org.jkiss.dbeaver.ui.data.IStreamValueManager;
import org.jkiss.dbeaver.ui.data.IValueManager; import org.jkiss.dbeaver.ui.data.IValueManager;
import org.jkiss.dbeaver.ui.data.managers.DefaultValueManager;
import org.jkiss.utils.CommonUtils; import org.jkiss.utils.CommonUtils;
import org.jkiss.utils.MimeType; import org.jkiss.utils.MimeType;
...@@ -80,7 +79,7 @@ public class ValueManagerRegistry { ...@@ -80,7 +79,7 @@ public class ValueManagerRegistry {
manager = findManager(dataSource, dataKind, valueType, false, false); manager = findManager(dataSource, dataKind, valueType, false, false);
} }
if (manager == null) { if (manager == null) {
manager = DefaultValueManager.INSTANCE; throw new IllegalStateException("Can't find default data manager for " + dataKind);
} }
return manager; return manager;
} }
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditorSite.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/content/ContentEditorSite.java
浏览文件 @ fa488d7e
/* /*
* DBeaver - Universal Database Manager * DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.editors.content; package org.jkiss.dbeaver.ui.editors.content;
import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.part.MultiPageEditorSite; import org.eclipse.ui.part.MultiPageEditorSite;
/** /**
* Content Editor Site * Content Editor Site
*/ */
class ContentEditorSite extends MultiPageEditorSite { class ContentEditorSite extends MultiPageEditorSite {
public ContentEditorSite(ContentEditor contentEditor, IEditorPart editor) public ContentEditorSite(ContentEditor contentEditor, IEditorPart editor)
{ {
super(contentEditor, editor); super(contentEditor, editor);
} }
@Override @Override
public IWorkbenchPart getPart() { public IWorkbenchPart getPart() {
return getMultiPageEditor(); return getMultiPageEditor();
} }
} }
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/SelectContentPartDialog.java → plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/content/SelectContentPartDialog.java
浏览文件 @ fa488d7e
/* /*
* DBeaver - Universal Database Manager * DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.editors.content; package org.jkiss.dbeaver.ui.editors.content;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*; import org.eclipse.swt.widgets.*;
import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorPart;
import java.util.List; import java.util.List;
/** /**
* SelectContentPartDialog * SelectContentPartDialog
* *
* @author Serge Rider * @author Serge Rider
*/ */
class SelectContentPartDialog extends Dialog { class SelectContentPartDialog extends Dialog {
private List<IEditorPart> dirtyParts; private List<IEditorPart> dirtyParts;
private IEditorPart selectedPart; private IEditorPart selectedPart;
private SelectContentPartDialog(Shell parentShell, List<IEditorPart> dirtyParts) private SelectContentPartDialog(Shell parentShell, List<IEditorPart> dirtyParts)
{ {
super(parentShell); super(parentShell);
this.dirtyParts = dirtyParts; this.dirtyParts = dirtyParts;
} }
@Override @Override
protected boolean isResizable() protected boolean isResizable()
{ {
return true; return true;
} }
@Override @Override
protected Control createDialogArea(Composite parent) protected Control createDialogArea(Composite parent)
{ {
getShell().setText("Choose content editor"); getShell().setText("Choose content editor");
Composite group = (Composite) super.createDialogArea(parent); Composite group = (Composite) super.createDialogArea(parent);
GridData gd = new GridData(GridData.FILL_BOTH); GridData gd = new GridData(GridData.FILL_BOTH);
group.setLayoutData(gd); group.setLayoutData(gd);
Label infoLabel = new Label(group, SWT.NONE); Label infoLabel = new Label(group, SWT.NONE);
infoLabel.setText("Content was modified in mutliple editors. Choose correct one:"); infoLabel.setText("Content was modified in mutliple editors. Choose correct one:");
gd = new GridData(GridData.FILL_HORIZONTAL); gd = new GridData(GridData.FILL_HORIZONTAL);
infoLabel.setLayoutData(gd); infoLabel.setLayoutData(gd);
final Combo combo = new Combo(group, SWT.READ_ONLY | SWT.DROP_DOWN); final Combo combo = new Combo(group, SWT.READ_ONLY | SWT.DROP_DOWN);
gd = new GridData(GridData.FILL_HORIZONTAL); gd = new GridData(GridData.FILL_HORIZONTAL);
combo.setLayoutData(gd); combo.setLayoutData(gd);
combo.add(""); combo.add("");
for (IEditorPart part : dirtyParts) { for (IEditorPart part : dirtyParts) {
combo.add(part.getTitle()); combo.add(part.getTitle());
} }
combo.addSelectionListener(new SelectionAdapter() { combo.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent e) public void widgetSelected(SelectionEvent e)
{ {
if (combo.getSelectionIndex() >= 1) { if (combo.getSelectionIndex() >= 1) {
selectedPart = dirtyParts.get(combo.getSelectionIndex() - 1); selectedPart = dirtyParts.get(combo.getSelectionIndex() - 1);
} else { } else {
selectedPart = null; selectedPart = null;
} }
getButton(IDialogConstants.OK_ID).setEnabled(selectedPart != null); getButton(IDialogConstants.OK_ID).setEnabled(selectedPart != null);
} }
}); });
return group; return group;
} }
@Override @Override
protected Control createContents(Composite parent) protected Control createContents(Composite parent)
{ {
Control ctl = super.createContents(parent); Control ctl = super.createContents(parent);
getButton(IDialogConstants.OK_ID).setEnabled(false); getButton(IDialogConstants.OK_ID).setEnabled(false);
return ctl; return ctl;
} }
public IEditorPart getSelectedPart() public IEditorPart getSelectedPart()
{ {
return selectedPart; return selectedPart;
} }
public static IEditorPart selectContentPart(Shell parentShell, List<IEditorPart> dirtyParts) public static IEditorPart selectContentPart(Shell parentShell, List<IEditorPart> dirtyParts)
{ {
SelectContentPartDialog scDialog = new SelectContentPartDialog(parentShell, dirtyParts); SelectContentPartDialog scDialog = new SelectContentPartDialog(parentShell, dirtyParts);
if (scDialog.open() == IDialogConstants.OK_ID) { if (scDialog.open() == IDialogConstants.OK_ID) {
return scDialog.getSelectedPart(); return scDialog.getSelectedPart();
} else { } else {
return null; return null;
} }
} }
} }
\ No newline at end of file
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsMessages.java
浏览文件 @ fa488d7e
...@@ -24,8 +24,9 @@ public class DataEditorsMessages extends NLS { ...@@ -24,8 +24,9 @@ public class DataEditorsMessages extends NLS {
public static String grid_tooltip_sort_by_column; public static String grid_tooltip_sort_by_column;
public static String grid_tooltip_filter_by_column; public static String grid_tooltip_filter_by_column;
public static String controls_column_info_panel_property_key;
static { static {
// initialize resource bundle // initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, DataEditorsMessages.class); NLS.initializeMessages(BUNDLE_NAME, DataEditorsMessages.class);
} }
......
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources.properties
浏览文件 @ fa488d7e
grid_tooltip_sort_by_column = Sort by column grid_tooltip_sort_by_column = Sort by column
grid_tooltip_filter_by_column = Filter by column value grid_tooltip_filter_by_column = Filter by column value
controls_column_info_panel_property_key = Key
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_de.properties
浏览文件 @ fa488d7e
grid_tooltip_filter_by_column = Filtern mit Spaltenwert grid_tooltip_filter_by_column = Filtern mit Spaltenwert
grid_tooltip_sort_by_column = Sortieren mit Spalte grid_tooltip_sort_by_column = Sortieren mit Spalte
controls_column_info_panel_property_key = Schl\u00FCssel
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_fr.properties
浏览文件 @ fa488d7e
grid_tooltip_sort_by_column = Trier par colonne grid_tooltip_sort_by_column = Trier par colonne
grid_tooltip_filter_by_column = Filtrer par la valeur de colonne grid_tooltip_filter_by_column = Filtrer par la valeur de colonne
controls_column_info_panel_property_key = Clef
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_ru.properties
浏览文件 @ fa488d7e
grid_tooltip_sort_by_column = \u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0430 \u043F\u043E \u043A\u043E\u043B\u043E\u043D\u043A\u0435 grid_tooltip_sort_by_column = \u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0430 \u043F\u043E \u043A\u043E\u043B\u043E\u043D\u043A\u0435
grid_tooltip_filter_by_column = \u0424\u0438\u043B\u044C\u0442\u0440 \u043F\u043E \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044E \u043A\u043E\u043B\u043E\u043D\u043A\u0438 grid_tooltip_filter_by_column = \u0424\u0438\u043B\u044C\u0442\u0440 \u043F\u043E \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044E \u043A\u043E\u043B\u043E\u043D\u043A\u0438
controls_column_info_panel_property_key=\u041A\u043B\u044E\u0447
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_zh.properties
浏览文件 @ fa488d7e
grid_tooltip_filter_by_column = \u6309\u5217\u503C\u8FC7\u6EE4 grid_tooltip_filter_by_column = \u6309\u5217\u503C\u8FC7\u6EE4
grid_tooltip_sort_by_column = \u6309\u5217\u8FC7\u6EE4 grid_tooltip_sort_by_column = \u6309\u5217\u8FC7\u6EE4
controls_column_info_panel_property_key = \u952E
plugins/org.jkiss.dbeaver.ui.editors.xml/.classpath 0 → 100644
浏览文件 @ fa488d7e
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
plugins/org.jkiss.dbeaver.ui.editors.xml/.project 0 → 100644
浏览文件 @ fa488d7e
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.jkiss.dbeaver.ui.editors.xml</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
plugins/org.jkiss.dbeaver.ui.editors.xml/META-INF/MANIFEST.MF 0 → 100644
浏览文件 @ fa488d7e
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ui.editors.xml;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Release-Date: 20181224
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.core.expressions,
org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.editors,
org.eclipse.ui.ide,
org.eclipse.ui.workbench.texteditor,
org.jkiss.dbeaver.model,
org.jkiss.dbeaver.ui,
org.jkiss.dbeaver.ui.editors.base,
org.jkiss.dbeaver.ui.editors.data
Bundle-ClassPath: .
Export-Package: org.jkiss.dbeaver.ui.editors.xml,
org.jkiss.dbeaver.ui.data.managers.stream
plugins/org.jkiss.dbeaver.ui.editors.xml/OSGI-INF/l10n/bundle.properties 0 → 100644
浏览文件 @ fa488d7e
Bundle-Vendor = DBeaver Corp
Bundle-Name = DBeaver UI Editors - XML
plugins/org.jkiss.dbeaver.ui.editors.xml/build.properties 0 → 100644
浏览文件 @ fa488d7e
source.. = src/
output.. = target/classes/
bin.includes = .,\
META-INF/,\
OSGI-INF/,\
plugin.xml
plugins/org.jkiss.dbeaver.ui.editors.xml/plugin.xml 0 → 100644
浏览文件 @ fa488d7e
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
<extension point="org.jkiss.dbeaver.dataManager">
<streamManager class="org.jkiss.dbeaver.ui.data.managers.stream.XMLStreamValueManager" id="xml" label="XML" primaryMime="text/xml"
description="XML" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/xml.png"/>
</extension>
</plugin>
plugins/org.jkiss.dbeaver.ui.editors.xml/pom.xml 0 → 100644
浏览文件 @ fa488d7e
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jkiss.dbeaver</groupId>
<artifactId>plugins</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ui.editors.xml</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/data/managers/stream/XMLPanelEditor.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/data/managers/stream/XMLPanelEditor.java
浏览文件 @ fa488d7e
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
package org.jkiss.dbeaver.ui.data.managers.stream; package org.jkiss.dbeaver.ui.data.managers.stream;
import org.jkiss.dbeaver.ui.data.IValueController; import org.jkiss.dbeaver.ui.data.IValueController;
import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor; import org.jkiss.dbeaver.ui.data.managers.AbstractTextPanelEditor;
import org.jkiss.dbeaver.ui.editors.xml.XMLEditor; import org.jkiss.dbeaver.ui.editors.xml.XMLEditor;
/** /**
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/xml/NonRuleBasedDamagerRepairer.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/editors/xml/NonRuleBasedDamagerRepairer.java
浏览文件 @ fa488d7e
/* /*
* DBeaver - Universal Database Manager * DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.editors.xml; package org.jkiss.dbeaver.ui.editors.xml;
import org.eclipse.jface.text.*; import org.eclipse.jface.text.*;
import org.eclipse.jface.text.presentation.IPresentationDamager; import org.eclipse.jface.text.presentation.IPresentationDamager;
import org.eclipse.jface.text.presentation.IPresentationRepairer; import org.eclipse.jface.text.presentation.IPresentationRepairer;
import org.eclipse.swt.custom.StyleRange; import org.eclipse.swt.custom.StyleRange;
import org.jkiss.dbeaver.Log; import org.jkiss.dbeaver.Log;
public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPresentationRepairer { public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPresentationRepairer {
private static final Log log = Log.getLog(NonRuleBasedDamagerRepairer.class); private static final Log log = Log.getLog(NonRuleBasedDamagerRepairer.class);
/** The document this object works on */ /** The document this object works on */
protected IDocument fDocument; protected IDocument fDocument;
/** The default text attribute if non is returned as data by the current token */ /** The default text attribute if non is returned as data by the current token */
protected TextAttribute fDefaultTextAttribute; protected TextAttribute fDefaultTextAttribute;
public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) { public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
fDefaultTextAttribute = defaultTextAttribute; fDefaultTextAttribute = defaultTextAttribute;
} }
/** /**
* @see IPresentationRepairer#setDocument(IDocument) * @see IPresentationRepairer#setDocument(IDocument)
*/ */
@Override @Override
public void setDocument(IDocument document) { public void setDocument(IDocument document) {
fDocument = document; fDocument = document;
} }
/** /**
* Returns the end offset of the line that contains the specified offset or * Returns the end offset of the line that contains the specified offset or
* if the offset is inside a line delimiter, the end offset of the next line. * if the offset is inside a line delimiter, the end offset of the next line.
* *
* @param offset the offset whose line end offset must be computed * @param offset the offset whose line end offset must be computed
* @return the line end offset for the given offset * @return the line end offset for the given offset
* @exception BadLocationException if offset is invalid in the current document * @exception BadLocationException if offset is invalid in the current document
*/ */
protected int endOfLineOf(int offset) throws BadLocationException { protected int endOfLineOf(int offset) throws BadLocationException {
IRegion info = fDocument.getLineInformationOfOffset(offset); IRegion info = fDocument.getLineInformationOfOffset(offset);
if (offset <= info.getOffset() + info.getLength()) if (offset <= info.getOffset() + info.getLength())
return info.getOffset() + info.getLength(); return info.getOffset() + info.getLength();
int line = fDocument.getLineOfOffset(offset); int line = fDocument.getLineOfOffset(offset);
try { try {
info = fDocument.getLineInformation(line + 1); info = fDocument.getLineInformation(line + 1);
return info.getOffset() + info.getLength(); return info.getOffset() + info.getLength();
} catch (BadLocationException x) { } catch (BadLocationException x) {
return fDocument.getLength(); return fDocument.getLength();
} }
} }
/** /**
* @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean) * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
*/ */
@Override @Override
public IRegion getDamageRegion( public IRegion getDamageRegion(
ITypedRegion partition, ITypedRegion partition,
DocumentEvent event, DocumentEvent event,
boolean documentPartitioningChanged) { boolean documentPartitioningChanged) {
if (!documentPartitioningChanged) { if (!documentPartitioningChanged) {
try { try {
IRegion info = IRegion info =
fDocument.getLineInformationOfOffset(event.getOffset()); fDocument.getLineInformationOfOffset(event.getOffset());
int start = Math.max(partition.getOffset(), info.getOffset()); int start = Math.max(partition.getOffset(), info.getOffset());
int end = int end =
event.getOffset() event.getOffset()
+ (event.getText() == null + (event.getText() == null
? event.getLength() ? event.getLength()
: event.getText().length()); : event.getText().length());
if (info.getOffset() <= end if (info.getOffset() <= end
&& end <= info.getOffset() + info.getLength()) { && end <= info.getOffset() + info.getLength()) {
// optimize the case of the same line // optimize the case of the same line
end = info.getOffset() + info.getLength(); end = info.getOffset() + info.getLength();
} else } else
end = endOfLineOf(end); end = endOfLineOf(end);
end = end =
Math.min( Math.min(
partition.getOffset() + partition.getLength(), partition.getOffset() + partition.getLength(),
end); end);
return new Region(start, end - start); return new Region(start, end - start);
} catch (BadLocationException e) { } catch (BadLocationException e) {
log.debug(e); log.debug(e);
} }
} }
return partition; return partition;
} }
/** /**
* @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion) * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
*/ */
@Override @Override
public void createPresentation( public void createPresentation(
TextPresentation presentation, TextPresentation presentation,
ITypedRegion region) { ITypedRegion region) {
addRange( addRange(
presentation, presentation,
region.getOffset(), region.getOffset(),
region.getLength(), region.getLength(),
fDefaultTextAttribute); fDefaultTextAttribute);
} }
/** /**
* Adds style information to the given text presentation. * Adds style information to the given text presentation.
* *
* @param presentation the text presentation to be extended * @param presentation the text presentation to be extended
* @param offset the offset of the range to be styled * @param offset the offset of the range to be styled
* @param length the length of the range to be styled * @param length the length of the range to be styled
* @param attr the attribute describing the style of the range to be styled * @param attr the attribute describing the style of the range to be styled
*/ */
protected void addRange( protected void addRange(
TextPresentation presentation, TextPresentation presentation,
int offset, int offset,
int length, int length,
TextAttribute attr) { TextAttribute attr) {
if (attr != null) if (attr != null)
presentation.addStyleRange( presentation.addStyleRange(
new StyleRange( new StyleRange(
offset, offset,
length, length,
attr.getForeground(), attr.getForeground(),
attr.getBackground(), attr.getBackground(),
attr.getStyle())); attr.getStyle()));
} }
} }
\ No newline at end of file
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/xml/XMLDoubleClickStrategy.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/editors/xml/XMLDoubleClickStrategy.java
浏览文件 @ fa488d7e
/* /*
* DBeaver - Universal Database Manager * DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.editors.xml; package org.jkiss.dbeaver.ui.editors.xml;
import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextDoubleClickStrategy; import org.eclipse.jface.text.ITextDoubleClickStrategy;
import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.ITextViewer;
import org.jkiss.dbeaver.Log; import org.jkiss.dbeaver.Log;
public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy { public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
private static final Log log = Log.getLog(XMLDoubleClickStrategy.class); private static final Log log = Log.getLog(XMLDoubleClickStrategy.class);
protected ITextViewer fText; protected ITextViewer fText;
@Override @Override
public void doubleClicked(ITextViewer part) { public void doubleClicked(ITextViewer part) {
int pos = part.getSelectedRange().x; int pos = part.getSelectedRange().x;
if (pos < 0) if (pos < 0)
return; return;
fText = part; fText = part;
if (!selectComment(pos)) { if (!selectComment(pos)) {
selectWord(pos); selectWord(pos);
} }
} }
protected boolean selectComment(int caretPos) { protected boolean selectComment(int caretPos) {
IDocument doc = fText.getDocument(); IDocument doc = fText.getDocument();
int startPos, endPos; int startPos, endPos;
try { try {
int pos = caretPos; int pos = caretPos;
char c = ' '; char c = ' ';
while (pos >= 0) { while (pos >= 0) {
c = doc.getChar(pos); c = doc.getChar(pos);
if (c == '\\') { if (c == '\\') {
pos -= 2; pos -= 2;
continue; continue;
} }
if (c == Character.LINE_SEPARATOR || c == '\"') if (c == Character.LINE_SEPARATOR || c == '\"')
break; break;
--pos; --pos;
} }
if (c != '\"') if (c != '\"')
return false; return false;
startPos = pos; startPos = pos;
pos = caretPos; pos = caretPos;
int length = doc.getLength(); int length = doc.getLength();
c = ' '; c = ' ';
while (pos < length) { while (pos < length) {
c = doc.getChar(pos); c = doc.getChar(pos);
if (c == Character.LINE_SEPARATOR || c == '\"') if (c == Character.LINE_SEPARATOR || c == '\"')
break; break;
++pos; ++pos;
} }
if (c != '\"') if (c != '\"')
return false; return false;
endPos = pos; endPos = pos;
int offset = startPos + 1; int offset = startPos + 1;
int len = endPos - offset; int len = endPos - offset;
fText.setSelectedRange(offset, len); fText.setSelectedRange(offset, len);
return true; return true;
} catch (BadLocationException e) { } catch (BadLocationException e) {
log.debug(e); log.debug(e);
} }
return false; return false;
} }
protected boolean selectWord(int caretPos) { protected boolean selectWord(int caretPos) {
IDocument doc = fText.getDocument(); IDocument doc = fText.getDocument();
int startPos, endPos; int startPos, endPos;
try { try {
int pos = caretPos; int pos = caretPos;
char c; char c;
while (pos >= 0) { while (pos >= 0) {
c = doc.getChar(pos); c = doc.getChar(pos);
if (!Character.isJavaIdentifierPart(c)) if (!Character.isJavaIdentifierPart(c))
break; break;
--pos; --pos;
} }
startPos = pos; startPos = pos;
pos = caretPos; pos = caretPos;
int length = doc.getLength(); int length = doc.getLength();
while (pos < length) { while (pos < length) {
c = doc.getChar(pos); c = doc.getChar(pos);
if (!Character.isJavaIdentifierPart(c)) if (!Character.isJavaIdentifierPart(c))
break; break;
++pos; ++pos;
} }
endPos = pos; endPos = pos;
selectRange(startPos, endPos); selectRange(startPos, endPos);
return true; return true;
} catch (BadLocationException e) { } catch (BadLocationException e) {
log.debug(e); log.debug(e);
} }
return false; return false;
} }
private void selectRange(int startPos, int stopPos) { private void selectRange(int startPos, int stopPos) {
int offset = startPos + 1; int offset = startPos + 1;
int length = stopPos - offset; int length = stopPos - offset;
fText.setSelectedRange(offset, length); fText.setSelectedRange(offset, length);
} }
} }
\ No newline at end of file
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/xml/XMLEditor.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/editors/xml/XMLEditor.java
浏览文件 @ fa488d7e
/* /*
* DBeaver - Universal Database Manager * DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.editors.xml; package org.jkiss.dbeaver.ui.editors.xml;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3; import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.Position; import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.rules.FastPartitioner; import org.eclipse.jface.text.rules.FastPartitioner;
import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.IVerticalRuler; import org.eclipse.jface.text.source.IVerticalRuler;
import org.eclipse.jface.text.source.projection.ProjectionAnnotation; import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel; import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
import org.eclipse.jface.text.source.projection.ProjectionSupport; import org.eclipse.jface.text.source.projection.ProjectionSupport;
import org.eclipse.jface.text.source.projection.ProjectionViewer; import org.eclipse.jface.text.source.projection.ProjectionViewer;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.texteditor.ITextEditorExtension3; import org.eclipse.ui.texteditor.ITextEditorExtension3;
import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor; import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor;
import org.jkiss.dbeaver.ui.editors.text.FileRefDocumentProvider; import org.jkiss.dbeaver.ui.editors.text.FileRefDocumentProvider;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class XMLEditor extends BaseTextEditor { public class XMLEditor extends BaseTextEditor {
private ProjectionSupport projectionSupport; private ProjectionSupport projectionSupport;
private Annotation[] oldAnnotations; private Annotation[] oldAnnotations;
private ProjectionAnnotationModel annotationModel; private ProjectionAnnotationModel annotationModel;
public XMLEditor() { public XMLEditor() {
configureInsertMode(ITextEditorExtension3.SMART_INSERT, false); configureInsertMode(ITextEditorExtension3.SMART_INSERT, false);
setSourceViewerConfiguration(new XMLSourceViewerConfiguration(this)); setSourceViewerConfiguration(new XMLSourceViewerConfiguration(this));
setDocumentProvider(new FileRefDocumentProvider()); setDocumentProvider(new FileRefDocumentProvider());
} }
@Override @Override
public void dispose() { public void dispose() {
super.dispose(); super.dispose();
} }
@Override @Override
protected void doSetInput(IEditorInput input) throws CoreException { protected void doSetInput(IEditorInput input) throws CoreException {
super.doSetInput(input); super.doSetInput(input);
setupDocument(); setupDocument();
} }
@Override @Override
public void createPartControl(Composite parent) { public void createPartControl(Composite parent) {
super.createPartControl(parent); super.createPartControl(parent);
ProjectionViewer viewer = (ProjectionViewer) getSourceViewer(); ProjectionViewer viewer = (ProjectionViewer) getSourceViewer();
projectionSupport = new ProjectionSupport(viewer, getAnnotationAccess(), getSharedColors()); projectionSupport = new ProjectionSupport(viewer, getAnnotationAccess(), getSharedColors());
projectionSupport.install(); projectionSupport.install();
//turn projection mode on //turn projection mode on
viewer.doOperation(ProjectionViewer.TOGGLE); viewer.doOperation(ProjectionViewer.TOGGLE);
annotationModel = viewer.getProjectionAnnotationModel(); annotationModel = viewer.getProjectionAnnotationModel();
} }
private void setupDocument() { private void setupDocument() {
IDocument document = getDocument(); IDocument document = getDocument();
if (document != null) { if (document != null) {
IDocumentPartitioner partitioner = IDocumentPartitioner partitioner =
new FastPartitioner( new FastPartitioner(
new XMLPartitionScanner(), new XMLPartitionScanner(),
new String[]{ new String[]{
XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_TAG,
XMLPartitionScanner.XML_COMMENT}); XMLPartitionScanner.XML_COMMENT});
partitioner.connect(document); partitioner.connect(document);
((IDocumentExtension3) document).setDocumentPartitioner(XMLPartitionScanner.XML_PARTITIONING, partitioner); ((IDocumentExtension3) document).setDocumentPartitioner(XMLPartitionScanner.XML_PARTITIONING, partitioner);
} }
} }
protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles)
{ {
ISourceViewer viewer = new ProjectionViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles); ISourceViewer viewer = new ProjectionViewer(parent, ruler, getOverviewRuler(), isOverviewRulerVisible(), styles);
// ensure decoration support has been created and configured. // ensure decoration support has been created and configured.
getSourceViewerDecorationSupport(viewer); getSourceViewerDecorationSupport(viewer);
return viewer; return viewer;
} }
void updateFoldingStructure(List<Position> positions) { void updateFoldingStructure(List<Position> positions) {
Annotation[] annotations = new Annotation[positions.size()]; Annotation[] annotations = new Annotation[positions.size()];
//this will hold the new annotations along //this will hold the new annotations along
//with their corresponding positions //with their corresponding positions
Map<Annotation, Position> newAnnotations = new HashMap<>(); Map<Annotation, Position> newAnnotations = new HashMap<>();
for (int i = 0; i < positions.size(); i++) { for (int i = 0; i < positions.size(); i++) {
ProjectionAnnotation annotation = new ProjectionAnnotation(); ProjectionAnnotation annotation = new ProjectionAnnotation();
newAnnotations.put(annotation, positions.get(i)); newAnnotations.put(annotation, positions.get(i));
annotations[i] = annotation; annotations[i] = annotation;
} }
annotationModel.modifyAnnotations(oldAnnotations, newAnnotations, null); annotationModel.modifyAnnotations(oldAnnotations, newAnnotations, null);
oldAnnotations = annotations; oldAnnotations = annotations;
} }
} }
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/xml/XMLFormattingStrategy.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/editors/xml/XMLFormattingStrategy.java
浏览文件 @ fa488d7e
...@@ -64,7 +64,7 @@ public class XMLFormattingStrategy extends ContextBasedFormattingStrategy ...@@ -64,7 +64,7 @@ public class XMLFormattingStrategy extends ContextBasedFormattingStrategy
transformer.transform(source, result); transformer.transform(source, result);
return result.getWriter().toString(); return result.getWriter().toString();
} catch (Throwable e) { } catch (Throwable e) {
log.debug("Error formatting XML", e); log.debug("Error formatting XML: " + e.getMessage());
return content; return content;
} }
} }
......
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/xml/XMLPartitionScanner.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/editors/xml/XMLPartitionScanner.java
浏览文件 @ fa488d7e
/* /*
* DBeaver - Universal Database Manager * DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.editors.xml; package org.jkiss.dbeaver.ui.editors.xml;
import org.eclipse.jface.text.rules.*; import org.eclipse.jface.text.rules.*;
public class XMLPartitionScanner extends RuleBasedPartitionScanner { public class XMLPartitionScanner extends RuleBasedPartitionScanner {
public static final String XML_PARTITIONING= "__xml_partitioning"; //$NON-NLS-1$ public static final String XML_PARTITIONING= "__xml_partitioning"; //$NON-NLS-1$
public final static String XML_DEFAULT = "__xml_default"; //$NON-NLS-1$ public final static String XML_DEFAULT = "__xml_default"; //$NON-NLS-1$
public final static String XML_COMMENT = "__xml_comment"; //$NON-NLS-1$ public final static String XML_COMMENT = "__xml_comment"; //$NON-NLS-1$
public final static String XML_TAG = "__xml_tag"; //$NON-NLS-1$ public final static String XML_TAG = "__xml_tag"; //$NON-NLS-1$
public XMLPartitionScanner() { public XMLPartitionScanner() {
IToken xmlComment = new Token(XMLPartitionScanner.XML_COMMENT); IToken xmlComment = new Token(XMLPartitionScanner.XML_COMMENT);
IToken tag = new Token(XMLPartitionScanner.XML_TAG); IToken tag = new Token(XMLPartitionScanner.XML_TAG);
IPredicateRule[] rules = new IPredicateRule[2]; IPredicateRule[] rules = new IPredicateRule[2];
rules[0] = new MultiLineRule("<!--", "-->", xmlComment); //$NON-NLS-1$//$NON-NLS-2$ rules[0] = new MultiLineRule("<!--", "-->", xmlComment); //$NON-NLS-1$//$NON-NLS-2$
rules[1] = new XMLTagRule(tag); rules[1] = new XMLTagRule(tag);
setPredicateRules(rules); setPredicateRules(rules);
} }
} }
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/xml/XMLScanner.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/editors/xml/XMLScanner.java
浏览文件 @ fa488d7e
/* /*
* DBeaver - Universal Database Manager * DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.editors.xml; package org.jkiss.dbeaver.ui.editors.xml;
import org.eclipse.jface.text.TextAttribute; import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.rules.*; import org.eclipse.jface.text.rules.*;
import org.eclipse.jface.text.source.ISharedTextColors; import org.eclipse.jface.text.source.ISharedTextColors;
import org.jkiss.dbeaver.ui.editors.text.TextWhiteSpaceDetector; import org.jkiss.dbeaver.ui.editors.text.TextWhiteSpaceDetector;
public class XMLScanner extends RuleBasedScanner { public class XMLScanner extends RuleBasedScanner {
public XMLScanner(ISharedTextColors manager) { public XMLScanner(ISharedTextColors manager) {
IToken procInstr = IToken procInstr =
new Token( new Token(
new TextAttribute( new TextAttribute(
manager.getColor(XMLSourceViewerConfiguration.COLOR_PROC_INSTR))); manager.getColor(XMLSourceViewerConfiguration.COLOR_PROC_INSTR)));
IRule[] rules = new IRule[2]; IRule[] rules = new IRule[2];
//Add rule for processing instructions //Add rule for processing instructions
rules[0] = new SingleLineRule("<?", "?>", procInstr); //$NON-NLS-1$ //$NON-NLS-2$ rules[0] = new SingleLineRule("<?", "?>", procInstr); //$NON-NLS-1$ //$NON-NLS-2$
// Add generic whitespace rule. // Add generic whitespace rule.
rules[1] = new WhitespaceRule(new TextWhiteSpaceDetector()); rules[1] = new WhitespaceRule(new TextWhiteSpaceDetector());
setRules(rules); setRules(rules);
} }
} }
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/xml/XMLTagRule.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/editors/xml/XMLTagRule.java
浏览文件 @ fa488d7e
/* /*
* DBeaver - Universal Database Manager * DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.editors.xml; package org.jkiss.dbeaver.ui.editors.xml;
import org.eclipse.jface.text.rules.ICharacterScanner; import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.MultiLineRule; import org.eclipse.jface.text.rules.MultiLineRule;
public class XMLTagRule extends MultiLineRule { public class XMLTagRule extends MultiLineRule {
public XMLTagRule(IToken token) { public XMLTagRule(IToken token) {
super("<", ">", token); //$NON-NLS-1$//$NON-NLS-2$ super("<", ">", token); //$NON-NLS-1$//$NON-NLS-2$
} }
@Override @Override
protected boolean sequenceDetected( protected boolean sequenceDetected(
ICharacterScanner scanner, ICharacterScanner scanner,
char[] sequence, char[] sequence,
boolean eofAllowed) { boolean eofAllowed) {
int c = scanner.read(); int c = scanner.read();
if (sequence[0] == '<') { if (sequence[0] == '<') {
if (c == '?') { if (c == '?') {
// processing instruction - abort // processing instruction - abort
scanner.unread(); scanner.unread();
return false; return false;
} }
if (c == '!') { if (c == '!') {
scanner.unread(); scanner.unread();
// comment - abort // comment - abort
return false; return false;
} }
} else if (sequence[0] == '>') { } else if (sequence[0] == '>') {
scanner.unread(); scanner.unread();
} }
return super.sequenceDetected(scanner, sequence, eofAllowed); return super.sequenceDetected(scanner, sequence, eofAllowed);
} }
} }
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/xml/XMLTagScanner.java → plugins/org.jkiss.dbeaver.ui.editors.xml/src/org/jkiss/dbeaver/ui/editors/xml/XMLTagScanner.java
浏览文件 @ fa488d7e
/* /*
* DBeaver - Universal Database Manager * DBeaver - Universal Database Manager
* Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org) * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jkiss.dbeaver.ui.editors.xml; package org.jkiss.dbeaver.ui.editors.xml;
import org.eclipse.jface.text.TextAttribute; import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.rules.*; import org.eclipse.jface.text.rules.*;
import org.eclipse.jface.text.source.ISharedTextColors; import org.eclipse.jface.text.source.ISharedTextColors;
import org.jkiss.dbeaver.ui.editors.text.TextWhiteSpaceDetector; import org.jkiss.dbeaver.ui.editors.text.TextWhiteSpaceDetector;
public class XMLTagScanner extends RuleBasedScanner { public class XMLTagScanner extends RuleBasedScanner {
public XMLTagScanner(ISharedTextColors manager) { public XMLTagScanner(ISharedTextColors manager) {
IToken string = IToken string =
new Token( new Token(
new TextAttribute(manager.getColor(XMLSourceViewerConfiguration.COLOR_STRING))); new TextAttribute(manager.getColor(XMLSourceViewerConfiguration.COLOR_STRING)));
IRule[] rules = new IRule[3]; IRule[] rules = new IRule[3];
// Add rule for double quotes // Add rule for double quotes
rules[0] = new SingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$ rules[0] = new SingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
// Add a rule for single quotes // Add a rule for single quotes
rules[1] = new SingleLineRule("'", "'", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$ rules[1] = new SingleLineRule("'", "'", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
// Add generic whitespace rule. // Add generic whitespace rule.
rules[2] = new WhitespaceRule(new TextWhiteSpaceDetector()); rules[2] = new WhitespaceRule(new TextWhiteSpaceDetector());
setRules(rules); setRules(rules);
} }
} }
plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/internal/UINavigatorMessages_ru.properties
浏览文件 @ fa488d7e
...@@ -25,9 +25,6 @@ actions_navigator_copy_fqn_title=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u043 ...@@ -25,9 +25,6 @@ actions_navigator_copy_fqn_title=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u043
actions_navigator_copy_fqn_titles=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u043E\u043B\u043D\u044B\u0435 \u0438\u043C\u0435\u043D\u0430 actions_navigator_copy_fqn_titles=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u043E\u043B\u043D\u044B\u0435 \u0438\u043C\u0435\u043D\u0430
actions_navigator_copy_object_copy_node=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C {0} actions_navigator_copy_object_copy_node=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C {0}
actions_navigator_copy_object_copy_objects=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442\u044B actions_navigator_copy_object_copy_objects=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442\u044B
actions_navigator_bookmark_error_message=\u041E\u0448\u0438\u0431\u043A\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u0437\u0430\u043A\u043B\u0430\u0434\u043A\u0438
actions_navigator_bookmark_error_title=\u041D\u043E\u0432\u0430\u044F \u0437\u0430\u043A\u043B\u0430\u0434\u043A\u0430
actions_navigator_bookmark_title=\u0418\u043C\u044F \u0437\u0430\u043A\u043B\u0430\u0434\u043A\u0438
actions_navigator_create_folder_error_message=\u041E\u0448\u0438\u0431\u043A\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u043F\u0430\u043F\u043A\u0438 "{0}" actions_navigator_create_folder_error_message=\u041E\u0448\u0438\u0431\u043A\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u043F\u0430\u043F\u043A\u0438 "{0}"
actions_navigator_create_folder_error_title=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443 actions_navigator_create_folder_error_title=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443
actions_navigator_create_folder_folder_name=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443 actions_navigator_create_folder_folder_name=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443
......
plugins/pom.xml
浏览文件 @ fa488d7e
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<module>org.jkiss.dbeaver.ui.editors.hex</module> <module>org.jkiss.dbeaver.ui.editors.hex</module>
<module>org.jkiss.dbeaver.ui.editors.image</module> <module>org.jkiss.dbeaver.ui.editors.image</module>
<module>org.jkiss.dbeaver.ui.editors.sql</module> <module>org.jkiss.dbeaver.ui.editors.sql</module>
<module>org.jkiss.dbeaver.ui.editors.xml</module>
<module>org.jkiss.dbeaver.ui.navigator</module> <module>org.jkiss.dbeaver.ui.navigator</module>
<module>org.jkiss.dbeaver.debug.core</module> <module>org.jkiss.dbeaver.debug.core</module>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或