ERD loading visualization

Hyperlinks resolve progress
Oracle localization fix

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectCache.java

@@ -82,6 +82,7 @@ public abstract class JDBCObjectCache<OWNER extends DBSObject, OBJECT extends DB
         try {
             JDBCStatement dbStat = prepareObjectsStatement(context, owner);
             try {
+                monitor.subTask("Execute query");
                 dbStat.setFetchSize(DBConstants.METADATA_FETCH_SIZE);
                 dbStat.executeStatement();
                 JDBCResultSet dbResult = dbStat.getResultSet();

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

@@ -97,7 +97,9 @@ public class EntityHyperlink implements IHyperlink
         } else {
             objectNode = node;
         }
-        NavigatorHandlerObjectOpen.openEntityEditor(objectNode, null, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+        if (objectNode != null) {
+            NavigatorHandlerObjectOpen.openEntityEditor(objectNode, null, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+        }
     }
 
     private class ObjectFinder implements DBRRunnableWithProgress {
@@ -107,11 +109,14 @@ public class EntityHyperlink implements IHyperlink
         @Override
         public void run(DBRProgressMonitor monitor) throws InvocationTargetException, InterruptedException
         {
+            monitor.beginTask("Resolve object " + reference.getName(), 1);
             try {
                 DBSObject object = reference.resolveObject(monitor);
                 node = DBNModel.getInstance().getNodeByObject(monitor, object, true);
             } catch (DBException e) {
                 throw new InvocationTargetException(e);
+            } finally {
+                monitor.done();
             }
         }
     }

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

@@ -54,13 +54,14 @@ public class ERDEditorContextMenuProvider extends ContextMenuProvider
 	@Override
     public void buildContextMenu(IMenuManager menu)
 	{
-		GEFActionConstants.addStandardActionGroups(menu);
+        if (editor.isLoaded()) {
+            GEFActionConstants.addStandardActionGroups(menu);
 
-        menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-
-        menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, new Separator());
-        menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, editor.createAttributeVisibilityMenu());
-        menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, new DiagramLayoutAction(editor));
+            menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 
+            menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, new Separator());
+            menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, editor.createAttributeVisibilityMenu());
+            menu.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, new DiagramLayoutAction(editor));
+        }
 	}
 }
\ No newline at end of file

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

@@ -54,10 +54,7 @@ import org.eclipse.swt.printing.PrintDialog;
 import org.eclipse.swt.printing.Printer;
 import org.eclipse.swt.printing.PrinterData;
 import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.*;
 import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.model.WorkbenchAdapter;
@@ -93,6 +90,7 @@ import org.jkiss.utils.CommonUtils;
 
 import java.io.FileOutputStream;
 import java.util.*;
+import java.util.List;
 
 /**
  * Editor implementation based on the the example editor skeleton that is built in <i>Building
@@ -841,6 +839,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
 
         public ProgressVisualizer<EntityDiagram> createLoadVisualizer()
         {
+            getGraphicalControl().setBackground(ColorConstants.lightGray);
             return new LoadVisualizer();
         }
 
@@ -939,10 +938,17 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
         }
 
         private class LoadVisualizer extends ProgressVisualizer<EntityDiagram> {
+            @Override
+            public void visualizeLoading()
+            {
+                super.visualizeLoading();
+            }
+
             @Override
             public void completeLoading(EntityDiagram entityDiagram)
             {
                 super.completeLoading(entityDiagram);
+                getGraphicalControl().setBackground(ColorConstants.white);
                 isLoaded = true;
                 Control control = getGraphicalViewer().getControl();
                 if (control == null || control.isDisposed()) {

plugins/org.jkiss.dbeaver.oracle/plugin.properties

@@ -313,7 +313,7 @@ meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.whenClause.name=When Claus
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.status.name=Status
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.description.name=Description
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.actionType.name=Action Type
-meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.objectState.name=Declaration
+meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.sourceDeclaration.name=Declaration
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTriggerColumn.name.name=Name
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTriggerColumn.tableColumn.name=Column
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleUser.id.name=ID
@@ -349,7 +349,7 @@ meta.org.jkiss.dbeaver.ext.oracle.model.OracleUserProfile$ProfileResource.limit.
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleView$AdditionalInfo.text.name=Definition
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleView$AdditionalInfo.superView.name=Super View
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleView.name.name=View Name
-meta.org.jkiss.dbeaver.ext.oracle.model.OracleView.additionalInfo.name=Declaration
+meta.org.jkiss.dbeaver.ext.oracle.model.OracleView.sourceDeclaration.name=Declaration
 meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.operation.name=Operation
 meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.operation.description=Name of the internal operation performed in this step
 meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.alias.name=Object

plugins/org.jkiss.dbeaver.oracle/plugin_ru.properties

@@ -290,7 +290,7 @@ meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.columnName.name=\u041A\u04
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.status.name=\u0421\u0442\u0430\u0442\u0443\u0441
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.description.name=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.actionType.name=\u0422\u0438\u043F \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044F
-meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.objectState.name=\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435
+meta.org.jkiss.dbeaver.ext.oracle.model.OracleTrigger.sourceDeclaration.name=\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTriggerColumn.name.name=\u0418\u043C\u044F
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTriggerColumn.tableColumn.name=\u041A\u043E\u043B\u043E\u043D\u043A\u0430
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleUser.id.description=\u041D\u043E\u043C\u0435\u0440 \u0438\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u0430 \u043F\u043E\u043B\u044C\u0437-\u043B\u044F
@@ -324,7 +324,7 @@ meta.org.jkiss.dbeaver.ext.oracle.model.OracleUserProfile$ProfileResource.limit.
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleUserProfile$ProfileResource.limit.description=\u041E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435, \u043D\u0430\u043B\u043E\u0436\u0435\u043D\u043D\u043E\u0435 \u043D\u0430 \u044D\u0442\u043E\u0442 \u0440\u0435\u0441\u0443\u0440\u0441 \u0434\u043B\u044F \u0434\u0430\u043D\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0444\u0438\u043B\u044F
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleView$AdditionalInfo.text.name=\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleView.name.name=\u0418\u043C\u044F \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u044F
-meta.org.jkiss.dbeaver.ext.oracle.model.OracleView.additionalInfo.name=\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435
+meta.org.jkiss.dbeaver.ext.oracle.model.OracleView.sourceDeclaration.name=\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u0435
 meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableForeignKey.deleteRule.name=\u041F\u0440\u0438 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u0438
 meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.operation.name=\u041E\u043F\u0435\u0440\u0430\u0446\u0438\u044F
 meta.org.jkiss.dbeaver.ext.oracle.model.plan.OraclePlanNode.operation.description=\u0418\u043C\u044F \u0432\u043D\u0443\u0442\u0440\u0435\u043D\u043D\u0435\u0439 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0438, \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u043C\u043E\u0439 \u043D\u0430 \u044D\u0442\u043E\u043C \u0448\u0430\u0433\u0435