Skip to content

Commit

Permalink
Merge pull request #14 from qbicsoftware/hotfix/fix_qbic_import
Browse files Browse the repository at this point in the history
fix nullpointer when importing 'qbic' format
  • Loading branch information
wow-such-code authored Oct 14, 2020
2 parents 0c0f8ee + 352eaea commit bb3693e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -132,6 +130,9 @@ public String getProjectSecondaryName() {
}

public boolean hasImagingSupport() {
return projectInfoComponent.hasImagingSupport();
if (projectInfoComponent != null) {
return projectInfoComponent.hasImagingSupport();
}
return false;
}
}

0 comments on commit bb3693e

Please sign in to comment.