70936 Accessibility: "Hot keys" to jump between important frames in help systemr301_v20040809

3 files changed, 18 insertions, 6 deletions

diff --git a/org.eclipse.help.webapp/advanced/tabs.jsp b/org.eclipse.help.webapp/advanced/tabs.jsp
index dd48160fd..9f8035916 100644
--- a/org.eclipse.help.webapp/advanced/tabs.jsp
+++ b/org.eclipse.help.webapp/advanced/tabs.jsp
@@ -274,7 +274,8 @@ function getPreviousLink(currentLink){
 	         onclick='this.blur();return false;' 
 	         onmouseover="window.status='<%=title%>';return true;" 
 	         onmouseout="window.status='';"
-	         id="link<%=views[i].getName()%>">
+	         id="link<%=views[i].getName()%>"
+	         <%=views[i].getKey()==View.NO_SHORTCUT?"":"ACCESSKEY=\""+views[i].getKey()+"\""%>>
 	         <img alt="<%=title%>" 
 	              title="<%=title%>" 
 	              src="<%=views[i].getOnImage()%>"
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java
index ef85dfa79..17473310c 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/LayoutData.java
@@ -77,10 +77,10 @@ public class LayoutData extends RequestData {
 
 		View tocview = new View("toc", //$NON-NLS-1$
 				"", //$NON-NLS-1$
-				preferences.getImagesDirectory() + "/contents_view.gif"); //$NON-NLS-1$
+				preferences.getImagesDirectory() + "/contents_view.gif", 'C'); //$NON-NLS-1$
 		View searchview = new View("search", //$NON-NLS-1$
 				"", //$NON-NLS-1$
-				preferences.getImagesDirectory() + "/search_results_view.gif"); //$NON-NLS-1$
+				preferences.getImagesDirectory() + "/search_results_view.gif", 'R'); //$NON-NLS-1$
 
 		View linksview = null;
 		View bookmarksview = null;
@@ -88,11 +88,11 @@ public class LayoutData extends RequestData {
 		if (preferences.isLinksView())
 			linksview = new View("links", //$NON-NLS-1$
 					"", //$NON-NLS-1$
-					preferences.getImagesDirectory() + "/links_view.gif"); //$NON-NLS-1$
+					preferences.getImagesDirectory() + "/links_view.gif", (char)0); //$NON-NLS-1$
 		if (preferences.isBookmarksView())
 			bookmarksview = new View("bookmarks", //$NON-NLS-1$
 					"", //$NON-NLS-1$
-					preferences.getImagesDirectory() + "/bookmarks_view.gif"); //$NON-NLS-1$
+					preferences.getImagesDirectory() + "/bookmarks_view.gif", (char)0); //$NON-NLS-1$
 
 		if (linksview != null && bookmarksview != null)
 			views = new View[]{tocview, searchview, linksview, bookmarksview};
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/View.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/View.java
index d88ce8b76..334104e27 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/View.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/View.java
@@ -11,14 +11,17 @@
 package org.eclipse.help.internal.webapp.data;
 
 public class View {
+    public static char NO_SHORTCUT = (char)0;
 	private String name;
 	private String url;
 	private String imageURL;
+	private char shortcut;
 
-	public View(String name, String url, String imageURL) {
+	public View(String name, String url, String imageURL, char shortcut) {
 		this.name = name;
 		this.url = url;
 		this.imageURL = imageURL;
+		this.shortcut = shortcut;
 	}
 
 	public String getName() {
@@ -47,4 +50,12 @@ public class View {
 	public String getOnImage() {
 		return getImage();
 	}
+	/**
+	 * Returns the image when selected
+	 * 
+	 * @return char or 0 if no shortcut
+	 */
+	public char getKey() {
+		return shortcut;
+	}
 }