Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2007-12-21 22:47:11 +0000
committerChris Goldthorpe2007-12-21 22:47:11 +0000
commit00399d5c929c1cd90ce68abd9bf32d89c8357b4a (patch)
treec55f8275c69baf7c848025aac765738d45897f48 /org.eclipse.ua.tests/intro/org
parentf38ec972ca65d4376fd46947d8e1047ee8156549 (diff)
downloadeclipse.platform.ua-00399d5c929c1cd90ce68abd9bf32d89c8357b4a.tar.gz
eclipse.platform.ua-00399d5c929c1cd90ce68abd9bf32d89c8357b4a.tar.xz
eclipse.platform.ua-00399d5c929c1cd90ce68abd9bf32d89c8357b4a.zip
Bug 211636 – [Intro] Allow product to have full control of Universal Intro root
Diffstat (limited to 'org.eclipse.ua.tests/intro/org')
-rw-r--r--org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/anchors/ExtensionReorderingTest.java4
-rw-r--r--org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializer.java7
-rw-r--r--org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java2
3 files changed, 8 insertions, 5 deletions
diff --git a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/anchors/ExtensionReorderingTest.java b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/anchors/ExtensionReorderingTest.java
index 558c85c9e..2996006f6 100644
--- a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/anchors/ExtensionReorderingTest.java
+++ b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/anchors/ExtensionReorderingTest.java
@@ -27,7 +27,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.internal.intro.impl.model.AbstractIntroElement;
-import org.eclipse.ui.internal.intro.impl.model.IntroHomePage;
+import org.eclipse.ui.internal.intro.impl.model.AbstractIntroPage;
import org.eclipse.ui.internal.intro.impl.model.IntroModelRoot;
import org.eclipse.ui.internal.intro.impl.model.IntroPage;
import org.eclipse.ui.internal.intro.impl.model.loader.ModelLoaderUtil;
@@ -191,7 +191,7 @@ public class ExtensionReorderingTest extends TestCase {
private void checkModel(IntroModelRoot model, int elements) {
assertTrue(model.hasValidConfig());
Object[] pages = model.getChildrenOfType(AbstractIntroElement.ABSTRACT_PAGE);
- IntroHomePage root = (IntroHomePage) model.findChild("root");
+ AbstractIntroPage root = (AbstractIntroPage) model.findChild("root");
assertEquals(elements + 2, pages.length);
IntroPage extn1 = (IntroPage) model.findChild("page1");
assertNotNull(extn1);
diff --git a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializer.java b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializer.java
index fa25b1236..557022e12 100644
--- a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializer.java
+++ b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializer.java
@@ -41,7 +41,7 @@ public class IntroModelSerializer {
printModelRootInfo(root, buffer);
// Root Page
- IntroHomePage rootPage = root.getHomePage();
+ IntroHomePage rootPage = root.getRootPage();
printHomePage(rootPage, buffer);
printPageChildren(rootPage, buffer);
@@ -89,7 +89,7 @@ public class IntroModelSerializer {
* @param text
* @param root
*/
- private void printHomePage(IntroHomePage rootPage, StringBuffer text) {
+ private void printHomePage(AbstractIntroPage rootPage, StringBuffer text) {
text.append("\n\nHOME PAGE: "); //$NON-NLS-1$
text.append("\n--------------"); //$NON-NLS-1$
text
@@ -291,6 +291,9 @@ public class IntroModelSerializer {
return;
}
IntroPage firstPage = model.getPages()[0];
+ if ("standby".equals(firstPage.getId())) {
+ firstPage = model.getPages()[1];
+ }
text.append("\n\t\tFirst page children are: "); //$NON-NLS-1$
text
.append("\n\t\t\tGroups: " //$NON-NLS-1$
diff --git a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java
index a8264c6a0..9860c211b 100644
--- a/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java
+++ b/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializerTest.java
@@ -124,7 +124,7 @@ public class IntroModelSerializerTest extends TestCase {
public static Map getXHTMLFiles(IntroModelRoot model) {
Map map = new HashMap();
Collection pages = new ArrayList();
- IntroHomePage home = model.getHomePage();
+ IntroHomePage home = model.getRootPage();
if (home.isXHTMLPage()) {
pages.add(home);
}

Back to the top