Rename fileUploadListener to listener for p:fileUpload and fix an err…

…or in readCandidatesFromFile for SDF files.
schymane · Nov 18, 2024 · 91985fd · 91985fd
1 parent 5a62fcd
commit 91985fd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/MetFragLib/src/main/java/de/ipbhalle/metfraglib/database/LocalSDFDatabase.java b/MetFragLib/src/main/java/de/ipbhalle/metfraglib/database/LocalSDFDatabase.java
@@ -121,7 +121,9 @@ protected void readCandidatesFromFile() throws Exception {
 				while(keys.hasNext()) {
 					String curKey = keys.next();
 					if(!this.candidates.get(i).hasDefinedProperty(curKey)) this.candidates.get(i).setProperty(curKey, "-");
-					if(((String)this.candidates.get(i).getProperty(curKey)).equals("")) this.candidates.get(i).setProperty(curKey, "-");
+                    Object property = this.candidates.get(i).getProperty(curKey);
+                    if (property instanceof String && ((String) property).isEmpty())
+                        this.candidates.get(i).setProperty(curKey, "-");
 				}
 			}
 

diff --git a/MetFragWeb/src/main/webapp/includes/candidateFiltersPrime.xhtml b/MetFragWeb/src/main/webapp/includes/candidateFiltersPrime.xhtml
@@ -387,7 +387,7 @@
 					cellspacing="4" cellpadding="4" styleClass="subPanel"
 					rendered="#{metFragWebBean.suspectListInclusionFilterEnabled}">
 					<p:fileUpload id="suspectListsFilter"
-						fileUploadListener="#{metFragWebBean.suspectListFilterUploadListener}"
+						listener="#{metFragWebBean.suspectListFilterUploadListener}"
 						auto="true" mode="advanced" maxFileCount="10"
 						maxFileSize="20000000" autoUpload="true" multiple="false"
 						required="false" update="suspectListInclusionFilterPanel">

diff --git a/MetFragWeb/src/main/webapp/includes/candidateScoresPrime.xhtml b/MetFragWeb/src/main/webapp/includes/candidateScoresPrime.xhtml
@@ -145,7 +145,7 @@
 						<h:panelGrid columns="1">
 							<p:fileUpload update="retentionTimeScorePanel"
 								id="retentionTimeTrainingFile"
-								fileUploadListener="#{metFragWebBean.retentionTimeFileUploadListener}"
+								listener="#{metFragWebBean.retentionTimeFileUploadListener}"
 								auto="true" mode="advanced" maxFileCount="10"
 								maxFileSize="20000000" autoUpload="true" multiple="false">
 							</p:fileUpload>
@@ -244,7 +244,7 @@
 					cellspacing="4" cellpadding="4" styleClass="subPanel"
 					rendered="#{metFragWebBean.suspectListInclusionScoreEnabled}">
 					<p:fileUpload id="suspectListsScore"
-						fileUploadListener="#{metFragWebBean.suspectListScoreUploadListener}"
+						listener="#{metFragWebBean.suspectListScoreUploadListener}"
 						auto="true" mode="advanced" maxFileCount="10"
 						maxFileSize="20000000" autoUpload="true" multiple="false"
 						required="false" update="suspectListInclusionScorePanel">

diff --git a/MetFragWeb/src/main/webapp/includes/databasePrime.xhtml b/MetFragWeb/src/main/webapp/includes/databasePrime.xhtml
@@ -59,7 +59,7 @@
 							<h:panelGrid columns="1"
 								rendered="#{metFragWebBean.localDatabaseDefined}">
 								<p:fileUpload update="mainForm:mainAccordion" id="candidateFileUpload"
-									fileUploadListener="#{metFragWebBean.candidateFileUploadListener}"
+									listener="#{metFragWebBean.candidateFileUploadListener}"
 									auto="true" mode="advanced">
 								</p:fileUpload>
 								<h:panelGroup id="candidateFileName" layout="block"

diff --git a/MetFragWeb/src/main/webapp/includes/uploadParameters.xhtml b/MetFragWeb/src/main/webapp/includes/uploadParameters.xhtml
@@ -19,7 +19,7 @@
 					value="Upload parameters as ZIP file" />
 				<br />
 				<p:fileUpload update="uploadParametersPanel" id="parametersUpload"
-					fileUploadListener="#{metFragWebBean.parametersUploadListener}"
+					listener="#{metFragWebBean.parametersUploadListener}"
 					auto="true" mode="advanced">
 				</p:fileUpload>
 				<h:panelGroup id="uploadParametersError" style="padding-top: 10px"