diff options
| author | Dejan Gloszic | 2005-04-27 15:48:55 +0000 |
|---|---|---|
| committer | Dejan Gloszic | 2005-04-27 15:48:55 +0000 |
| commit | 4a97021deb8c39a0368e314f72be6754bd117f6a (patch) | |
| tree | 27f626af666658b4cd61bbfbe094d6bc2b957b56 /org.eclipse.help.webapp | |
| parent | 55d8848f6a18cb95c6a3664534ae1d0148fec8b0 (diff) | |
| download | eclipse.platform.ua-4a97021deb8c39a0368e314f72be6754bd117f6a.tar.gz eclipse.platform.ua-4a97021deb8c39a0368e314f72be6754bd117f6a.tar.xz eclipse.platform.ua-4a97021deb8c39a0368e314f72be6754bd117f6a.zip | |
*** empty log message ***
Diffstat (limited to 'org.eclipse.help.webapp')
2 files changed, 12 insertions, 5 deletions
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java index fd9439486..df6518071 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java @@ -41,7 +41,9 @@ public class InjectionFilter implements IFilter { private static final String disabledBook3 = "\n<script language=\"JavaScript\" src=\""; //$NON-NLS-1$ private static final String disabledBook4 = "livehelp.js\"> </script>"; //$NON-NLS-1$ - + + private void loadDocumentMessage() { + } /* * @see IFilter#filter(HttpServletRequest, OutputStream) */ @@ -115,8 +117,13 @@ public class InjectionFilter implements IFilter { } private void appendDisabled(StringBuffer buff, int nsteps) { - String localeStr = Platform.getNL(); - Locale locale = UrlUtil.getLocale(localeStr); + String message = HelpBasePlugin.getActivitySupport().getDocumentMessage(); + if (message!=null) + buff.append(message); + //String localeStr = Platform.getNL(); + //Locale locale = UrlUtil.getLocale(localeStr); + +/* buff.append("<div id=\"help-disabledTopic\">"); //$NON-NLS-1$ buff.append("<img src=\""); //$NON-NLS-1$ appendRelativePath(buff, nsteps, "org.eclipse.help.webapp"); //$NON-NLS-1$ @@ -130,5 +137,6 @@ public class InjectionFilter implements IFilter { .append(" <a href='javascript:liveAction(\"org.eclipse.help.ui\", \"org.eclipse.help.ui.internal.ShowCapabilitiesPreferenceAction\",\"\")'>"); //$NON-NLS-1$ buff.append(WebappResources.getString("disabledTopic4", locale)); //$NON-NLS-1$ buff.append("</a><br><hr></div>"); //$NON-NLS-1$ +*/ } }
\ No newline at end of file diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java index cbb8d8396..ff12a5934 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/LiveHelpServlet.java @@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.help.internal.base.BaseHelpSystem; -import org.eclipse.help.internal.base.DisplayUtils; import org.eclipse.help.internal.webapp.data.WebappPreferences; /** @@ -54,7 +53,7 @@ public class LiveHelpServlet extends HttpServlet { if (className == null) return; String arg = req.getParameter("arg"); //$NON-NLS-1$ - DisplayUtils.runLiveHelp(pluginID, className, arg); + BaseHelpSystem.runLiveHelp(pluginID, className, arg); } /** * |