From 159043e0c4c724bd0d2a7bab9d3c00978184c4d9 Mon Sep 17 00:00:00 2001
From: wow-such-code <andreas.friedrich@uni-tuebingen.de>
Date: Wed, 14 Oct 2020 17:42:47 +0200
Subject: [PATCH 1/2] fix nullpointer when importing 'qbic' format

---
 .../projectwizard/uicomponents/MissingInfoComponent.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/life/qbic/projectwizard/uicomponents/MissingInfoComponent.java b/src/main/java/life/qbic/projectwizard/uicomponents/MissingInfoComponent.java
index 21f70008..af06ffbe 100644
--- a/src/main/java/life/qbic/projectwizard/uicomponents/MissingInfoComponent.java
+++ b/src/main/java/life/qbic/projectwizard/uicomponents/MissingInfoComponent.java
@@ -6,14 +6,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
-
 import life.qbic.datamodel.persons.PersonType;
 import life.qbic.portal.Styles;
 
@@ -132,6 +130,9 @@ public String getProjectSecondaryName() {
   }
 
   public boolean hasImagingSupport() {
-    return projectInfoComponent.hasImagingSupport();
+    if (projectInfoComponent != null) {
+      return projectInfoComponent.hasImagingSupport();
+    }
+    return false;
   }
 }

From 352eaeaed736442d5fdfed6d88c4d69a17025b34 Mon Sep 17 00:00:00 2001
From: wow-such-code <andreas.friedrich@uni-tuebingen.de>
Date: Wed, 14 Oct 2020 17:45:27 +0200
Subject: [PATCH 2/2] increase parent pom version and minor version for hotfix
 release

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 561c204a..833819bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>projectwizard-portlet</artifactId>
-	<version>1.8.3</version>
+	<version>1.8.4</version>
 	<name>ProjectWizard Portlet</name>
 	<url>http://github.com/qbicsoftware/projectwizard-portlet</url>
 	<packaging>war</packaging>
 	<parent>
 		<groupId>life.qbic</groupId>
 		<artifactId>portlet-parent-pom</artifactId>
-		<version>3.1.1</version>
+		<version>3.1.4</version>
 	</parent>
 	<properties>
 		<vaadin.version>7.7.17</vaadin.version>