Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDejan Gloszic2006-02-10 00:26:20 -0500
committerDejan Gloszic2006-02-10 00:26:20 -0500
commit658cc4a434e769a002dd852f8467cdc9eb1e35f0 (patch)
tree16dfebea8cef65909fdfcc6a28c9eec32a6eb14e
parent32aee92ff606e635ddfa0f0a5c08bbe3e437a3a9 (diff)
downloadeclipse.platform.ua-658cc4a434e769a002dd852f8467cdc9eb1e35f0.tar.gz
eclipse.platform.ua-658cc4a434e769a002dd852f8467cdc9eb1e35f0.tar.xz
eclipse.platform.ua-658cc4a434e769a002dd852f8467cdc9eb1e35f0.zip
*** empty log message ***
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/Messages.properties2
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/ISharedIntroConstants.java4
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/PageData.java2
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/SharedIntroConfigurer.java6
4 files changed, 8 insertions, 6 deletions
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/Messages.properties b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/Messages.properties
index b18694548..af2a49868 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/Messages.properties
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/Messages.properties
@@ -84,7 +84,7 @@ SharedIntroConfigurer_whatsnew_nav=What's New
SharedIntroConfigurer_migrate_nav=Migrate
SharedIntroConfigurer_webresources_nav=Web Resources
WelcomeCustomizationPreferencePage_left= Left:
-WelcomeCustomizationPreferencePage_up=
+WelcomeCustomizationPreferencePage_up= Move Up
WelcomeCustomizationPreferencePage_down=Move Down
WelcomeCustomizationPreferencePage_right= Right:
WelcomeCustomizationPreferencePage_bottom= Bottom:
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/ISharedIntroConstants.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/ISharedIntroConstants.java
index b21380713..c54732927 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/ISharedIntroConstants.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/ISharedIntroConstants.java
@@ -9,6 +9,7 @@ public interface ISharedIntroConstants {
String HIDDEN = "hidden"; //$NON-NLS-1$
String NEW = "new"; //$NON-NLS-1$
String DEFAULT_ANCHOR = "defaultAnchor"; //$NON-NLS-1$
+ String DEFAULT_CONTENT_PATH = "/page-content/bottom/"+DEFAULT_ANCHOR; //$NON-NLS-1$
// Page ids
String ID_ROOT = "root"; //$NON-NLS-1$
String ID_STANDBY = "standby"; //$NON-NLS-1$
@@ -27,9 +28,6 @@ public interface ISharedIntroConstants {
String DIV_LAYOUT_BOTTOM = "bottom"; //$NON-NLS-1$
String DIV_CUSTOMIZE = "customize"; //$NON-NLS-1$
- // Other ids
- String ID_FALLBACK_ANCHOR = "defaultAnchor"; //$NON-NLS-1$
-
// Product intro variables
String VAR_INTRO_BACKGROUND_IMAGE = "INTRO_BACKGROUND_IMAGE"; //$NON-NLS-1$
String VAR_INTRO_ROOT_PAGES = "INTRO_ROOT_PAGES"; //$NON-NLS-1$
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/PageData.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/PageData.java
index aa9035265..c365de38e 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/PageData.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/PageData.java
@@ -69,7 +69,7 @@ public class PageData {
}
// resolve as default
IPath resolvedPath = new Path(id).append(ddata.getPath());
- resolvedPath = resolvedPath.append(ISharedIntroConstants.ID_FALLBACK_ANCHOR);
+ resolvedPath = resolvedPath.append(ISharedIntroConstants.DEFAULT_ANCHOR);
return resolvedPath.toString();
}
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/SharedIntroConfigurer.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/SharedIntroConfigurer.java
index d19913679..85126f5c2 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/SharedIntroConfigurer.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/SharedIntroConfigurer.java
@@ -373,7 +373,7 @@ public class SharedIntroConfigurer extends IntroConfigurer implements ISharedInt
}
// Add the fallback anchor
IntroElement fallback = new IntroElement("anchor"); //$NON-NLS-1$
- fallback.setAttribute("id", ID_FALLBACK_ANCHOR); //$NON-NLS-1$
+ fallback.setAttribute("id", DEFAULT_ANCHOR); //$NON-NLS-1$
result.add(fallback);
return (IntroElement[]) result.toArray(new IntroElement[result.size()]);
}
@@ -390,6 +390,10 @@ public class SharedIntroConfigurer extends IntroConfigurer implements ISharedInt
return pdata.resolvePath(extensionId);
}
}
+ else {
+ // use fallback anchor
+ return pageId+DEFAULT_CONTENT_PATH;
+ }
return null;
}
} \ No newline at end of file

Back to the top