From 3ab26e69269b1612dc687cf1e917e60bb2626b47 Mon Sep 17 00:00:00 2001
From: Keiji Suzuki <zuki.ebetsu@gmail.com>
Date: Thu, 1 Aug 2013 16:22:52 +0900
Subject: [PATCH] extracts the common codes to a file and includes it.

---
 .../webapp/dspace-admin/curate-collection.jsp | 73 +------------------
 .../webapp/dspace-admin/curate-community.jsp  | 73 +------------------
 .../main/webapp/dspace-admin/curate-item.jsp  | 73 +------------------
 .../main/webapp/dspace-admin/curate-main.jsp  | 73 +------------------
 .../webapp/dspace-admin/curate-message.jsp    | 72 ++++++++++++++++++
 5 files changed, 76 insertions(+), 288 deletions(-)
 create mode 100644 dspace-jspui/src/main/webapp/dspace-admin/curate-message.jsp

diff --git a/dspace-jspui/src/main/webapp/dspace-admin/curate-collection.jsp b/dspace-jspui/src/main/webapp/dspace-admin/curate-collection.jsp
index bb58ed3559..4d977c8abb 100644
--- a/dspace-jspui/src/main/webapp/dspace-admin/curate-collection.jsp
+++ b/dspace-jspui/src/main/webapp/dspace-admin/curate-collection.jsp
@@ -49,78 +49,7 @@
                parenttitlekey="jsp.administer"
                parentlink="/dspace-admin">
 
-<%
-    if (result != null)
-    {
-        String type   = result.getType();
-        boolean isSuccess = result.isSuccess();
-        String resultClass = (isSuccess ? "success" : "failure");
-%>
-    <div class="notice <%= resultClass %>">
-      <h1 class="task-name">
-        <fmt:message key="jsp.dspace-admin.curate.task.name">
-          <fmt:param value="<%= result.getTask() %>"/>
-        </fmt:message>
-      </h1>
-<%
-        if ("perform".equals(type))
-        {
-            if (isSuccess)
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.success"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
-          <fmt:param value="<%= result.getStatus() %>"/>
-          <fmt:param value="<%= result.getResult() %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-            else
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.failure"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
-          <fmt:param value="<%= result.getResult() %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-        }
-        else
-        {
-            if (isSuccess)
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.success"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.queue.message.success">
-          <fmt:param value="<%= result.getHandle() %>"/>
-          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-            else
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.failure"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.queue.message.failure">
-          <fmt:param value="<%= result.getHandle() %>"/>
-          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-        }
-%>
-    </div>
-<%
-    }
-%>
+<%@ include file="/dspace-admin/curate-message.jsp" %>
 
     <h1><fmt:message key="jsp.dspace-admin.curate.collection.heading">
           <fmt:param value="<%= title %>"/>
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/curate-community.jsp b/dspace-jspui/src/main/webapp/dspace-admin/curate-community.jsp
index d5c6693313..cd2d01c1d3 100644
--- a/dspace-jspui/src/main/webapp/dspace-admin/curate-community.jsp
+++ b/dspace-jspui/src/main/webapp/dspace-admin/curate-community.jsp
@@ -48,78 +48,7 @@
                parenttitlekey="jsp.administer"
                parentlink="/dspace-admin">
 
-<%
-    if (result != null)
-    {
-        String type   = result.getType();
-        boolean isSuccess = result.isSuccess();
-        String resultClass = (isSuccess ? "success" : "failure");
-%>
-    <div class="notice <%= resultClass %>">
-      <h1 class="task-name">
-        <fmt:message key="jsp.dspace-admin.curate.task.name">
-          <fmt:param value="<%= result.getTask() %>"/>
-        </fmt:message>
-      </h1>
-<%
-        if ("perform".equals(type))
-        {
-            if (isSuccess)
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.success"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
-          <fmt:param value="<%= result.getStatus() %>"/>
-          <fmt:param value="<%= result.getResult() %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-            else
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.failure"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
-          <fmt:param value="<%= result.getResult() %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-        }
-        else
-        {
-            if (isSuccess)
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.success"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.queue.message.success">
-          <fmt:param value="<%= result.getHandle() %>"/>
-          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-            else
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.failure"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.queue.message.failure">
-          <fmt:param value="<%= result.getHandle() %>"/>
-          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-        }
-%>
-    </div>
-<%
-    }
-%>
+<%@ include file="/dspace-admin/curate-message.jsp" %>
 
     <h1><fmt:message key="jsp.dspace-admin.curate.community.heading">
           <fmt:param value="<%= title %>"/>
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/curate-item.jsp b/dspace-jspui/src/main/webapp/dspace-admin/curate-item.jsp
index eafdbc88e7..e1d9bc924c 100644
--- a/dspace-jspui/src/main/webapp/dspace-admin/curate-item.jsp
+++ b/dspace-jspui/src/main/webapp/dspace-admin/curate-item.jsp
@@ -57,78 +57,7 @@
                parenttitlekey="jsp.administer"
                parentlink="/dspace-admin">
 
-<%
-    if (result != null)
-    {
-        String type   = result.getType();
-        boolean isSuccess = result.isSuccess();
-        String resultClass = (isSuccess ? "success" : "failure");
-%>
-    <div class="notice <%= resultClass %>">
-      <h1 class="task-name">
-        <fmt:message key="jsp.dspace-admin.curate.task.name">
-          <fmt:param value="<%= result.getTask() %>"/>
-        </fmt:message>
-      </h1>
-<%
-        if ("perform".equals(type))
-        {
-            if (isSuccess)
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.success"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
-          <fmt:param value="<%= result.getStatus() %>"/>
-          <fmt:param value="<%= result.getResult() %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-            else
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.failure"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
-          <fmt:param value="<%= result.getResult() %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-        }
-        else
-        {
-            if (isSuccess)
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.success"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.queue.message.success">
-          <fmt:param value="<%= result.getHandle() %>"/>
-          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-            else
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.failure"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.queue.message.failure">
-          <fmt:param value="<%= result.getHandle() %>"/>
-          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-        }
-%>
-    </div>
-<%
-    }
-%>
+<%@ include file="/dspace-admin/curate-message.jsp" %>
 
     <h1><fmt:message key="jsp.dspace-admin.curate.item.heading">
           <fmt:param value="<%= title %>"/>
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/curate-main.jsp b/dspace-jspui/src/main/webapp/dspace-admin/curate-main.jsp
index 8d1ffc3a25..c5db01e729 100644
--- a/dspace-jspui/src/main/webapp/dspace-admin/curate-main.jsp
+++ b/dspace-jspui/src/main/webapp/dspace-admin/curate-main.jsp
@@ -49,78 +49,7 @@
                parenttitlekey="jsp.administer"
                parentlink="/dspace-admin">
 
-<%
-    if (result != null)
-    {
-        String type   = result.getType();
-        boolean isSuccess = result.isSuccess();
-        String resultClass = (isSuccess ? "success" : "failure");
-%>
-    <div class="notice <%= resultClass %>">
-      <h1 class="task-name">
-        <fmt:message key="jsp.dspace-admin.curate.task.name">
-          <fmt:param value="<%= result.getTask() %>"/>
-        </fmt:message>
-      </h1>
-<%
-        if ("perform".equals(type))
-        {
-            if (isSuccess)
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.success"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
-          <fmt:param value="<%= result.getStatus() %>"/>
-          <fmt:param value="<%= result.getResult() %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-            else
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.failure"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
-          <fmt:param value="<%= result.getResult() %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-        }
-        else
-        {
-            if (isSuccess)
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.success"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.queue.message.success">
-          <fmt:param value="<%= result.getHandle() %>"/>
-          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-            else
-            {
-%>
-      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.failure"/></p>
-      <div class="task-message">
-        <fmt:message key="jsp.dspace-admin.curate.queue.message.failure">
-          <fmt:param value="<%= result.getHandle() %>"/>
-          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
-        </fmt:message>
-      </div>
-<%
-            }
-        }
-%>
-    </div>
-<%
-    }
-%>
+<%@ include file="/dspace-admin/curate-message.jsp" %>
 
 <form action="<%=request.getContextPath()%>/dspace-admin/curate" method="post">
 
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/curate-message.jsp b/dspace-jspui/src/main/webapp/dspace-admin/curate-message.jsp
new file mode 100644
index 0000000000..b5c821da43
--- /dev/null
+++ b/dspace-jspui/src/main/webapp/dspace-admin/curate-message.jsp
@@ -0,0 +1,72 @@
+<%
+    if (result != null)
+    {
+        String type   = result.getType();
+        boolean isSuccess = result.isSuccess();
+        String resultClass = (isSuccess ? "success" : "failure");
+%>
+    <div class="notice <%= resultClass %>">
+      <h1 class="task-name">
+        <fmt:message key="jsp.dspace-admin.curate.task.name">
+          <fmt:param value="<%= result.getTask() %>"/>
+        </fmt:message>
+      </h1>
+<%
+        if ("perform".equals(type))
+        {
+            if (isSuccess)
+            {
+%>
+      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.success"/></p>
+      <div class="task-message">
+        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
+          <fmt:param value="<%= result.getStatus() %>"/>
+          <fmt:param value="<%= result.getResult() %>"/>
+        </fmt:message>
+      </div>
+<%
+            }
+            else
+            {
+%>
+      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.perform.failure"/></p>
+      <div class="task-message">
+        <fmt:message key="jsp.dspace-admin.curate.perform.message.success">
+          <fmt:param value="<%= result.getResult() %>"/>
+        </fmt:message>
+      </div>
+<%
+            }
+        }
+        else
+        {
+            if (isSuccess)
+            {
+%>
+      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.success"/></p>
+      <div class="task-message">
+        <fmt:message key="jsp.dspace-admin.curate.queue.message.success">
+          <fmt:param value="<%= result.getHandle() %>"/>
+          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
+        </fmt:message>
+      </div>
+<%
+            }
+            else
+            {
+%>
+      <p class="task-result"><fmt:message key="jsp.dspace-admin.curate.queue.failure"/></p>
+      <div class="task-message">
+        <fmt:message key="jsp.dspace-admin.curate.queue.message.failure">
+          <fmt:param value="<%= result.getHandle() %>"/>
+          <fmt:param value="<%= TASK_QUEUE_NAME %>"/>
+        </fmt:message>
+      </div>
+<%
+            }
+        }
+%>
+    </div>
+<%
+    }
+%>