Display description on index page

4 years ago · 3c1af16c3b
3 changed files with 14 additions and 3 deletions
--- a/WebContent/index.jsp
+++ b/WebContent/index.jsp
@ -1,5 +1,5 @@
 <!DOCTYPE html><%@ 
-page import="java.util.Collection,org.leolo.web.dm.dao.*,org.leolo.web.dm.model.*"
+page import="java.util.Collection,org.leolo.web.dm.dao.*,org.leolo.web.dm.model.*,org.leolo.web.dm.util.*"
 %><html>
 	<head>
 		<title>Download Manager</title>
@ -9,7 +9,10 @@ page import="java.util.Collection,org.leolo.web.dm.dao.*,org.leolo.web.dm.model.
 		<% Collection<Project> projs = new ProjectDao().getAllProjects(); %>
 		<h2>Project List</h2>
 		<ul><% for(Project proj:projs){ %>
-		<li><a href="project/<%=proj.getProjectPath()%>"><%= proj.getProjectName() %></a></li>
+		<li>
+			<a href="project/<%=proj.getProjectPath()%>"><%= proj.getProjectName() %></a><br>
+			<%= JSPUtils.nl2br(proj.getDescription()) %>
+		</li>
 		<%} %></ul>
 	</body>
 </html>
--- a/src/org/leolo/web/dm/dao/ProjectDao.java
+++ b/src/org/leolo/web/dm/dao/ProjectDao.java
@ -26,7 +26,7 @@ public class ProjectDao extends BaseDao{
 		try(
 				Connection conn = getConnection();
 				Statement stmt = conn.createStatement();
-				ResultSet rs = stmt.executeQuery("SELECT project_id, project_path, project_name, mode FROM project")
+				ResultSet rs = stmt.executeQuery("SELECT project_id, project_path, project_name, mode, description FROM project")
 		){
 			while(rs.next()) {
 				Project proj = new Project();
@ -38,6 +38,7 @@ public class ProjectDao extends BaseDao{
 				}else {
 					proj.setMode(ProjectMode.SLAVE);
 				}
+				proj.setDescription(rs.getString(5));
 				v.add(proj);
 			}
 		}catch(SQLException e) {
--- a/src/org/leolo/web/dm/util/JSPUtils.java
+++ b/src/org/leolo/web/dm/util/JSPUtils.java
@ -0,0 +1,7 @@
+package org.leolo.web.dm.util;
+
+public class JSPUtils {
+	public static String nl2br(String str) {
+		return str.replace("\n", "<br>").replace("\r", "");
+	}
+}