Icons model refactoring

Former-commit-id: 15741915

plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/search/DatabaseSearchDialog.java

@@ -25,8 +25,6 @@ import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.ShellAdapter;
 import org.eclipse.swt.events.ShellEvent;
 import org.eclipse.swt.graphics.Image;
@@ -41,7 +39,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.IHelpContextIds;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dialogs.HelpEnabledDialog;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverUI.java

@@ -38,9 +38,9 @@ import org.jkiss.dbeaver.runtime.RunnableContextDelegate;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.ui.AbstractUIJob;
+import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.SharedTextColors;
 import org.jkiss.dbeaver.ui.TrayIconHandler;
-import org.osgi.framework.Bundle;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -104,8 +104,7 @@ public class DBeaverUI {
 
     private void initialize()
     {
-        Bundle coreBundle = DBeaverActivator.getInstance().getBundle();
-        DBeaverIcons.initRegistry(coreBundle);
+        DBeaverIcons.initRegistry();
 
         this.sharedTextColors = new SharedTextColors();
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBIcon.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License (version 2)
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.jkiss.dbeaver.model;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.jkiss.dbeaver.runtime.RuntimeUtils;
+import org.jkiss.dbeaver.ui.DBeaverIcons;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * DBIcon
+ */
+public enum DBIcon implements DBPImage
+{
+    DBEAVER_LOGO("dbeaver_logo", "dbeaver.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    GEN_DATABASE("gen_database", "database.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    GEN_DATABASE_TYPE("gen_database_type", "database_type.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    TREE("tree", "tree/tree.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_ADMIN("admin", "tree/admin.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_DATABASE("database", "tree/database.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_DATABASE_CATEGORY("database_category", "tree/database_category.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_SCHEMA("schema", "tree/schema.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_TABLE("table", "tree/table.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_TABLE_ALIAS("table_alias", "tree/table_alias.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_TABLE_SORT("table_sort", "tree/table_sort.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_VIEW("view", "tree/view.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FUNCTION("function", "tree/function.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_PROCEDURE("procedure", "tree/procedure.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_COLUMNS("columns", "tree/columns.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_COLUMN("column", "tree/column.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_INDEX("index", "tree/index.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_CONSTRAINT("constraint", "tree/constraint.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_UNIQUE_KEY("unique-key", "tree/unique_constraint.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOREIGN_KEY("foreign-key", "tree/foreign_key.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOREIGN_KEY_COLUMN("foreign-key-column", "tree/foreign_key_column.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_REFERENCE("reference", "tree/reference.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_TRIGGER("trigger", "tree/trigger.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_USER("user", "tree/user.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_PAGE("page", "tree/page.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOLDER("folder", "tree/folder.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOLDER_LINK("folder_linked", "tree/folder_link.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOLDER_DATABASE("folder_database", "tree/folder_database.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOLDER_SCHEMA("folder_schema", "tree/folder_schema.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOLDER_TABLE("folder_table", "tree/folder_table.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOLDER_VIEW("folder_view", "tree/folder_view.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOLDER_USER("folder_user", "tree/folder_user.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOLDER_ADMIN("folder_admin", "tree/folder_admin.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_SESSIONS("sessions", "tree/sessions.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_PACKAGE("package", "tree/package.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_DATA_TYPE("data_type", "tree/data_type.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_SEQUENCE("sequence", "tree/sequence.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_SYNONYM("synonym", "tree/synonym.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_TABLESPACE("tablespace", "tree/tablespace.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_PARTITION("partition", "tree/partition.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_ATTRIBUTE("attribute", "tree/attribute.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_ARGUMENT("argument", "tree/argument.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_JAVA_CLASS("javaClass", "tree/java_class.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_JAVA_INTERFACE("javaInterface", "tree/java_interface.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_LINK("link", "tree/link.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FILE("file", "tree/file.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_CLASS("class", "tree/class.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_ASSOCIATION("association", "tree/association.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_SERVER("server", "tree/server.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_SERVERS("servers", "tree/servers.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    TREE_INFO("info", "/tree/info.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_FOLDER_INFO("folder_info", "/tree/folder_info.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_RECYCLE_BIN("recycle_bin", "/tree/recycle_bin.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    TREE_EXPAND("expand", "/misc/expand.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TREE_COLLAPSE("collapse", "/misc/collapse.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    PROJECT("project", "project.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROJECTS("projects", "projects.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CONNECTIONS("connections", "connections.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    DATABASES("databases", "databases.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SCRIPTS("scripts", "scripts.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    BOOKMARK_FOLDER("bookmark_folder", "bookmark_folder.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    BOOKMARK("bookmark", "bookmark.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    PICTURE("picture", "picture.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    PICTURE_SAVE("picture_save", "picture_save.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROPERTIES("properties", "properties.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CONFIGURATION("configuration", "configuration.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    LINK("link", "misc/link.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CURSOR("cursor", "misc/cursor.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    LOADING1("loading1", "tree/load/loading1.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    LOADING2("loading2", "tree/load/loading2.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    LOADING3("loading3", "tree/load/loading3.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    LOADING4("loading4", "tree/load/loading4.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    PROGRESS0("progress0", "misc/progress_0.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROGRESS1("progress1", "misc/progress_1.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROGRESS2("progress2", "misc/progress_2.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROGRESS3("progress3", "misc/progress_3.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROGRESS4("progress4", "misc/progress_4.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROGRESS5("progress5", "misc/progress_5.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROGRESS6("progress6", "misc/progress_6.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROGRESS7("progress7", "misc/progress_7.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROGRESS8("progress8", "misc/progress_8.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+    PROGRESS9("progress9", "misc/progress_9.gif"), //$NON-NLS-1$ //$NON-NLS-2$
+
+//    RS_FIRST("rs_first", "/sql/resultset_first.png"), //$NON-NLS-1$ //$NON-NLS-2$
+//    RS_LAST("rs_last", "/sql/resultset_last.png"), //$NON-NLS-1$ //$NON-NLS-2$
+//    RS_NEXT("rs_next", "/sql/resultset_next.png"), //$NON-NLS-1$ //$NON-NLS-2$
+//    RS_PREV("rs_prev", "/sql/resultset_previous.png"), //$NON-NLS-1$ //$NON-NLS-2$
+//    RS_FETCH_PAGE("resultset_fetch_page.png", "sql/resultset_fetch_page.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    RS_REFRESH("rs_refresh", "/sql/resultset_refresh.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    RS_GRID("rs_mode_grid", "sql/grid.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    RS_DETAILS("rs_details", "sql/details.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    RS_FORWARD("rs_forward", "sql/forward.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    RS_BACK("rs_back", "sql/back.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    TXN_COMMIT_AUTO("txn_commit_auto", "sql/txn_auto.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TXN_COMMIT_MANUAL("txn_commit_manual", "sql/txn_manual.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    RULER_POSITION("ruler_position", "/misc/ruler_position.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    FILTER_VALUE("filter_value", "/misc/filter_value.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    FILTER_INPUT("filter_input", "/misc/filter_input.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    FILTER_CLIPBOARD("filter_clipboard", "/misc/filter_clipboard.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    FIND("find", "/misc/find.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    FIND_TEXT("find_text", "/misc/find_text.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SEARCH("search", "/misc/search.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CHECK("check", "/misc/check.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CHECK2("check2", "/misc/check2.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CHECK_ON("checked", "/misc/checked.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CHECK_OFF("unchecked", "/misc/unchecked.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ZOOM("zoom", "/misc/zoom.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ZOOM_IN("zoom_in", "/misc/zoom_in.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ZOOM_OUT("zoom_out", "/misc/zoom_out.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ROTATE("rotate", "/misc/rotate.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ROTATE_LEFT("rotate_left", "/misc/rotate_left.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ROTATE_RIGHT("rotate_right", "/misc/rotate_right.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    FIT_WINDOW("fit_window", "/misc/fit-window.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ORIGINAL_SIZE("original_size", "/misc/original-size.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ASTERISK("asterisk", "/misc/asterisk.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    BULLET_BLACK("bullet_black", "/misc/bullet_black.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    BULLET_GREEN("bullet_green", "/misc/bullet_green.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    BULLET_RED("bullet_red", "/misc/bullet_red.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    BULLET_STAR("bullet_star", "/misc/bullet_star.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ARROW_UP("arrow_up", "/misc/arrow_up.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ARROW_DOWN("arrow_down", "/misc/arrow_down.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ARROW_LEFT("arrow_left", "/misc/arrow_left.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ARROW_LEFT_ALL("arrow_left_all", "/misc/arrow_left_all.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ARROW_RIGHT("arrow_right", "/misc/arrow_right.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ARROW_RIGHT_ALL("arrow_right_all", "/misc/arrow_right_all.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ARROW_RESET("arrow_reset", "/misc/arrow_reset.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SORT_INCREASE("sort_increase", "/misc/sort_increase.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SORT_DECREASE("sort_decrease", "/misc/sort_decrease.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SORT_UNKNOWN("sort_unknown", "/misc/sort_unknown.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    FRAME_QUERY("frame_query", "/misc/frame_query.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    FILTER("filter", "/misc/filter.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    FILTER_APPLY("filter_apply", "/misc/filter_apply.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    FILTER_RESET("filter_reset", "/misc/filter_reset.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    EVENT("event", "/misc/event.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    HOME("home", "/misc/home.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    COMPILE("compile", "/misc/compile.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    COMPILE_LOG("compile_log", "/misc/compile_log.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    SAVE("save", "/file/save.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SAVE_AS("save_as", "/file/save_as.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    LOAD("load", "/file/load.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    RESET("reset", "/file/reset.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    COMPARE("compare", "/file/compare.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ACCEPT("accept", "/sql/accept.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    REJECT("reject", "/sql/cancel.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    REVERT("revert", "/sql/revert.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    IMPORT("import", "/file/import.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    EXPORT("export", "/file/export.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    REFRESH("refresh", "/refresh.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CONFIRM("confirm", "/misc/confirm.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CLOSE("close", "/misc/close.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    JAR("jar", "/misc/jar.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SOURCES("sources", "/misc/sources.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CANCEL("cancel", "/misc/cancel.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    ROW_ADD("row_add", "/sql/row_add.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ROW_COPY("row_copy", "/sql/row_copy.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ROW_EDIT("row_edit", "/sql/row_edit.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    ROW_DELETE("row_delete", "/sql/row_delete.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    EDIT_DATABASE("edit_database", "/misc/edit_database.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    EDIT_TABLE("edit_table", "/misc/edit_table.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    EDIT_COLUMN("edit_column", "/misc/edit_column.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    CONFIG_TABLE("edit_table", "/misc/config_table.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    TYPE_BOOLEAN("boolean", "/sql/types/boolean.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_NUMBER("number", "/sql/types/number.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_STRING("string", "/sql/types/string.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_DATETIME("datetime", "/sql/types/datetime.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_BINARY("binary", "/sql/types/binary.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_TEXT("text", "/sql/types/text.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_XML("xml", "/sql/types/xml.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_LOB("lob", "/sql/types/lob.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_ARRAY("array", "/sql/types/array.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_STRUCT("struct", "/sql/types/struct.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_DOCUMENT("document", "/sql/types/document.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_OBJECT("object", "/sql/types/object.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_IMAGE("image", "/sql/types/image.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_REFERENCE("reference", "/sql/types/reference.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_ROWID("rowid", "/sql/types/rowid.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_ANY("any", "/sql/types/any.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_UUID("uuid", "/sql/types/uuid.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    TYPE_UNKNOWN("unknown", "/sql/types/unknown.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    SQL_CONNECT("sql_connect", "/sql/connect.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SQL_DISCONNECT("sql_disconnect", "/sql/disconnect.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SQL_SCRIPT("sql_script", "/sql/sql_script.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SQL_EXECUTE("sql_exec", "/sql/sql_exec.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SQL_SCRIPT_EXECUTE("sql_script_exec", "/sql/sql_script_exec.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SQL_ANALYSE("sql_analyse", "/sql/sql_analyse.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SQL_EXPLAIN_PLAN("sql_explain", "/sql/sql_plan.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SQL_VALIDATE("sql_validate", "/sql/sql_validate.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SQL_PREVIEW("sql_preview", "/sql/sql_preview.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SQL_TEXT("sql_text", "/sql/sql_text.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    SAVE_TO_DATABASE("save_to_db", "/sql/save_to_database.png"), //$NON-NLS-1$ //$NON-NLS-2$
+
+    OVER_SUCCESS("over_success", "/over/success_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    OVER_FAILED("over_failed", "/over/failed_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    OVER_ERROR("over_error", "/over/error_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    OVER_UNKNOWN("over_condition", "/over/conditional_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    OVER_LAMP("over_lamp", "/over/lamp_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    OVER_KEY("over_key", "/over/key_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    OVER_LOCK("over_lock", "/over/lock_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    OVER_EXTERNAL("over_external", "/over/external_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
+    OVER_REFERENCE("over_reference", "/over/reference_ovr.png"); //$NON-NLS-1$ //$NON-NLS-2$
+
+    private final String token;
+    private final String path;
+
+    DBIcon(String token, String path)
+    {
+        this.token = token;
+        this.path = ICON_LOCATION_PREFIX + path;
+    }
+
+
+    /**
+     * Token is icon id. It can be used to refer on icons in plugin extensions
+     * @return unique token
+     */
+    public String getToken()
+    {
+        return token;
+    }
+
+    public Image getImage()
+    {
+        return DBeaverIcons.getImage(this);
+    }
+
+    public ImageDescriptor getImageDescriptor()
+    {
+        return DBeaverIcons.getImageDescriptor(this);
+    }
+
+    @Override
+    public String getLocation() {
+        return path;
+    }
+
+    @Override
+    public File getFile() throws IOException {
+        return RuntimeUtils.getPlatformFile(path);
+    }
+
+    static final String ICON_LOCATION_PREFIX = "platform:/plugin/org.jkiss.dbeaver.core/icons/";
+}

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPImage.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License (version 2)
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.jkiss.dbeaver.model;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * Image reference
+ */
+public interface DBPImage
+{
+
+    String getLocation();
+
+    File getFile() throws IOException;
+
+}

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBUtils.java

@@ -38,7 +38,6 @@ import org.jkiss.dbeaver.model.struct.rdb.*;
 import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
 import org.jkiss.dbeaver.registry.DataTypeProviderDescriptor;
 import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
-import org.jkiss.dbeaver.ui.DBIcon;
 import org.jkiss.dbeaver.ui.actions.datasource.DataSourceInvalidateHandler;
 import org.jkiss.dbeaver.ui.dialogs.driver.DriverEditDialog;
 import org.jkiss.dbeaver.runtime.sql.SQLConstants;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/DateTimeValueHandler.java

@@ -32,7 +32,7 @@ import org.jkiss.dbeaver.model.impl.data.editors.DateTimeInlineEditor;
 import org.jkiss.dbeaver.model.impl.data.editors.DateTimeStandaloneEditor;
 import org.jkiss.dbeaver.model.impl.data.formatters.DefaultDataFormatter;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.properties.PropertySourceAbstract;
 
 import java.text.ParseException;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/editors/BaseValueEditor.java

@@ -27,11 +27,10 @@ import org.eclipse.swt.events.TraverseEvent;
 import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.data.DBDValueController;
 import org.jkiss.dbeaver.model.data.DBDValueEditor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 
 /**

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/editors/ContentPanelEditor.java

@@ -37,7 +37,7 @@ import org.jkiss.dbeaver.model.impl.BytesContentStorage;
 import org.jkiss.dbeaver.model.impl.StringContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.controls.imageview.ImageViewer;
 import org.jkiss.dbeaver.ui.editors.binary.BinaryContent;
 import org.jkiss.dbeaver.ui.editors.binary.HexEditControl;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/struct/JDBCColumn.java

@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
 import org.jkiss.dbeaver.model.impl.struct.AbstractAttribute;
 import org.jkiss.dbeaver.model.struct.DBSObject;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.OverlayImageDescriptor;
 
 import java.util.HashMap;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/net/GlobalProxyAuthenticator.java

@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
 import org.jkiss.dbeaver.registry.encode.EncryptionException;
 import org.jkiss.dbeaver.registry.encode.SecuredPasswordEncrypter;
 import org.jkiss.dbeaver.runtime.RunnableWithResult;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dialogs.connection.BaseAuthDialog;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/struct/AbstractProcedure.java

@@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
 import org.jkiss.dbeaver.model.struct.rdb.DBSProcedure;
 import org.jkiss.dbeaver.model.struct.rdb.DBSProcedureType;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * AbstractProcedure

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/struct/RelationalObjectType.java

@@ -21,7 +21,7 @@ import org.eclipse.swt.graphics.Image;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectType;
 import org.jkiss.dbeaver.model.struct.rdb.*;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * Relational database object type.

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNLocalFolder.java

@@ -22,7 +22,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.NavigatorUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNModel.java

@@ -36,7 +36,7 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectState;
 import org.jkiss.dbeaver.registry.ProjectRegistry;
 import org.jkiss.dbeaver.registry.tree.DBXTreeFolder;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.OverlayImageDescriptor;
 import org.jkiss.dbeaver.ui.actions.GlobalPropertyTester;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNNode.java

@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPNamedObject;
 import org.jkiss.dbeaver.model.DBPPersistedObject;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.Collection;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNProject.java

@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.project.DBPResourceHandler;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;
 import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 import java.util.ArrayList;
 import java.util.List;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java

@@ -27,7 +27,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.utils.CommonUtils;
 
 import java.lang.reflect.InvocationTargetException;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java

@@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.project.DBPResourceHandler;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.*;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/struct/DBSEntityType.java

@@ -18,7 +18,7 @@
 package org.jkiss.dbeaver.model.struct;
 
 import org.eclipse.swt.graphics.Image;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * Entity type

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/struct/DBSObjectState.java

@@ -19,7 +19,7 @@
 package org.jkiss.dbeaver.model.struct;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * Object state

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/AbstractDescriptor.java

@@ -27,7 +27,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.DBeaverActivator;
-import org.jkiss.dbeaver.core.DBeaverIcons;
+import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.utils.CommonUtils;
 import org.osgi.framework.Bundle;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceProviderDescriptor.java

@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.DBPDataSourceProvider;
 import org.jkiss.dbeaver.model.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.registry.tree.*;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.NavigatorUtils;
 import org.jkiss.dbeaver.ui.properties.PropertyDescriptorEx;
 import org.jkiss.utils.ArrayUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java

@@ -41,7 +41,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.OverlayImageDescriptor;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dialogs.AcceptLicenseDialog;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/editor/EntityEditorDescriptor.java

@@ -28,7 +28,7 @@ import org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput;
 import org.jkiss.dbeaver.ui.editors.IDatabaseEditorInputFactory;
 import org.jkiss.dbeaver.registry.AbstractContextDescriptor;
 import org.jkiss.dbeaver.registry.RegistryConstants;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.IActionConstants;
 import org.jkiss.dbeaver.ui.editors.entity.properties.ObjectPropertiesEditor;
 import org.jkiss.dbeaver.ui.editors.entity.properties.ObjectPropertiesEditorInputFactory;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryJob.java

@@ -42,7 +42,7 @@ import org.jkiss.dbeaver.model.sql.SQLQueryResult;
 import org.jkiss.dbeaver.runtime.RunnableWithResult;
 import org.jkiss.dbeaver.runtime.exec.ExecutionQueueErrorJob;
 import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryParameterBindDialog.java

@@ -43,7 +43,7 @@ import org.jkiss.dbeaver.model.struct.DBSDataType;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;
 import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
 import org.jkiss.dbeaver.registry.DataTypeProviderDescriptor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizardPage.java

@@ -35,7 +35,7 @@ import org.eclipse.ui.PlatformUI;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizardPageFile.java

@@ -29,7 +29,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.*;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverCore;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.xml.XMLUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizard.java

@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.utils.ContentUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizardPage.java

@@ -40,7 +40,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.navigator.DBNResource;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.views.navigator.database.DatabaseNavigatorTree;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizardPage.java

@@ -40,7 +40,7 @@ import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;
 import org.jkiss.dbeaver.registry.ProjectRegistry;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.CImageCombo;
 import org.jkiss.dbeaver.ui.views.navigator.database.DatabaseNavigatorTree;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseConsumerPageMapping.java

@@ -44,7 +44,7 @@ import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.tools.transfer.wizard.DataTransferPipe;
 import org.jkiss.dbeaver.tools.transfer.wizard.DataTransferWizard;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.SharedTextColors;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.CustomComboBoxCellEditor;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseMappingAttribute.java

@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.struct.DBSAttributeBase;
 import org.jkiss.dbeaver.model.struct.DBSDataType;
 import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.ArrayList;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseMappingContainer.java

@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/DBIcon.java

-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2)
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jkiss.dbeaver.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.jkiss.dbeaver.core.DBeaverIcons;
-
-/**
- * DBIcon
- */
-public enum DBIcon
-{
-    DBEAVER_LOGO("dbeaver_logo", "icons/dbeaver.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    GEN_DATABASE("gen_database", "icons/database.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    GEN_DATABASE_TYPE("gen_database_type", "icons/database_type.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    TREE("tree", "icons/tree/tree.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_ADMIN("admin", "icons/tree/admin.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_DATABASE("database", "icons/tree/database.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_DATABASE_CATEGORY("database_category", "icons/tree/database_category.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_SCHEMA("schema", "icons/tree/schema.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_TABLES("tables", "icons/tree/tables.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_TABLE("table", "icons/tree/table.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_TABLE_ALIAS("table_alias", "icons/tree/table_alias.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_TABLE_SORT("table_sort", "icons/tree/table_sort.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_VIEW("view", "icons/tree/view.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FUNCTION("function", "icons/tree/function.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_PROCEDURE("procedure", "icons/tree/procedure.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_COLUMNS("columns", "icons/tree/columns.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_COLUMN("column", "icons/tree/column.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_INDEX("index", "icons/tree/index.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_CONSTRAINT("constraint", "icons/tree/constraint.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_UNIQUE_KEY("unique-key", "icons/tree/unique_constraint.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOREIGN_KEY("foreign-key", "icons/tree/foreign_key.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOREIGN_KEY_COLUMN("foreign-key-column", "icons/tree/foreign_key_column.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_REFERENCE("reference", "icons/tree/reference.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_TRIGGER("trigger", "icons/tree/trigger.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_USER("user", "icons/tree/user.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_PAGE("page", "icons/tree/page.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOLDER("folder", "icons/tree/folder.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOLDER_LINK("folder_linked", "icons/tree/folder_link.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOLDER_DATABASE("folder_database", "icons/tree/folder_database.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOLDER_SCHEMA("folder_schema", "icons/tree/folder_schema.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOLDER_TABLE("folder_table", "icons/tree/folder_table.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOLDER_VIEW("folder_view", "icons/tree/folder_view.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOLDER_USER("folder_user", "icons/tree/folder_user.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOLDER_ADMIN("folder_admin", "icons/tree/folder_admin.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_SESSIONS("sessions", "icons/tree/sessions.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_PACKAGE("package", "icons/tree/package.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_DATA_TYPE("data_type", "icons/tree/data_type.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_SEQUENCE("sequence", "icons/tree/sequence.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_SYNONYM("synonym", "icons/tree/synonym.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_TABLESPACE("tablespace", "icons/tree/tablespace.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_PARTITION("partition", "icons/tree/partition.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_ATTRIBUTE("attribute", "icons/tree/attribute.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_ARGUMENT("argument", "icons/tree/argument.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_JAVA_CLASS("javaClass", "icons/tree/java_class.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_JAVA_INTERFACE("javaInterface", "icons/tree/java_interface.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_LINK("link", "icons/tree/link.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FILE("file", "icons/tree/file.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_CLASS("class", "icons/tree/class.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_ASSOCIATION("association", "icons/tree/association.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_SERVER("server", "icons/tree/server.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_SERVERS("servers", "icons/tree/servers.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    TREE_INFO("info", "/icons/tree/info.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_FOLDER_INFO("folder_info", "/icons/tree/folder_info.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_RECYCLE_BIN("recycle_bin", "/icons/tree/recycle_bin.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    TREE_EXPAND("expand", "/icons/misc/expand.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TREE_COLLAPSE("collapse", "/icons/misc/collapse.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    PROJECT("project", "icons/project.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROJECTS("projects", "icons/projects.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CONNECTIONS("connections", "icons/connections.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    DATABASES("databases", "icons/databases.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SCRIPTS("scripts", "icons/scripts.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    BOOKMARK_FOLDER("bookmark_folder", "icons/bookmark_folder.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    BOOKMARK("bookmark", "icons/bookmark.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    PICTURE("picture", "icons/picture.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    PICTURE_SAVE("picture_save", "icons/picture_save.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROPERTIES("properties", "icons/properties.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CONFIGURATION("configuration", "icons/configuration.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    LINK("link", "icons/misc/link.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CURSOR("cursor", "icons/misc/cursor.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    LOADING1("loading1", "icons/tree/load/loading1.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    LOADING2("loading2", "icons/tree/load/loading2.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    LOADING3("loading3", "icons/tree/load/loading3.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    LOADING4("loading4", "icons/tree/load/loading4.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    PROGRESS0("progress0", "icons/misc/progress_0.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROGRESS1("progress1", "icons/misc/progress_1.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROGRESS2("progress2", "icons/misc/progress_2.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROGRESS3("progress3", "icons/misc/progress_3.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROGRESS4("progress4", "icons/misc/progress_4.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROGRESS5("progress5", "icons/misc/progress_5.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROGRESS6("progress6", "icons/misc/progress_6.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROGRESS7("progress7", "icons/misc/progress_7.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROGRESS8("progress8", "icons/misc/progress_8.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-    PROGRESS9("progress9", "icons/misc/progress_9.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-
-//    RS_FIRST("rs_first", "/icons/sql/resultset_first.png"), //$NON-NLS-1$ //$NON-NLS-2$
-//    RS_LAST("rs_last", "/icons/sql/resultset_last.png"), //$NON-NLS-1$ //$NON-NLS-2$
-//    RS_NEXT("rs_next", "/icons/sql/resultset_next.png"), //$NON-NLS-1$ //$NON-NLS-2$
-//    RS_PREV("rs_prev", "/icons/sql/resultset_previous.png"), //$NON-NLS-1$ //$NON-NLS-2$
-//    RS_FETCH_PAGE("resultset_fetch_page.png", "icons/sql/resultset_fetch_page.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    RS_REFRESH("rs_refresh", "/icons/sql/resultset_refresh.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    RS_GRID("rs_mode_grid", "icons/sql/grid.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    RS_DETAILS("rs_details", "icons/sql/details.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    RS_FORWARD("rs_forward", "icons/sql/forward.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    RS_BACK("rs_back", "icons/sql/back.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    TXN_COMMIT_AUTO("txn_commit_auto", "icons/sql/txn_auto.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TXN_COMMIT_MANUAL("txn_commit_manual", "icons/sql/txn_manual.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    RULER_POSITION("ruler_position", "/icons/misc/ruler_position.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    FILTER_VALUE("filter_value", "/icons/misc/filter_value.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    FILTER_INPUT("filter_input", "/icons/misc/filter_input.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    FILTER_CLIPBOARD("filter_clipboard", "/icons/misc/filter_clipboard.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    FIND("find", "/icons/misc/find.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    FIND_TEXT("find_text", "/icons/misc/find_text.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SEARCH("search", "/icons/misc/search.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CHECK("check", "/icons/misc/check.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CHECK2("check2", "/icons/misc/check2.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CHECK_ON("checked", "/icons/misc/checked.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CHECK_OFF("unchecked", "/icons/misc/unchecked.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ZOOM("zoom", "/icons/misc/zoom.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ZOOM_IN("zoom_in", "/icons/misc/zoom_in.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ZOOM_OUT("zoom_out", "/icons/misc/zoom_out.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ROTATE("rotate", "/icons/misc/rotate.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ROTATE_LEFT("rotate_left", "/icons/misc/rotate_left.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ROTATE_RIGHT("rotate_right", "/icons/misc/rotate_right.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    FIT_WINDOW("fit_window", "/icons/misc/fit-window.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ORIGINAL_SIZE("original_size", "/icons/misc/original-size.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ASTERISK("asterisk", "/icons/misc/asterisk.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    BULLET_BLACK("bullet_black", "/icons/misc/bullet_black.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    BULLET_GREEN("bullet_green", "/icons/misc/bullet_green.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    BULLET_RED("bullet_red", "/icons/misc/bullet_red.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    BULLET_STAR("bullet_star", "/icons/misc/bullet_star.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ARROW_UP("arrow_up", "/icons/misc/arrow_up.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ARROW_DOWN("arrow_down", "/icons/misc/arrow_down.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ARROW_LEFT("arrow_left", "/icons/misc/arrow_left.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ARROW_LEFT_ALL("arrow_left_all", "/icons/misc/arrow_left_all.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ARROW_RIGHT("arrow_right", "/icons/misc/arrow_right.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ARROW_RIGHT_ALL("arrow_right_all", "/icons/misc/arrow_right_all.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ARROW_RESET("arrow_reset", "/icons/misc/arrow_reset.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SORT_INCREASE("sort_increase", "/icons/misc/sort_increase.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SORT_DECREASE("sort_decrease", "/icons/misc/sort_decrease.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SORT_UNKNOWN("sort_unknown", "/icons/misc/sort_unknown.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    FRAME_QUERY("frame_query", "/icons/misc/frame_query.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    FILTER("filter", "/icons/misc/filter.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    FILTER_APPLY("filter_apply", "/icons/misc/filter_apply.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    FILTER_RESET("filter_reset", "/icons/misc/filter_reset.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    EVENT("event", "/icons/misc/event.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    HOME("home", "/icons/misc/home.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    COMPILE("compile", "/icons/misc/compile.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    COMPILE_LOG("compile_log", "/icons/misc/compile_log.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    SAVE("save", "/icons/file/save.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SAVE_ALL("save_all", "/icons/file/save_all.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SAVE_AS("save_as", "/icons/file/save_as.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    LOAD("load", "/icons/file/load.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    RESET("reset", "/icons/file/reset.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    COMPARE("compare", "/icons/file/compare.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ACCEPT("accept", "/icons/sql/accept.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    REJECT("reject", "/icons/sql/cancel.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    REVERT("revert", "/icons/sql/revert.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    IMPORT("import", "/icons/file/import.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    EXPORT("export", "/icons/file/export.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    REFRESH("refresh", "/icons/refresh.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CONFIRM("confirm", "/icons/misc/confirm.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CLOSE("close", "/icons/misc/close.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    JAR("jar", "/icons/misc/jar.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SOURCES("sources", "/icons/misc/sources.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CANCEL("cancel", "/icons/misc/cancel.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    ROW_ADD("row_add", "/icons/sql/row_add.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ROW_COPY("row_copy", "/icons/sql/row_copy.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ROW_EDIT("row_edit", "/icons/sql/row_edit.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    ROW_DELETE("row_delete", "/icons/sql/row_delete.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    EDIT_DATABASE("edit_database", "/icons/misc/edit_database.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    EDIT_TABLE("edit_table", "/icons/misc/edit_table.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    EDIT_COLUMN("edit_column", "/icons/misc/edit_column.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    CONFIG_TABLE("edit_table", "/icons/misc/config_table.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    LOCKED("locked", "/icons/misc/locked.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    TYPE_BOOLEAN("boolean", "/icons/sql/types/boolean.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_NUMBER("number", "/icons/sql/types/number.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_STRING("string", "/icons/sql/types/string.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_DATETIME("datetime", "/icons/sql/types/datetime.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_BINARY("binary", "/icons/sql/types/binary.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_TEXT("text", "/icons/sql/types/text.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_XML("xml", "/icons/sql/types/xml.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_LOB("lob", "/icons/sql/types/lob.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_ARRAY("array", "/icons/sql/types/array.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_STRUCT("struct", "/icons/sql/types/struct.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_DOCUMENT("document", "/icons/sql/types/document.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_OBJECT("object", "/icons/sql/types/object.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_IMAGE("image", "/icons/sql/types/image.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_REFERENCE("reference", "/icons/sql/types/reference.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_ROWID("rowid", "/icons/sql/types/rowid.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_ANY("any", "/icons/sql/types/any.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_UUID("uuid", "/icons/sql/types/uuid.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    TYPE_UNKNOWN("unknown", "/icons/sql/types/unknown.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    SQL_CONNECT("sql_connect", "/icons/sql/connect.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SQL_DISCONNECT("sql_disconnect", "/icons/sql/disconnect.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SQL_SCRIPT("sql_script", "/icons/sql/sql_script.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SQL_EXECUTE("sql_exec", "/icons/sql/sql_exec.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SQL_SCRIPT_EXECUTE("sql_script_exec", "/icons/sql/sql_script_exec.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SQL_ANALYSE("sql_analyse", "/icons/sql/sql_analyse.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SQL_EXPLAIN_PLAN("sql_explain", "/icons/sql/sql_plan.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SQL_VALIDATE("sql_validate", "/icons/sql/sql_validate.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SQL_PREVIEW("sql_preview", "/icons/sql/sql_preview.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SQL_TEXT("sql_text", "/icons/sql/sql_text.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    SAVE_TO_DATABASE("save_to_db", "/icons/sql/save_to_database.png"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    OVER_SUCCESS("over_success", "/icons/over/success_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    OVER_FAILED("over_failed", "/icons/over/failed_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    OVER_ERROR("over_error", "/icons/over/error_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    OVER_UNKNOWN("over_condition", "/icons/over/conditional_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    OVER_LAMP("over_lamp", "/icons/over/lamp_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    OVER_KEY("over_key", "/icons/over/key_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    OVER_LOCK("over_lock", "/icons/over/lock_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    OVER_EXTERNAL("over_external", "/icons/over/external_ovr.png"), //$NON-NLS-1$ //$NON-NLS-2$
-    OVER_REFERENCE("over_reference", "/icons/over/reference_ovr.png"); //$NON-NLS-1$ //$NON-NLS-2$
-
-    private final String token;
-    private final String path;
-
-    DBIcon(String token, String path)
-    {
-        this.token = token;
-        this.path = path;
-    }
-
-    /**
-     * Token is icon id. It can be used to refer on icons in plugin extensions
-     * @return unique token
-     */
-    public String getToken()
-    {
-        return token;
-    }
-
-    public String getPath()
-    {
-        return path;
-    }
-
-    public Image getImage()
-    {
-        return DBeaverIcons.getImage(this);
-    }
-
-    public ImageDescriptor getImageDescriptor()
-    {
-        return DBeaverIcons.getImageDescriptor(this);
-    }
-
-}

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverIcons.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/DBeaverIcons.java

@@ -16,12 +16,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package org.jkiss.dbeaver.core;
+package org.jkiss.dbeaver.ui;
 
-import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.core.Log;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.osgi.framework.Bundle;
 
 import java.io.IOException;
@@ -34,6 +34,8 @@ import java.util.Map;
  */
 public class DBeaverIcons
 {
+    static final Log log = Log.getLog(DBeaverIcons.class);
+
     private static class IconDescriptor {
         DBIcon id;
         ImageDescriptor imageDescriptor;
@@ -42,23 +44,22 @@ public class DBeaverIcons
 
     private static Map<String, IconDescriptor> iconMap = new HashMap<String, IconDescriptor>();
 
-    static void initRegistry(Bundle coreBundle)
+    public static void initRegistry()
     {
         for (DBIcon icon : DBIcon.values()) {
-            URL iconPath = coreBundle.getEntry(icon.getPath());
-            if (iconPath != null) {
-                try {
-                    iconPath = FileLocator.toFileURL(iconPath);
-                }
-                catch (IOException ex) {
-                    continue;
-                }
-                ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(iconPath);
+            try {
+                ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(new URL(icon.getLocation()));
                 IconDescriptor iconDescriptor = new IconDescriptor();
                 iconDescriptor.id = icon;
                 iconDescriptor.imageDescriptor = imageDescriptor;
-                iconDescriptor.image = imageDescriptor.createImage();
+                iconDescriptor.image = imageDescriptor.createImage(false);
+                if (iconDescriptor.image == null) {
+                    log.warn("Bad image '" + icon.getToken() + "' location: " + icon.getLocation());
+                    continue;
+                }
                 iconMap.put(icon.getToken(), iconDescriptor);
+            } catch (IOException e) {
+                log.error(e);
             }
         }
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/ImageUtils.java

@@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.DBeaverUI;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * Image-related utils

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/TrayIconHandler.java

@@ -17,18 +17,18 @@
  */
 package org.jkiss.dbeaver.ui;
 
-import org.jkiss.dbeaver.core.Log;
 import org.eclipse.core.runtime.IStatus;
-import org.jkiss.dbeaver.core.DBeaverActivator;
 import org.jkiss.dbeaver.core.DBeaverCore;
-import org.osgi.framework.Bundle;
+import org.jkiss.dbeaver.core.Log;
+import org.jkiss.dbeaver.model.DBIcon;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.net.URL;
+import java.io.File;
+import java.io.IOException;
 
 /**
  * Tray icon handler
@@ -45,10 +45,15 @@ public class TrayIconHandler {
         if (trayItem != null) {
             return;
         }
-        Bundle coreBundle = DBeaverActivator.getInstance().getBundle();
 
-        URL logoURL = coreBundle.getEntry(DBIcon.DBEAVER_LOGO.getPath());
-        trayItem = new TrayIcon(Toolkit.getDefaultToolkit().getImage(logoURL));
+        File logoFile;
+        try {
+            logoFile = DBIcon.DBEAVER_LOGO.getFile();
+        } catch (IOException e) {
+            log.error(e);
+            return;
+        }
+        trayItem = new TrayIcon(Toolkit.getDefaultToolkit().getImage(logoFile.getAbsolutePath()));
         trayItem.setImageAutoSize(true);
         trayItem.addActionListener(new ActionListener() {
             @Override

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/common/ContextSearchAction.java

@@ -21,7 +21,7 @@ package org.jkiss.dbeaver.ui.actions.common;
 import org.eclipse.jface.action.Action;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.ui.ISearchContextProvider;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * Context search action

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/datasource/DataSourceAutoCommitHandler.java

@@ -29,7 +29,7 @@ import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.model.exec.DBCTransactionManager;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.actions.DataSourceHandler;
 
 import java.util.Map;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectBase.java

@@ -42,7 +42,7 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectReference;
 import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.SimpleCommandContext;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.folders.IFolderContainer;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectDelete.java

@@ -47,7 +47,7 @@ import org.jkiss.dbeaver.model.edit.DBEObjectMaker;
 import org.jkiss.dbeaver.model.navigator.*;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.NavigatorUtils;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ClientHomesPanel.java

@@ -36,7 +36,7 @@ import org.jkiss.dbeaver.model.DBPClientHome;
 import org.jkiss.dbeaver.model.DBPClientManager;
 import org.jkiss.dbeaver.model.DBPDriver;
 import org.jkiss.dbeaver.registry.DriverDescriptor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/DriverTreeViewer.java

@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.TreeColumn;
 import org.jkiss.dbeaver.registry.DataSourceProviderDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
 import org.jkiss.dbeaver.registry.DriverDescriptor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/PairListControl.java

@@ -25,7 +25,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 
 import java.util.ArrayList;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/ProgressPageControl.java

@@ -44,7 +44,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.runtime.ProxyProgressMonitor;
 import org.jkiss.dbeaver.runtime.load.ILoadVisualizer;
 import org.jkiss.dbeaver.ui.ActionUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/imageview/ImageViewer.java

@@ -27,7 +27,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.jkiss.dbeaver.core.CoreMessages;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 import java.io.InputStream;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/itemlist/ItemListControl.java

@@ -34,7 +34,7 @@ import org.jkiss.dbeaver.registry.tree.DBXTreeNode;
 import org.jkiss.dbeaver.runtime.load.DatabaseLoadService;
 import org.jkiss.dbeaver.runtime.load.LoadingUtils;
 import org.jkiss.dbeaver.runtime.load.jobs.LoadingJob;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.NavigatorUtils;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerConfigureFilter;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridCellRenderer.java

@@ -21,7 +21,7 @@ package org.jkiss.dbeaver.ui.controls.lightgrid;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.*;
 import org.jkiss.dbeaver.core.DBeaverUI;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.utils.TextUtils;
 import org.jkiss.dbeaver.ui.UIUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridColumnRenderer.java

@@ -21,7 +21,7 @@ package org.jkiss.dbeaver.ui.controls.lightgrid;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.*;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.utils.TextUtils;
 
 /**

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridRowRenderer.java

@@ -19,7 +19,7 @@ package org.jkiss.dbeaver.ui.controls.lightgrid;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.*;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.utils.TextUtils;
 
 /**

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/FilterSettingsDialog.java

@@ -35,7 +35,7 @@ import org.jkiss.dbeaver.model.data.DBDAttributeConstraint;
 import org.jkiss.dbeaver.model.data.DBDDataFilter;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.model.sql.SQLUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.IHelpContextIds;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.CustomTableEditor;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetDataPumpJob.java

@@ -19,7 +19,6 @@
 package org.jkiss.dbeaver.ui.controls.resultset;
 
 import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Control;
 import org.jkiss.dbeaver.core.Log;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -49,7 +48,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.runtime.ProxyProgressMonitor;
 import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.utils.CommonUtils;
 
 class ResultSetDataPumpJob extends DataSourceJob {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetPersister.java

@@ -34,7 +34,7 @@ import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.dbeaver.model.struct.rdb.DBSManipulationType;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java

@@ -53,6 +53,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.core.Log;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.model.DBPContextProvider;
 import org.jkiss.dbeaver.model.DBPDataKind;
 import org.jkiss.dbeaver.model.DBUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/ViewValuePanel.java

@@ -36,7 +36,7 @@ import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.data.DBDValueController;
 import org.jkiss.dbeaver.model.data.DBDValueEditor;
 import org.jkiss.dbeaver.model.exec.DBCException;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 
 /**

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditShellCommandsDialog.java

@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.IHelpContextIds;
 import org.jkiss.dbeaver.ui.dialogs.HelpEnabledDialog;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditShellCommandsDialogPage.java

@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.DBPConnectionEventType;
 import org.jkiss.dbeaver.model.runtime.DBRShellCommand;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.runtime.jobs.EventProcessorJob;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dialogs.ActiveWizardPage;
 import org.jkiss.utils.ArrayUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/TextViewDialog.java

@@ -40,7 +40,7 @@ import org.jkiss.dbeaver.model.data.DBDValueController;
 import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose;
 import org.jkiss.dbeaver.model.exec.DBCSession;
 import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.editors.binary.BinaryContent;
 import org.jkiss.dbeaver.ui.editors.binary.HexEditControl;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/data/ValueViewDialog.java

@@ -43,7 +43,6 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.DBeaverUI;
-import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.data.*;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
@@ -55,7 +54,7 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerObjectOpen;
 import org.jkiss.dbeaver.ui.controls.ColumnInfoPanel;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java

@@ -46,7 +46,7 @@ import org.jkiss.dbeaver.registry.DataSourceProviderDescriptor;
 import org.jkiss.dbeaver.registry.DriverDescriptor;
 import org.jkiss.dbeaver.registry.DriverFileDescriptor;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.IHelpContextIds;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.ClientHomesPanel;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverManagerDialog.java

@@ -44,7 +44,7 @@ import org.jkiss.dbeaver.registry.DataSourceProviderDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
 import org.jkiss.dbeaver.registry.DriverDescriptor;
 import org.jkiss.dbeaver.runtime.DefaultProgressMonitor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.IHelpContextIds;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.DriverTreeControl;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/net/SSHTunnelConfiguratorUI.java

@@ -27,7 +27,7 @@ import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.ui.IObjectPropertyConfigurator;
 import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
 import org.jkiss.dbeaver.model.impl.net.SSHConstants;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/sql/GenerateMultiSQLDialog.java

@@ -37,7 +37,7 @@ import org.jkiss.dbeaver.model.exec.*;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 
 import java.util.*;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/ProjectFileEditorInput.java

@@ -27,7 +27,7 @@ import org.eclipse.ui.IPathEditorInput;
 import org.eclipse.ui.IPersistableElement;
 import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.model.WorkbenchAdapter;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * ProjectFileEditorInput

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/StringEditorInput.java

@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditorContributor.java

@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.*;
 import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
 import org.eclipse.ui.texteditor.BasicTextEditorActionContributor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.utils.ContentUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/ContentEditorInput.java

@@ -36,7 +36,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.model.impl.TemporaryContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.utils.ContentUtils;
 
 import java.io.*;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/parts/ContentBinaryEditorPart.java

@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IEditorActionBarContributor;
 import org.eclipse.ui.IEditorPart;
 import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.editors.binary.BinaryEditor;
 import org.jkiss.dbeaver.ui.editors.content.ContentEditorPart;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/parts/ContentImageEditorPart.java

@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.*;
 import org.eclipse.ui.part.EditorPart;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.controls.imageview.ImageEditor;
 import org.jkiss.dbeaver.ui.editors.content.ContentEditorPart;
 import org.jkiss.dbeaver.utils.ContentUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/parts/ContentTextEditorPart.java

@@ -22,7 +22,7 @@ import org.eclipse.ui.IEditorActionBarContributor;
 import org.eclipse.ui.IEditorPart;
 import org.jkiss.dbeaver.model.DBPContextProvider;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.editors.content.ContentEditorPart;
 import org.jkiss.dbeaver.ui.editors.text.BaseTextEditor;
 import org.jkiss.dbeaver.ui.editors.text.FileRefDocumentProvider;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/content/parts/ContentXMLEditorPart.java

@@ -23,7 +23,7 @@ import org.eclipse.ui.IEditorPart;
 import org.jkiss.dbeaver.DBeaverPreferences;
 import org.jkiss.dbeaver.model.DBPContextProvider;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.editors.content.ContentEditorPart;
 import org.jkiss.dbeaver.ui.editors.xml.XMLEditor;
 import org.jkiss.dbeaver.utils.MimeTypes;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditor.java

@@ -58,7 +58,7 @@ import org.jkiss.dbeaver.model.struct.DBSObjectStateful;
 import org.jkiss.dbeaver.registry.editor.EntityEditorDescriptor;
 import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry;
 import org.jkiss.dbeaver.runtime.DefaultProgressMonitor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.IHelpContextIds;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerObjectOpen;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/EntityEditorContributor.java

@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.registry.editor.EntityEditorsRegistry;
 import org.jkiss.dbeaver.ui.ActionUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.ISearchContextProvider;
 import org.jkiss.dbeaver.ui.actions.common.ContextSearchAction;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java

@@ -30,6 +30,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.core.Log;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.*;
 import org.jkiss.dbeaver.ui.editors.IDatabaseEditor;
 import org.jkiss.dbeaver.ui.editors.IDatabaseEditorContributorUser;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorNested.java

@@ -50,7 +50,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.ui.ActionUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.ICommandIds;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.ObjectCompilerLogViewer;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/generator/GenerateSQLContributor.java

@@ -51,7 +51,7 @@ import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
 import org.jkiss.dbeaver.model.struct.rdb.DBSTable;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.resultset.IResultSetController;
 import org.jkiss.dbeaver.ui.controls.resultset.IResultSetSelection;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLHyperlinkDetector.java

@@ -33,7 +33,7 @@ import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.editors.entity.EntityHyperlink;
 import org.jkiss.dbeaver.ui.editors.sql.SQLEditorBase;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/templates/SQLTemplatesPage.java

@@ -36,7 +36,7 @@ import org.eclipse.ui.texteditor.templates.AbstractTemplatesPage;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.registry.DriverDescriptor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.ProxyPageSite;
 import org.jkiss.dbeaver.ui.editors.sql.SQLEditorBase;
 import org.jkiss.dbeaver.ui.editors.sql.SQLEditorSourceViewer;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/text/ScriptPositionColumn.java

@@ -31,7 +31,7 @@ import org.eclipse.ui.progress.UIJob;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.rulers.IContributedRulerColumn;
 import org.eclipse.ui.texteditor.rulers.RulerColumnDescriptor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/perspective/DataSourceManagementToolbar.java

@@ -61,7 +61,7 @@ import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.dbeaver.runtime.jobs.DataSourceJob;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.IActionConstants;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.CImageCombo;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/resources/ScriptsHandlerImpl.java

@@ -31,7 +31,7 @@ import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.navigator.DBNResource;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.editors.sql.SQLEditor;
 import org.jkiss.dbeaver.ui.editors.sql.SQLEditorInput;
 import org.jkiss.dbeaver.utils.ContentUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/resources/bookmarks/DBNBookmarkFolder.java

@@ -27,7 +27,7 @@ import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.navigator.DBNResource;
 import org.jkiss.dbeaver.model.project.DBPResourceHandler;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 import java.util.Collection;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/BaseBrowserView.java

@@ -30,7 +30,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.*;
 import org.eclipse.ui.part.ViewPart;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 
 /**

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/load/TreeLoadNode.java

@@ -20,9 +20,9 @@ package org.jkiss.dbeaver.ui.views.navigator.database.load;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.swt.graphics.Image;
-import org.jkiss.dbeaver.core.DBeaverIcons;
+import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 import java.util.HashMap;
 import java.util.Map;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/plan/ExplainPlanViewer.java

@@ -42,7 +42,7 @@ import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.model.exec.plan.DBCQueryPlanner;
 import org.jkiss.dbeaver.ui.ActionUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.ICommandIds;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.properties.PropertyCollector;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/session/SessionManagerViewer.java

@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IWorkbenchPart;
 import org.jkiss.dbeaver.model.admin.sessions.DBAServerSession;
 import org.jkiss.dbeaver.model.admin.sessions.DBAServerSessionManager;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.properties.PropertyCollector;
 import org.jkiss.dbeaver.ui.properties.PropertyTreeViewer;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/utils/ContentUtils.java

@@ -42,7 +42,7 @@ import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.impl.ExternalContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dialogs.data.TextViewDialog;
 import org.jkiss.dbeaver.ui.editors.content.ContentEditor;

plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/editors/DB2ObjectType.java

@@ -46,7 +46,7 @@ import org.jkiss.dbeaver.ext.db2.model.module.DB2Module;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectType;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 import java.util.HashMap;
 import java.util.Map;

plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/app/DB2ServerApplicationEditor.java

@@ -28,7 +28,7 @@ import org.jkiss.dbeaver.ext.db2.DB2Messages;
 import org.jkiss.dbeaver.ext.db2.model.DB2DataSource;
 import org.jkiss.dbeaver.model.admin.sessions.DBAServerSession;
 import org.jkiss.dbeaver.model.admin.sessions.DBAServerSessionManager;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.editors.SinglePageDatabaseEditor;
 import org.jkiss.dbeaver.ui.views.session.SessionManagerViewer;

plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/dict/DB2TableStatus.java

@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.ext.db2.model.dict;
 
 import org.jkiss.dbeaver.model.DBPNamedObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectState;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * DB2 Table Status

plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/model/dict/DB2ViewStatus.java

@@ -20,7 +20,7 @@ package org.jkiss.dbeaver.ext.db2.model.dict;
 
 import org.jkiss.dbeaver.model.DBPNamedObject;
 import org.jkiss.dbeaver.model.struct.DBSObjectState;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * DB2 View Status

plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/action/DiagramRefreshAction.java

@@ -22,7 +22,7 @@ package org.jkiss.dbeaver.ext.erd.action;
 
 import org.eclipse.jface.action.Action;
 import org.jkiss.dbeaver.ext.erd.editor.ERDEditorPart;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * Action to toggle the layout between manual and automatic

plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java

@@ -81,7 +81,7 @@ import org.jkiss.dbeaver.model.DBPNamedObject;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.dbeaver.runtime.load.jobs.LoadingJob;
 import org.jkiss.dbeaver.ui.ActionUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.ImageUtils;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.controls.ProgressPageControl;

plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDGraphicalViewer.java

@@ -52,7 +52,7 @@ import org.jkiss.dbeaver.model.DBPEventListener;
 import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
 import org.jkiss.dbeaver.model.struct.DBSEntity;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 
 import java.util.*;

plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntityAttribute.java

@@ -23,7 +23,7 @@ package org.jkiss.dbeaver.ext.erd.model;
 import org.eclipse.swt.graphics.Image;
 import org.jkiss.dbeaver.model.DBPImageProvider;
 import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 
 /**
  * Column entry in model Table

plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/part/AssociationPart.java

@@ -41,7 +41,7 @@ import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
 import org.jkiss.dbeaver.model.struct.DBSEntityConstraintType;
 import org.jkiss.dbeaver.model.struct.DBSEntityReferrer;
 import org.jkiss.dbeaver.runtime.VoidProgressMonitor;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.*;

plugins/org.jkiss.dbeaver.import-config/src/org/jkiss/dbeaver/ext/import_config/wizards/ConfigImportWizardPage.java

@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/editors/MySQLSessionEditor.java

@@ -26,15 +26,13 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
-import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.ui.editors.IDatabaseEditorInput;
 import org.jkiss.dbeaver.ext.mysql.MySQLMessages;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLDataSource;
 import org.jkiss.dbeaver.ext.mysql.model.session.MySQLSessionManager;
-import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.admin.sessions.DBAServerSession;
 import org.jkiss.dbeaver.model.admin.sessions.DBAServerSessionManager;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.editors.SinglePageDatabaseEditor;
 import org.jkiss.dbeaver.ui.views.session.SessionManagerViewer;

plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/editors/MySQLUserEditorPrivileges.java

@@ -36,7 +36,7 @@ import org.jkiss.dbeaver.ext.mysql.model.*;
 import org.jkiss.dbeaver.model.edit.DBECommandReflector;
 import org.jkiss.dbeaver.runtime.load.DatabaseLoadService;
 import org.jkiss.dbeaver.runtime.load.LoadingUtils;
-import org.jkiss.dbeaver.ui.DBIcon;
+import org.jkiss.dbeaver.model.DBIcon;
 import org.jkiss.dbeaver.ui.UIUtils;
 
 import java.lang.reflect.InvocationTargetException;