Progress loading icons fix

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/load/TreeNodeChildrenLoading.java

@@ -32,15 +32,20 @@ public class TreeNodeChildrenLoading extends TreeNodeSpecial {
 
     public static final Object LOADING_FAMILY = new Object();
 
-    private static Image IMG_LOADING1 = DBeaverIcons.getImage(UIIcon.LOADING1);
-    private static Image IMG_LOADING2 = DBeaverIcons.getImage(UIIcon.LOADING2);
-    private static Image IMG_LOADING3 = DBeaverIcons.getImage(UIIcon.LOADING3);
-    private static Image IMG_LOADING4 = DBeaverIcons.getImage(UIIcon.LOADING4);
+    private static Image[] IMG_LOADING = new Image[] {
+        DBeaverIcons.getImage(UIIcon.LOADING1),
+        DBeaverIcons.getImage(UIIcon.LOADING2),
+        DBeaverIcons.getImage(UIIcon.LOADING3),
+        DBeaverIcons.getImage(UIIcon.LOADING4),
+        DBeaverIcons.getImage(UIIcon.LOADING5),
+        DBeaverIcons.getImage(UIIcon.LOADING6),
+        DBeaverIcons.getImage(UIIcon.LOADING7)
+    };
 
     private static String loadingText = "Loading";
-    private static String text1 = loadingText + "."; //$NON-NLS-1$;
+    private static String text1 = loadingText + ".."; //$NON-NLS-1$;
     private static String text2 = loadingText + ".."; //$NON-NLS-1$;
-    private static String text3 = loadingText + ".."; //$NON-NLS-1$;
+    private static String text3 = loadingText + "..."; //$NON-NLS-1$;
 
     private int viewCount = 0;
 
@@ -58,6 +63,8 @@ public class TreeNodeChildrenLoading extends TreeNodeSpecial {
 
     @Override
     public String getText(Object element) {
+        return text3;
+/*
         switch (viewCount % 4) {
             case 0:
                 return loadingText;
@@ -69,21 +76,13 @@ public class TreeNodeChildrenLoading extends TreeNodeSpecial {
             default:
                 return text3;
         }
+*/
     }
 
     @Override
     public Image getImage(Object element) {
-        switch (viewCount = (++viewCount % 4)) {
-            case 0:
-                return IMG_LOADING1;
-            case 1:
-                return IMG_LOADING2;
-            case 2:
-                return IMG_LOADING3;
-            case 3:
-            default:
-                return IMG_LOADING4;
-        }
+        int imgIndex = (++viewCount % IMG_LOADING.length);
+        return IMG_LOADING[imgIndex];
     }
 
     public void dispose(Object parent) {

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/LoadingJob.java

@@ -140,7 +140,7 @@ public class LoadingJob<RESULT>  extends AbstractJob {
 
     class LoadingUIJob<RESULT> extends AbstractUIJob {
 
-        private static final long DELAY = 200;
+        private static final long DELAY = 100;
 
         private ILoadVisualizer<RESULT> visualizer;
 

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIIcon.java

@@ -32,10 +32,13 @@ public class UIIcon {
     public static final DBIcon SEPARATOR_H = new DBIcon("separator_h", "misc/separator_h.png"); //$NON-NLS-1$ //$NON-NLS-2$
     public static final DBIcon DOTS_BUTTON = new DBIcon("dots_button", "misc/dots_button.png"); //$NON-NLS-1$ //$NON-NLS-2$
 
-    public static final DBIcon LOADING1 = new DBIcon("loading1", "animation/loading1.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-    public static final DBIcon LOADING2 = new DBIcon("loading2", "animation/loading2.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-    public static final DBIcon LOADING3 = new DBIcon("loading3", "animation/loading3.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-    public static final DBIcon LOADING4 = new DBIcon("loading4", "animation/loading4.gif"); //$NON-NLS-1$ //$NON-NLS-2$
+    public static final DBIcon LOADING1 = new DBIcon("loading1", "animation/loading01.png"); //$NON-NLS-1$ //$NON-NLS-2$
+    public static final DBIcon LOADING2 = new DBIcon("loading2", "animation/loading02.png"); //$NON-NLS-1$ //$NON-NLS-2$
+    public static final DBIcon LOADING3 = new DBIcon("loading3", "animation/loading03.png"); //$NON-NLS-1$ //$NON-NLS-2$
+    public static final DBIcon LOADING4 = new DBIcon("loading4", "animation/loading04.png"); //$NON-NLS-1$ //$NON-NLS-2$
+    public static final DBIcon LOADING5 = new DBIcon("loading5", "animation/loading05.png"); //$NON-NLS-1$ //$NON-NLS-2$
+    public static final DBIcon LOADING6 = new DBIcon("loading6", "animation/loading06.png"); //$NON-NLS-1$ //$NON-NLS-2$
+    public static final DBIcon LOADING7 = new DBIcon("loading7", "animation/loading07.png"); //$NON-NLS-1$ //$NON-NLS-2$
 
     public static final DBIcon PROGRESS0 = new DBIcon("progress0", "animation/progress_0.gif"); //$NON-NLS-1$ //$NON-NLS-2$
     public static final DBIcon PROGRESS1 = new DBIcon("progress1", "animation/progress_1.gif"); //$NON-NLS-1$ //$NON-NLS-2$