diff --git a/WebContent/index.jsp b/WebContent/index.jsp
index 468338a..d7b96a7 100644
--- a/WebContent/index.jsp
+++ b/WebContent/index.jsp
@@ -1,5 +1,5 @@
<%@
-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.*"
%>
Download Manager
@@ -9,7 +9,10 @@ page import="java.util.Collection,org.leolo.web.dm.dao.*,org.leolo.web.dm.model.
<% Collection projs = new ProjectDao().getAllProjects(); %>
Project List
\ No newline at end of file
diff --git a/src/org/leolo/web/dm/dao/ProjectDao.java b/src/org/leolo/web/dm/dao/ProjectDao.java
index ad189e4..99d0655 100644
--- 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) {
diff --git a/src/org/leolo/web/dm/util/JSPUtils.java b/src/org/leolo/web/dm/util/JSPUtils.java
new file mode 100644
index 0000000..f6bac23
--- /dev/null
+++ 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", "
").replace("\r", "");
+ }
+}