LOCAL: more post-merge retrofit

WildMeOrg · Jan 23, 2025 · fed8f3c · fed8f3c
1 parent 9b76064
commit fed8f3c
Show file tree

Hide file tree

Showing 7 changed files with 282 additions and 174 deletions.
diff --git a/src/main/webapp/encounters/encounterSearch.jsp b/src/main/webapp/encounters/encounterSearch.jsp
@@ -4,7 +4,7 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List, java.util.Map, org.datanucleus.api.rest.orgjson.JSONObject,java.util.Collections" %>
 <%@ page import="java.util.Properties, java.io.IOException" %>
-<%@ page import="java.util.Arrays" %>
+<%@ page import="java.util.Arrays,org.ecocean.datacollection.*" %>
 <%@ page import="org.ecocean.FormUtilities" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 

diff --git a/src/main/webapp/encounters/encounterSearchResultsAnalysisEmbed.jsp b/src/main/webapp/encounters/encounterSearchResultsAnalysisEmbed.jsp
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"
-         import="javax.jdo.Query, org.ecocean.servlet.ServletUtilities,java.text.DecimalFormat,org.ecocean.Util.MeasurementDesc,org.ecocean.Util.MeasurementEventDesc,org.apache.commons.math.stat.descriptive.SummaryStatistics,java.util.Vector,java.util.Properties,org.ecocean.genetics.*,java.util.*,java.net.URI, org.ecocean.*, org.ecocean.security.Collaboration,org.ecocean.security.HiddenEncReporter" %>
+         import="javax.jdo.Query, org.ecocean.servlet.ServletUtilities,java.text.DecimalFormat,org.ecocean.Util.MeasurementDesc,org.ecocean.Util.MeasurementEventDesc,org.apache.commons.math.stat.descriptive.SummaryStatistics,java.util.Vector,java.util.Properties,org.ecocean.genetics.*,java.util.*,java.net.URI, org.ecocean.*, org.ecocean.security.Collaboration,org.ecocean.security.HiddenEncReporter,org.ecocean.datacollection.*" %>
 
 <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
 

diff --git a/src/main/webapp/individualSearch.jsp b/src/main/webapp/individualSearch.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html; charset=utf-8" language="java" import="org.ecocean.servlet.ServletUtilities,org.ecocean.*, javax.jdo.Extent, javax.jdo.Query, java.util.ArrayList, java.util.List, java.util.GregorianCalendar, java.util.Iterator, java.util.Properties, java.util.Collections" %>
 <%@ page import="java.util.Properties, java.io.IOException" %>
-<%@ page import="org.ecocean.FormUtilities" %>
+<%@ page import="org.ecocean.FormUtilities,org.ecocean.datacollection.*" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <%

diff --git a/src/main/webapp/individualSearchResultsAnalysis.jsp b/src/main/webapp/individualSearchResultsAnalysis.jsp
@@ -4,7 +4,7 @@
          org.ecocean.Util.MeasurementDesc,org.ecocean.Util.MeasurementEventDesc,org.apache.commons.math.stat.descriptive.SynchronizedSummaryStatistics, java.util.stream.Collectors,
          org.joda.time.DateTime,
 		org.joda.time.format.DateTimeFormatter,
-		org.joda.time.format.ISODateTimeFormat
+		org.joda.time.format.ISODateTimeFormat,org.ecocean.datacollection.*
          " %>
 
 

diff --git a/src/main/webapp/occurrence.jsp b/src/main/webapp/occurrence.jsp
@@ -4,7 +4,7 @@
          org.ecocean.datacollection.Instant,
          org.ecocean.*,
          org.ecocean.tag.*,
-         org.datanucleus.api.rest.orgjson.JSONObject
+         org.datanucleus.api.rest.orgjson.JSONObject,org.ecocean.datacollection.*
          " %>
 
 <%
@@ -755,10 +755,10 @@ if (!Util.collectionIsEmptyOrNull(occ.getInformOthers())) {
 								// Let's make a list of editable Observations... Dynamically!
 								
 						if (occ.getObservationArrayList() != null) {
-							ArrayList<Observation> obs = occ.getObservationArrayList();
+							ArrayList<org.ecocean.Observation> obs = occ.getObservationArrayList();
 							System.out.println("Observations ... "+obs);
 							int numObservations = occ.getObservationArrayList().size();
-							for (Observation ob : obs) {
+							for (org.ecocean.Observation ob : obs) {
 								
 								String nm = ob.getName();
 								String vl = ob.getValue();

diff --git a/src/main/webapp/submit.jsp b/src/main/webapp/submit.jsp
@@ -4,7 +4,8 @@
                  org.ecocean.*,
                  java.util.Properties,
                  java.util.List,java.util.ArrayList,
-                 java.util.Locale" %>
+                 java.util.Locale,
+                 org.ecocean.datacollection.*" %>
 
 
 <!-- Add reCAPTCHA -->