refresh

5 files changed, 23 insertions, 10 deletions

diff --git a/org.eclipse.ui.intro/icons/blank.gif b/org.eclipse.ui.intro/icons/blank.gif
new file mode 100644
index 000000000..1d11fa9ad
--- /dev/null
+++ b/org.eclipse.ui.intro/icons/blank.gif
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroPartImplementation.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroPartImplementation.java
index 87f43c922..0879efcb0 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroPartImplementation.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroPartImplementation.java
@@ -244,7 +244,7 @@ public abstract class AbstractIntroPartImplementation {
      * 
      * @param standby
      */
-    protected void standbyStateChanged(boolean standby) {
+    public void standbyStateChanged(boolean standby) {
         // do nothing.
     }
 
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java
index 79fd6ceee..9789ccc68 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java
@@ -310,7 +310,7 @@ public class BrowserIntroPartImplementation extends
         updateNavigationActionsState();
     }
 
-    protected void standbyStateChanged(boolean standby) {
+    public void standbyStateChanged(boolean standby) {
         if (standby) {
             homeAction.setEnabled(false);
             forwardAction.setEnabled(false);
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java
index ccc62faa2..369b5a854 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java
@@ -22,6 +22,7 @@ import org.eclipse.ui.internal.intro.impl.*;
 import org.eclipse.ui.internal.intro.impl.model.*;
 import org.eclipse.ui.internal.intro.impl.swt.*;
 import org.eclipse.ui.internal.intro.impl.util.*;
+import org.eclipse.ui.intro.config.*;
 
 /**
  * This is a UI Forms based implementation of an Intro Part Presentation.
@@ -66,9 +67,14 @@ public class FormIntroPartImplementation extends
                     navigateBackward();
                     if (isURL(getCurrentLocation()))
                         Util.openBrowser(getCurrentLocation());
-                    else
+                    else {
                         // Set current page, and this will triger regen.
+                        CustomizableIntroPart currentIntroPart = (CustomizableIntroPart) IntroPlugin
+                                .getIntro();
+                        currentIntroPart.getControl().setRedraw(false);
                         getModelRoot().setCurrentPageId(getCurrentLocation());
+                        currentIntroPart.getControl().setRedraw(true);
+                    }
                 }
             }
 
@@ -94,9 +100,14 @@ public class FormIntroPartImplementation extends
                     navigateForward();
                     if (isURL(getCurrentLocation()))
                         Util.openBrowser(getCurrentLocation());
-                    else
+                    else {
                         // Set current page, and this will triger regen.
+                        CustomizableIntroPart currentIntroPart = (CustomizableIntroPart) IntroPlugin
+                                .getIntro();
+                        currentIntroPart.getControl().setRedraw(false);
                         getModelRoot().setCurrentPageId(getCurrentLocation());
+                        currentIntroPart.getControl().setRedraw(true);
+                    }
                 }
             }
             updateNavigationActionsState();
@@ -117,8 +128,12 @@ public class FormIntroPartImplementation extends
         public void run() {
             IntroHomePage rootPage = getModelRoot().getHomePage();
             if (getModelRoot().isDynamic()) {
+                CustomizableIntroPart currentIntroPart = (CustomizableIntroPart) IntroPlugin
+                        .getIntro();
+                currentIntroPart.getControl().setRedraw(false);
                 getModelRoot().setCurrentPageId(rootPage.getId());
                 updateHistory(rootPage.getId());
+                currentIntroPart.getControl().setRedraw(true);
             }
         }
     };
@@ -276,14 +291,11 @@ public class FormIntroPartImplementation extends
                 // If page ID was not set properly. exit.
                 return;
 
-            // avoid flicker.
-            mainPageBook.setRedraw(false);
             // if we are showing a regular intro page, or if the Home Page has a
             // regular page layout, set the page id to the static PageForm id.
             if (!mainPageBook.hasPage(pageId))
                 pageId = PageForm.PAGE_FORM_ID;
             mainPageBook.showPage(pageId);
-            mainPageBook.setRedraw(true);
         }
     }
 
@@ -297,9 +309,12 @@ public class FormIntroPartImplementation extends
         toolBarManager.update(true);
         actionBars.updateActionBars();
         updateNavigationActionsState();
+
     }
 
-    protected void standbyStateChanged(boolean standby) {
+
+
+    public void standbyStateChanged(boolean standby) {
         if (standby) {
             homeAction.setEnabled(false);
             forwardAction.setEnabled(false);
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageForm.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageForm.java
index 7bccbc700..6d2490b74 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageForm.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageForm.java
@@ -202,9 +202,7 @@ public class PageForm implements IIntroConstants, IPropertyListener {
             categoryForm
                     .createPartControl(categoryPageBook, sharedStyleManager);
         }
-        categoryPageBook.setRedraw(false);
         categoryPageBook.showPage(pageID);
-        categoryPageBook.setRedraw(true);
 
         // Get cached page subtitle from control data.
         Composite page = (Composite) categoryPageBook.getCurrentPage();