BGBM BDI Projects / cdm-vaadin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 48936d8)
fixing NPE
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Tue, 11 Jan 2022 11:45:00 +0000 (12:45 +0100)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Tue, 11 Jan 2022 11:45:00 +0000 (12:45 +0100)
ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch patch | blob | history
src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationSearchFilter.java patch | blob | history

diff --git a/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch b/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch
index 2a3896bf564da5bac40e53ade18fdda6b2005673..db20327e8dcd536bdb63c3b9db18d23e27314314 100644 (file)
--- a/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch
+++ b/ide/eclipse/Jetty Launcher/cdm-vaadin - run.launch
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="net.sourceforge.eclipsejetty.launchConfigurationType">
-<stringAttribute key="bad_container_name" value="/cdm-vaadin/ide/eclipse/Jetty Launcher/cdm-vaadin-run"/>
-<intAttribute key="net.sourceforge.eclipsejetty.launcher.acceptor.limit.count" value="8"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.acceptor.limit.enabled" value="false"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.ajp.enabled" value="false"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.annotations.enabled" value="true"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.cache.client.enabled" value="true"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.cache.server.enabled" value="true"/>
-<intAttribute key="net.sourceforge.eclipsejetty.launcher.configVersion" value="1"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.console.enabled" value="true"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.context" value=""/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.customWebDefaults.enabled" value="false"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.customWebDefaults.resource" value=""/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.gracefulShutdown.override.enabled" value="false"/>
-<intAttribute key="net.sourceforge.eclipsejetty.launcher.gracefulShutdown.override.timeout" value="1000"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.httpsEnabled" value="false"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.httpsPort" value="8443"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.config.active.0" value="true"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.config.path.0" value=""/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.config.type.0" value="DEFAULT"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.embedded" value="false"/>
-<intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.microVersion" value="6"/>
-<intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.minorVersion" value="4"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.path" value="${jetty-runtime-9}"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.version" value="JETTY_9_3"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jmx.enabled" value="false"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jndi.enabled" value="false"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.jsp.enabled" value="true"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.excludeGenericIds" value=""/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.excludeLibs" value=""/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.globalGenericIds" value=""/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.globalLibs" value=""/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.includeGenericIds" value=""/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.includeLibs" value=""/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.info" value="true"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.port" value="8080"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.compile.exclude" value="false"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.import.exclude" value="true"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.none.exclude" value="false"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.provided.exclude" value="true"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.runtime.exclude" value="false"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.system.exclude" value="true"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.test.exclude" value="false"/>
-<intAttribute key="net.sourceforge.eclipsejetty.launcher.threadPool.limit.count" value="16"/>
-<booleanAttribute key="net.sourceforge.eclipsejetty.launcher.threadPool.limit.enabled" value="false"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.webappdir" value="src/main/webapp"/>
-<stringAttribute key="net.sourceforge.eclipsejetty.launcher.websocket.enabled" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-model&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-persistence&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-remote&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-services&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-commons&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.eclipsejetty.starter.jetty9.Jetty9LauncherMain"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdm-vaadin"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#13;&#10;&#13;&#10;-Dcdm.forceSchemaUpdate=false"/>
+    <stringAttribute key="bad_container_name" value="/cdm-vaadin/ide/eclipse/Jetty Launcher/cdm-vaadin-run"/>
+    <intAttribute key="net.sourceforge.eclipsejetty.launcher.acceptor.limit.count" value="8"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.acceptor.limit.enabled" value="false"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.ajp.enabled" value="false"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.annotations.enabled" value="true"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.cache.client.enabled" value="true"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.cache.server.enabled" value="true"/>
+    <intAttribute key="net.sourceforge.eclipsejetty.launcher.configVersion" value="1"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.console.enabled" value="true"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.context" value=""/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.customWebDefaults.enabled" value="false"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.customWebDefaults.resource" value=""/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.gracefulShutdown.override.enabled" value="false"/>
+    <intAttribute key="net.sourceforge.eclipsejetty.launcher.gracefulShutdown.override.timeout" value="1000"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.httpsEnabled" value="false"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.httpsPort" value="8443"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.config.active.0" value="true"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.config.path.0" value=""/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.config.type.0" value="DEFAULT"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.embedded" value="false"/>
+    <intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.microVersion" value="15"/>
+    <intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.minorVersion" value="4"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.path" value="${jetty-runtime-9}"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.version" value="JETTY_9_4"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jmx.enabled" value="false"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jndi.enabled" value="false"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jsp.enabled" value="true"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.excludeGenericIds" value=""/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.excludeLibs" value=""/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.globalGenericIds" value=""/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.globalLibs" value=""/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.includeGenericIds" value=""/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.includeLibs" value=""/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.launcher.info" value="true"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.port" value="8080"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.compile.exclude" value="false"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.import.exclude" value="true"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.none.exclude" value="false"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.provided.exclude" value="true"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.runtime.exclude" value="false"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.system.exclude" value="true"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.scope.test.exclude" value="false"/>
+    <intAttribute key="net.sourceforge.eclipsejetty.launcher.threadPool.limit.count" value="16"/>
+    <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.threadPool.limit.enabled" value="false"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.webappdir" value="src/main/webapp"/>
+    <stringAttribute key="net.sourceforge.eclipsejetty.launcher.websocket.enabled" value="false"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-model&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-persistence&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-remote&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-services&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;cdmlib-commons&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.eclipsejetty.starter.jetty9.Jetty9LauncherMain"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdm-vaadin"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#13;&#10;&#13;&#10;-Dcdm.forceSchemaUpdate=false"/>
 </launchConfiguration>
diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationSearchFilter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationSearchFilter.java
index 64ca129b01aedb09ad9d81323ac467c1cac3132b..89dcd5da7580b2df092ec38422715c8789e94fa1 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationSearchFilter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationSearchFilter.java
@@ -21,7 +21,7 @@ class RegistrationSearchFilter {
     private String referencePattern;
     private User submitter;
     private Set<TypeDesignationStatusFilter> typeStatus = new HashSet<>();
-    private Set<RegistrationStatus> registrationStatus;
+    private Set<RegistrationStatus> registrationStatus = new HashSet<>();
 
     public String getIdentifierPattern() {
         return identifierPattern;