From e5028dc66885eaaa5121b162f6a9e3ae1bf610de Mon Sep 17 00:00:00 2001
From: brianjlowe <brianjlowe@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 13 Jul 2011 14:29:13 +0000
Subject: [PATCH] NIHVIVO-2884 minor bug fix and improvement to manage Jena
 models page

---
 .../vitro/webapp/controller/jena/JenaIngestController.java    | 2 +-
 webapp/web/jenaIngest/listModels.jsp                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
index ae4f9c934..bd883abe8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
@@ -141,6 +141,7 @@ public class JenaIngestController extends BaseEditController {
 			processCleanLiteralsRequest(vreq, maker, modelType);
 		} else if("outputModel".equals(actionStr)) {
 			processOutputModelRequest(vreq, response, maker, modelType);
+            return; // don't attempt to display a JSP
 		} else if("clearModel".equals(actionStr)) {
 			processClearModelRequest(vreq, maker, modelType);
 		} else if("setWriteLayer".equals(actionStr)) {
@@ -344,7 +345,6 @@ public class JenaIngestController extends BaseEditController {
 		} finally {
 			model.leaveCriticalSection();
 		}
-		return;
 	}
 	
 	private void processCleanLiteralsRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
diff --git a/webapp/web/jenaIngest/listModels.jsp b/webapp/web/jenaIngest/listModels.jsp
index 2e3e4802e..970260a37 100644
--- a/webapp/web/jenaIngest/listModels.jsp
+++ b/webapp/web/jenaIngest/listModels.jsp
@@ -103,7 +103,7 @@ function init(){
                 <input type="hidden" name="action" value="attachModel"/>
                 <input type="hidden" name="modelName" value="<%=modelName%>"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
-                <input type="submit" name="submit" value="attach to webapp"/>
+                <input type="submit" name="submit" value="attach to TBox (ontology)"/>
             </form>
             </td>
             <td>
@@ -111,7 +111,7 @@ function init(){
                 <input type="hidden" name="action" value="detachModel"/>
                 <input type="hidden" name="modelName" value="<%=modelName%>"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
-                <input type="submit" name="submit" value="detach from webapp"/>
+                <input type="submit" name="submit" value="detach from TBox (ontology)"/>
             </form>
             </td>
             <td>