diff options
| author | Dorian Birsan | 2003-02-11 18:22:35 +0000 |
|---|---|---|
| committer | Dorian Birsan | 2003-02-11 18:22:35 +0000 |
| commit | 2968a7b18f5d18c96d29029ab73cc05453816ab6 (patch) | |
| tree | 4a1fda06fa3b3a1a1947227acc0df02f95422180 /org.eclipse.help.webapp | |
| parent | b7cb92ed5468ab90b42f4a76e39450b25d970ea3 (diff) | |
| download | eclipse.platform.ua-2968a7b18f5d18c96d29029ab73cc05453816ab6.tar.gz eclipse.platform.ua-2968a7b18f5d18c96d29029ab73cc05453816ab6.tar.xz eclipse.platform.ua-2968a7b18f5d18c96d29029ab73cc05453816ab6.zip | |
bug 31567
Diffstat (limited to 'org.eclipse.help.webapp')
2 files changed, 24 insertions, 23 deletions
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 00e4453dc..17304acff 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 @@ -3,7 +3,6 @@ package org.eclipse.help.internal.webapp.data; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import org.eclipse.help.internal.HelpSystem; import org.eclipse.help.internal.webapp.servlet.*; /* @@ -83,31 +82,30 @@ public class LayoutData extends RequestData { View linksview = null; View bookmarksview = null; - if (HelpSystem.getMode() != HelpSystem.MODE_INFOCENTER) { - if (preferences.isLinksView()) - linksview = - new View( - "links", - "", - preferences.getImagesDirectory() + "/links_view.gif"); - if (preferences.isBookmarksView()) - bookmarksview = - new View( - "bookmarks", - "", - preferences.getImagesDirectory() - + "/bookmarks_view.gif"); - } + + if (preferences.isLinksView()) + linksview = + new View( + "links", + "", + preferences.getImagesDirectory() + "/links_view.gif"); + if (preferences.isBookmarksView()) + bookmarksview = + new View( + "bookmarks", + "", + preferences.getImagesDirectory() + "/bookmarks_view.gif"); if (linksview != null && bookmarksview != null) - views = new View[] {tocview,searchview,linksview,bookmarksview}; + views = + new View[] { tocview, searchview, linksview, bookmarksview }; else if (linksview != null) - views = new View[] {tocview,searchview,linksview}; + views = new View[] { tocview, searchview, linksview }; else if (bookmarksview != null) - views = new View[] {tocview, searchview,bookmarksview}; + views = new View[] { tocview, searchview, bookmarksview }; else - views = new View[] {tocview,searchview}; - + views = new View[] { tocview, searchview }; + return views; } diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappPreferences.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappPreferences.java index 7602b5f38..474ada3f6 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappPreferences.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/WebappPreferences.java @@ -6,6 +6,7 @@ package org.eclipse.help.internal.webapp.servlet; import org.eclipse.core.runtime.Preferences; import org.eclipse.help.internal.HelpPlugin; +import org.eclipse.help.internal.HelpSystem; /** * Preferences for availiable to webapp @@ -34,11 +35,13 @@ public class WebappPreferences { } public boolean isBookmarksView() { - return "true".equals(prefs.getString("bookmarksView")); + return HelpSystem.getMode() != HelpSystem.MODE_INFOCENTER + && "true".equals(prefs.getString("bookmarksView")); } public boolean isLinksView() { - return "true".equals(prefs.getString("linksView")); + return HelpSystem.getMode() != HelpSystem.MODE_INFOCENTER + && "true".equals(prefs.getString("linksView")); } public String getImagesDirectory() { |