[hmath-commits] org.hmath.server/WEB-INF/src/org/hartmath/server/taglib HeaderTag.java,1.1,1.2

[Klaus H. <js...@us...>]

Update of /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/taglib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8583/WEB-INF/src/org/hartmath/server/taglib

Modified Files:
	HeaderTag.java 
Log Message:
misc changes


Index: HeaderTag.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/taglib/HeaderTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HeaderTag.java	12 Mar 2004 20:50:50 -0000	1.1
--- HeaderTag.java	20 Mar 2004 10:10:35 -0000	1.2
***************
*** 24,42 ****
      HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
      BrowserSniffer bd = BrowserSniffer.getBrowserDetection(request);
! 
      try {
        switch (bd.getBrowserId()) {
          case BrowserSniffer.MOZILLAID :
!         case BrowserSniffer.NETSCAPEID :
!           pageContext.getResponse().setContentType(
!               "application/xhtml+xml" + "; charset=" + Application.get().getConfiguration().getEncoding());
            request.getRequestDispatcher("gecko_header.jsp").include(request, pageContext.getResponse());
            break;
          case BrowserSniffer.OPERAID :
            pageContext.getResponse().setContentType(
!               "application/xhtml+xml" + "; charset=" + Application.get().getConfiguration().getEncoding());
            request.getRequestDispatcher("opera_header.jsp").include(request, pageContext.getResponse());
            break;
          case BrowserSniffer.MATHPLAYERID :
            pageContext.getResponse().setContentType("text/html" + "; charset=" + Application.get().getConfiguration().getEncoding());
            request.getRequestDispatcher("msie_header.jsp").include(request, pageContext.getResponse());
--- 24,43 ----
      HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
      BrowserSniffer bd = BrowserSniffer.getBrowserDetection(request);
! //    String appURL = Application.get().getConfiguration().getPath(); // "";
      try {
        switch (bd.getBrowserId()) {
          case BrowserSniffer.MOZILLAID :
!           pageContext.getResponse().setContentType("text/xml" + "; charset=" + Application.get().getConfiguration().getEncoding());
            request.getRequestDispatcher("gecko_header.jsp").include(request, pageContext.getResponse());
            break;
+         case BrowserSniffer.SAFARIID :
          case BrowserSniffer.OPERAID :
            pageContext.getResponse().setContentType(
!             "application/xhtml+xml" + "; charset=" + Application.get().getConfiguration().getEncoding());
            request.getRequestDispatcher("opera_header.jsp").include(request, pageContext.getResponse());
            break;
+         case BrowserSniffer.NETSCAPEID : // old netscape newers are detected as Gecko
          case BrowserSniffer.MATHPLAYERID :
+         case BrowserSniffer.MSIEID :
            pageContext.getResponse().setContentType("text/html" + "; charset=" + Application.get().getConfiguration().getEncoding());
            request.getRequestDispatcher("msie_header.jsp").include(request, pageContext.getResponse());
***************
*** 44,48 ****
          default :
            pageContext.getResponse().setContentType("text/html" + "; charset=" + Application.get().getConfiguration().getEncoding());
!           request.getRequestDispatcher("gecko_header.jsp").include(request, pageContext.getResponse());
            break;
        }
--- 45,49 ----
          default :
            pageContext.getResponse().setContentType("text/html" + "; charset=" + Application.get().getConfiguration().getEncoding());
!           request.getRequestDispatcher("msie_header.jsp").include(request, pageContext.getResponse());
            break;
        }