db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1299982 - /db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java
Date Tue, 13 Mar 2012 06:13:00 GMT
Author: kristwaa
Date: Tue Mar 13 06:13:00 2012
New Revision: 1299982

URL: http://svn.apache.org/viewvc?rev=1299982&view=rev
Log:
DERBY-5639: Minor code cleanup for NetServlet

Fixed some HTML errors.

Patch file: derby-5639-3a-html.diff

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java?rev=1299982&r1=1299981&r2=1299982&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java Tue Mar 13 06:13:00
2012
@@ -472,9 +472,8 @@ public class NetServlet extends HttpServ
 
 		}
 
-		out.println( "</html>" ); 
-		out.println( "</body>" ); 	
-
+        out.println( "</body>" ); 	
+        out.println( "</html>" ); 
 	}
 
 	/**
@@ -616,8 +615,8 @@ public class NetServlet extends HttpServ
 		printAsContentHeader(localUtil.getTextMessage("SRV_NetworkServerError"), out);
 		out.println( "<h4>"+localUtil.getTextMessage("SRV_Message", e.getMessage()) + "</h4>"
);
 		out.println( "<INPUT type=submit name=form value='"+returnMessage+"'>" );
-		out.println( "</html>" );
 		out.println( "</body>" );
+		out.println( "</html>" );
 	}
 	/**
 	 *	Display an error form
@@ -638,8 +637,8 @@ public class NetServlet extends HttpServ
 		printAsContentHeader(localUtil.getTextMessage("SRV_NetworkServerError"), out);
 		out.println( "<h4>"+localUtil.getTextMessage("SRV_Message", msg) + "</h4>"
);
 		out.println( "<INPUT type=submit name=form value='"+returnMessage+"'>" );
-		out.println( "</html>" ); 
 		out.println( "</body>" ); 	
+		out.println( "</html>" ); 
 	}
 	/**
 	 *	Display the current Network server status
@@ -930,18 +929,21 @@ public class NetServlet extends HttpServ
 	 */
 	private void printBanner(LocalizedResource localUtil, PrintWriter out)
 	{
+        out.println("<!DOCTYPE html>");
+        out.println("<html>");        
+        out.println("<head>");
+        out.println("<title>"+localUtil.getTextMessage("SRV_Banner")+"</title>");
+        out.println("</head>");
+        out.println("<body>");     
 		out.println("<a href=\"#navskip\">[ " +
 		localUtil.getTextMessage("SRV_SkipToContent") + " ]</a>");
 		out.println("  -  <a href=\"" + SERVLET_ADDRESS + "\">[ " +
 		localUtil.getTextMessage("SRV_BackToMain") + " ]</a>");
-		out.println( "<html>" );		
-		out.println( "<title>"+localUtil.getTextMessage("SRV_Banner")+"</title>" );
-		out.println( "<body>" ); 	
-		out.println( "<hr>" );
-		out.println( "<h1>"+localUtil.getTextMessage("SRV_Banner")+"</h1>" );
-		out.println( "<hr>" );
-
+        out.println("<hr>");
+        out.println("<h1>"+localUtil.getTextMessage("SRV_Banner")+"</h1>");
+        out.println("<hr>");
 	}
+
 	/**
 	 * Determine the locale file needed for this browsers preferences
 	 * Defaults to the settings for derby.locale and derby.codeset if set



Mime
View raw message