Clean up jsp files

litvinovg · Oct 24, 2023 · 8729b0b · 8729b0b
1 parent 5a30c66
commit 8729b0b
Show file tree

Hide file tree

Showing 19 changed files with 225 additions and 309 deletions.
diff --git a/webapp/src/main/webapp/error.jsp b/webapp/src/main/webapp/error.jsp
@@ -8,7 +8,7 @@
 <%@page import="org.apache.commons.logging.Log"%>
 <%@page import="org.apache.commons.logging.LogFactory"%>
 <%
-// We have seen that this page can throw its own error.
+   // We have seen that this page can throw its own error.
    // Before it does so, be sure that we have written the original error to the log.
     Object c = request.getAttribute("javax.servlet.jsp.jspException");
     if (c instanceof Throwable) {
@@ -18,15 +18,15 @@
     }
 
 
-    VitroRequest vreq = new VitroRequest(request);
-    ApplicationBean appBean = vreq.getAppBean();
-    String themeDir = appBean.getThemeDir();
+            VitroRequest vreq = new VitroRequest(request);
+            ApplicationBean appBean = vreq.getAppBean();
+            String themeDir = appBean.getThemeDir();
 
-    request.setAttribute("bodyJsp", "/errorbody.jsp");
-    request.setAttribute("title", "Error");
-    request.setAttribute("css", "");
-    request.setAttribute("themeDir", themeDir);
-%>
+            request.setAttribute("bodyJsp", "/errorbody.jsp");
+            request.setAttribute("title", "Error");
+            request.setAttribute("css", "");
+            request.setAttribute("themeDir", themeDir);
+            %>
 
 
     <jsp:include page="/templates/page/doctype.jsp"/>

diff --git a/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp b/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp
@@ -54,11 +54,10 @@ function disableProperties(){
     <input type="radio" value="pattern" name="concatenate" onclick="selectProperties()">Use pattern based on values of </input>
 
 
-    <%
-    Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
-           Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
-           Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
-           Entry<String, LinkedList<String>> entry = null;
+    <% Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
+       Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
+       Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
+       Entry<String, LinkedList<String>> entry = null;
     %>
 
     <select name="property" id="properties" disabled="disabled">

diff --git a/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp b/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp
@@ -24,15 +24,15 @@
         <select name="workflowURI">
 
         <%
-        OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List savedQueries = (List) request.getAttribute("workflows");
-        	          for (Iterator it = savedQueries.iterator(); it.hasNext();)  {
-        	              Individual savedQuery = (Individual) it.next();
+	          for (Iterator it = savedQueries.iterator(); it.hasNext();)  {
+	              Individual savedQuery = (Individual) it.next();
                       String queryURI = savedQuery.getURI();
                       String queryLabel = savedQuery.getLabel(null);
-        %> <option value="<%=queryURI%>"><%=queryLabel%></option> <%
+                      %> <option value="<%=queryURI%>"><%=queryLabel%></option> <%
                   }
               } finally {
                   jenaOntModel.leaveCriticalSection();

diff --git a/webapp/src/main/webapp/jenaIngest/merge_result.jsp b/webapp/src/main/webapp/jenaIngest/merge_result.jsp
@@ -13,7 +13,7 @@
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Merge Individuals</h2>
 
 <%
-MergeResult resultObj = (MergeResult) request.getAttribute("result");
+    MergeResult resultObj = (MergeResult) request.getAttribute("result");
     String result = resultObj.getResultText();
 %>
 

diff --git a/webapp/src/main/webapp/jenaIngest/permanentURI.jsp b/webapp/src/main/webapp/jenaIngest/permanentURI.jsp
@@ -29,14 +29,13 @@ URIs exactly of the form created through the GUI interface.</p>
 <input type="hidden" name="action" value="permanentURI" />
 <p>Current namespace of resources
 <select name=oldNamespace>
-<%
-List namespaces = (List)request.getAttribute("namespaceList");
+<%List namespaces = (List)request.getAttribute("namespaceList");
 if(namespaces != null) {
 	Iterator namespaceItr = namespaces.iterator();
 	Integer count = 0;
 	while (namespaceItr.hasNext()){
 		String namespaceText = (String) namespaceItr.next();
-%>
+		%>
         <option value="<%=namespaceText%>"><%=namespaceText%></option>
 <%  }
 }%>

diff --git a/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp b/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp
@@ -58,11 +58,10 @@ function disableProperties(){
     <input type="radio" value="pattern" name="concatenate" onclick="selectProperties()">Use pattern based on values of </input>
 
 
-    <%
-    Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
-           Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
-           Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
-           Entry<String, LinkedList<String>> entry = null;
+    <% Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
+       Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
+       Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
+       Entry<String, LinkedList<String>> entry = null;
     %>
     <%if(itr.hasNext()){%>
     <select name="property" id="properties" disabled="disabled">

diff --git a/webapp/src/main/webapp/jenaIngest/renameResult.jsp b/webapp/src/main/webapp/jenaIngest/renameResult.jsp
@@ -9,7 +9,5 @@
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Rename Resource</h2>
 
-<%
-String result = (String) request.getAttribute("result");
-%>
+<%String result = (String) request.getAttribute("result");%>
 <p><b><%=result%></b></p>
diff --git a/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp b/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp
@@ -48,22 +48,22 @@
 <h3>SPARQL Query <select name="savedQuery">
 	<option value="">select saved query</option>
 	<%
-	OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
-	      jenaOntModel.enterCriticalSection(Lock.READ);
-	      try {
-	          List savedQueries = (List) request.getAttribute("savedQueries");
-		          for (Iterator it = savedQueries.iterator(); it.hasNext();)  {
-		              Individual savedQuery = (Individual) it.next();
-	              String queryURI = savedQuery.getURI();
-	              String queryLabel = savedQuery.getLabel(null);
-	%>
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
+              jenaOntModel.enterCriticalSection(Lock.READ);
+              try {
+                  List savedQueries = (List) request.getAttribute("savedQueries");
+	          for (Iterator it = savedQueries.iterator(); it.hasNext();)  {
+	              Individual savedQuery = (Individual) it.next();
+                      String queryURI = savedQuery.getURI();
+                      String queryLabel = savedQuery.getLabel(null);
+                      %>
 	<option value="<%=queryURI%>"><%=queryLabel%></option>
 	<%
-	}
-	      } finally {
-	          jenaOntModel.leaveCriticalSection();
-		      }
-	%>
+                  }
+              } finally {
+                  jenaOntModel.leaveCriticalSection();
+	      }
+        %>
 </select>
 
 <textarea rows="25" cols="40" name="sparqlQueryStr" class="maxWidth"><c:choose>
@@ -77,19 +77,17 @@ PREFIX owl:   &lt;http://www.w3.org/2002/07/owl#&gt;
 PREFIX xsd:   &lt;http://www.w3.org/2001/XMLSchema#&gt;
 PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
 PREFIX swrl:  &lt;http://www.w3.org/2003/11/swrl#&gt;
-PREFIX swrlb: &lt;http://www.w3.org/2003/11/swrlb#&gt;<%
-    List prefixes = (List)request.getAttribute("prefixList");
-    if(prefixes != null){
-    	Iterator prefixItr = prefixes.iterator();
-    	Integer count = 0;
-    	while (prefixItr.hasNext()){
-    		String prefixText = (String) prefixItr.next();
-    		if(prefixText.equals("(not yet specified)")){
-    			count++;
-    			prefixText = "p." + count.toString();
-    		}
-    		String urlText = (String) prefixItr.next();
-    %>
+PREFIX swrlb: &lt;http://www.w3.org/2003/11/swrlb#&gt;<%List prefixes = (List)request.getAttribute("prefixList");
+if(prefixes != null){
+	Iterator prefixItr = prefixes.iterator();
+	Integer count = 0;
+	while (prefixItr.hasNext()){
+		String prefixText = (String) prefixItr.next();
+		if(prefixText.equals("(not yet specified)")){
+			count++;
+			prefixText = "p." + count.toString();
+		}
+		String urlText = (String) prefixItr.next();%>
 PREFIX <%=prefixText%>: <<%=urlText%>><%}}%>
 
 

diff --git a/webapp/src/main/webapp/jenaIngest/workflowStep.jsp b/webapp/src/main/webapp/jenaIngest/workflowStep.jsp
@@ -26,16 +26,16 @@
 		<select name="workflowStepURI">
 
         <%
-        OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List workflowSteps  = (List) request.getAttribute("workflowSteps");
-        	          for (Iterator it = workflowSteps.iterator(); it.hasNext();)  {
-        	              Individual workflowStep = (Individual) it.next();
+	          for (Iterator it = workflowSteps.iterator(); it.hasNext();)  {
+	              Individual workflowStep = (Individual) it.next();
                       String workflowStepURI = workflowStep.getURI();
                       String workflowStepLabel = workflowStep.getLabel(null);
-        					  String workflowStepString = (workflowStepLabel != null) ? workflowStepLabel : workflowStepURI;
-        %> <option value="<%=workflowStepURI%>"><%=workflowStepString%></option> <%
+					  String workflowStepString = (workflowStepLabel != null) ? workflowStepLabel : workflowStepURI;
+                      %> <option value="<%=workflowStepURI%>"><%=workflowStepString%></option> <%
                   }
               } finally {
                   jenaOntModel.leaveCriticalSection();

diff --git a/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp b/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp
@@ -11,6 +11,6 @@
 <vitro:confirmAuthorization />
 
 <p>Uploaded XML files and converted to RDF.</p>
-<p>Loaded <%=request.getAttribute("statementCount")%> statements to the model <%=request.getAttribute("targetModel")%>.</p>
+<p>Loaded <%= request.getAttribute("statementCount") %> statements to the model <%= request.getAttribute("targetModel") %>.</p>
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a></h2>
diff --git a/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp b/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp
@@ -6,13 +6,13 @@
 <%@ page import="edu.cornell.mannlib.vedit.beans.ButtonForm" %>
 
 <%
-if (request.getAttribute("title") != null) {
-%>
+if (request.getAttribute("title") != null) { %>
     <h2><%=request.getAttribute("title")%></h2><%
-    }
+}
+
+ArrayList<String> logResults = (ArrayList<String>)request.getAttribute("results");
 
-    ArrayList<String> logResults = (ArrayList<String>)request.getAttribute("results");
-    %>
+%>
 
 <div class="editingForm">
 	<table style="margin-bottom:1.5ex;">

diff --git a/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp b/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp
@@ -32,9 +32,7 @@
          </c:if>
     </c:forEach>
 
-    <%
-    if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {
-    %>
+    <%  if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {  %>
         <a href='<c:url value=".${requestScope.servlet}?&amp;alpha=all&amp;${requestScope.controllerParam}"/>'>all </a>
         <c:if test='${not empty requestScope.count }'>
             (${requestScope.count} that start with ${requestScope.alpha })