From 9cdaabd0fb59d828e7c4055dc88cb0b28ae05c97 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 2 Jul 2010 03:40:04 +0000
Subject: [PATCH] NIHVIVO-646 Reorder authorships through drag-and-drop. Handle
 success and failure cases. Reset element positions after a removal.

---
 webapp/config/web.xml                                    | 8 ++++----
 .../{PrimitiveRdfDelete.java => PrimitiveDelete.java}    | 4 ++--
 .../vitro/webapp/controller/edit/PrimitiveRdfEdit.java   | 9 ++++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)
 rename webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/{PrimitiveRdfDelete.java => PrimitiveDelete.java} (91%)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 8effd9ecb..cb7672f79 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -1136,12 +1136,12 @@
   </servlet-mapping>
 
   <servlet>
-    <servlet-name>primitiveRdfDelete</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.PrimitiveRdfDelete</servlet-class>    
+    <servlet-name>primitiveDelete</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.PrimitiveDelete</servlet-class>    
   </servlet>
   <servlet-mapping>
-    <servlet-name>primitiveRdfDelete</servlet-name>
-    <url-pattern>/edit/primitiveRdfDelete</url-pattern>    
+    <servlet-name>primitiveDelete</servlet-name>
+    <url-pattern>/edit/primitiveDelete</url-pattern>    
   </servlet-mapping>
    
   <!-- ============================== servlet-mappings ======================== -->
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfDelete.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java
similarity index 91%
rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfDelete.java
rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java
index e9aa43fa7..7d47ecee4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfDelete.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java
@@ -13,10 +13,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.utils.StringUtils;
 
-public class PrimitiveRdfDelete extends PrimitiveRdfEdit {
+public class PrimitiveDelete extends PrimitiveRdfEdit {
 
     private static final long serialVersionUID = 1L;
-    private static final Log log = LogFactory.getLog(PrimitiveRdfDelete.class);  
+    private static final Log log = LogFactory.getLog(PrimitiveDelete.class);  
 
     protected void processRequest(VitroRequest vreq, HttpServletResponse response) {
      
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
index a8adf577c..bf332f06e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
@@ -90,6 +90,13 @@ public class PrimitiveRdfEdit extends FreeMarkerHttpServlet{
     }
     
     protected void processRequest(VitroRequest vreq, HttpServletResponse response) {
+        
+        /* Test error case
+        if (1==1) {
+            doError(response, "Test error", 500);
+            return;
+        }*/
+        
         /* Predefined values for RdfFormat are "RDF/XML", 
          * "N-TRIPLE", "TURTLE" (or "TTL") and "N3". null represents 
          * the default language, "RDF/XML". "RDF/XML-ABBREV" is a synonym for "RDF/XML" */
@@ -206,7 +213,7 @@ public class PrimitiveRdfEdit extends FreeMarkerHttpServlet{
         return models;
     }
     
-    protected void doError(HttpServletResponse response, String errorMsg,int httpstatus){
+    protected void doError(HttpServletResponse response, String errorMsg, int httpstatus){
         response.setStatus(httpstatus);
         try {
             response.getWriter().write(errorMsg);