Partially merge changes from master.

ipb-halle · Oct 21, 2024 · 88a42ab · 88a42ab
1 parent 56b72d7
commit 88a42ab
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 21 deletions.
diff --git a/MetFragCommandLine/pom.xml b/MetFragCommandLine/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.5.0</version>
+		<version>2.5.1</version>
 	</parent>
 	<groupId>de.ipbhalle.metfrag.commandline</groupId>
 	<artifactId>MetFragCommandLine</artifactId>

diff --git a/MetFragLib/pom.xml b/MetFragLib/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.5.0</version>
+		<version>2.5.1</version>
 	</parent>
 	<packaging>jar</packaging>
 	<groupId>de.ipbhalle.metfraglib</groupId>

diff --git a/MetFragR/pom.xml b/MetFragR/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.5.0</version>
+		<version>2.5.1</version>
 	</parent>
 	<groupId>de.ipbhalle.metfrag.r</groupId>
 	<artifactId>MetFragR</artifactId>

diff --git a/MetFragRest/pom.xml b/MetFragRest/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.5.0</version>
+		<version>2.5.1</version>
 	</parent>
 	<groupId>de.ipbhalle.metfrag.metfragrest</groupId>
 	<artifactId>MetFragRest</artifactId>

diff --git a/MetFragTools/pom.xml b/MetFragTools/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.5.0</version>
+		<version>2.5.1</version>
 	</parent>
 	<groupId>de.ipbhalle.metfrag.tools</groupId>
 	<artifactId>MetFragTools</artifactId>

diff --git a/MetFragWeb/pom.xml b/MetFragWeb/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.ipbhalle.metfrag</groupId>
 		<artifactId>MetFrag</artifactId>
-		<version>2.5.0</version>
+		<version>2.5.1</version>
 	</parent>
 	<groupId>de.ipbhalle.metfragweb</groupId>
 	<artifactId>MetFragWeb</artifactId>
@@ -54,10 +54,6 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-email</artifactId>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>commons-fileupload</groupId>-->
-<!--			<artifactId>commons-fileupload</artifactId>-->
-<!--		</dependency>-->
 		<dependency>
 			<groupId>org.primefaces</groupId>
 			<artifactId>primefaces</artifactId>

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragWebBean.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragWebBean.java
@@ -36,6 +36,8 @@
 import org.primefaces.model.chart.LineChartModel;
 import org.primefaces.model.chart.LineChartSeries;
 
+import org.primefaces.model.DefaultStreamedContent.Builder;
+
 import de.ipbhalle.metfraglib.additionals.MathTools;
 import de.ipbhalle.metfraglib.exceptions.AtomTypeNotKnownFromInputListException;
 import de.ipbhalle.metfraglib.imagegenerator.HighlightSubStructureImageGenerator;
@@ -76,7 +78,7 @@
 @SessionScoped
 public class MetFragWebBean {
 
-	private final String version = "v2.5.0";
+	private final String version = "v2.5.1";
 	/*
 	 * combines all the settings
 	 */
@@ -2014,7 +2016,11 @@ public org.primefaces.model.StreamedContent getDownloadParameters() {
 		try {
 			resource = this.beanSettingsContainer.getUserOutputDataHandler().getDownloadParameters(this.errorMessages, pathToProperties);
 		} catch(Exception e) {
-			resource = DefaultStreamedContent.builder().contentType("application/zip").name("MetFragWeb_Parameters.zip").stream(() -> System.in).build();
+			resource = DefaultStreamedContent.builder()
+			.name("MetFragWeb_Parameters.zip")
+			.contentType("application/zip")
+			.stream(() -> System.in)
+			.build();
 		}
 		return resource;
 	}
@@ -2703,7 +2709,12 @@ public void closeScoresView() {
 	 * @return
 	 */
 	public org.primefaces.model.StreamedContent generateCandidateDownloadFile() {
-		org.primefaces.model.StreamedContent resource = DefaultStreamedContent.builder().contentType("application/vnd.ms-excel").name("MetFragWeb_Candidate.xls").stream(() -> System.in).build();
+		org.primefaces.model.StreamedContent resource = DefaultStreamedContent.builder()
+		.name("MetFragWeb_Candidate.xls")
+		.contentType("application/vnd.ms-excel")
+		.stream(() -> System.in)
+		.build();
+
 		try {
 			resource = this.beanSettingsContainer.getUserOutputDataHandler().generatedCandidateDownloadFile(this.currentScoreCandidate, this.beanSettingsContainer.getMetFragSettings());
 		} catch (Exception e1) {

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.ipbhalle.metfrag</groupId>
 	<artifactId>MetFrag</artifactId>
-	<version>2.5.0</version>
+	<version>2.5.1</version>
 	<packaging>pom</packaging>
 	<name>MetFrag</name>
 	<modules>
@@ -24,7 +24,7 @@
 			<dependency>
 				<groupId>de.ipbhalle.metfraglib</groupId>
 				<artifactId>MetFragLib</artifactId>
-				<version>2.5.0</version>
+				<version>2.5.1</version>
 			</dependency>
 			<dependency>
 				<groupId>junit</groupId>
@@ -108,18 +108,18 @@
 			<dependency>
 				<groupId>org.omnifaces</groupId>
 				<artifactId>omnifaces</artifactId>
-				<version>4.0</version>
+				<version>3.13</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-email</artifactId>
 				<version>1.5</version>
 			</dependency>
-<!--			<dependency>-->
-<!--				<groupId>commons-fileupload</groupId>-->
-<!--				<artifactId>commons-fileupload</artifactId>-->
-<!--				<version>1.4</version>-->
-<!--			</dependency>-->
+			<dependency>
+				<groupId>commons-fileupload</groupId>
+				<artifactId>commons-fileupload</artifactId>
+				<version>1.5</version>
+			</dependency>
 			<dependency>
 				<groupId>org.primefaces</groupId>
 				<artifactId>primefaces</artifactId>