Author: kmorin Date: 2013-01-14 18:46:19 +0100 (Mon, 14 Jan 2013) New Revision: 195 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/195 Log: debug NPE Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-01-14 17:40:34 UTC (rev 194) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-01-14 17:46:19 UTC (rev 195) @@ -230,9 +230,11 @@ TuttiProtocol protocol = ui.getContextValue(TuttiProtocol.class); List<String> environmentPmfmIds = Lists.newArrayList(); - List<String> protocolEnvironmentPmfmId = protocol.getEnvironmentPmfmId(); - if (protocol != null && protocolEnvironmentPmfmId != null) { - environmentPmfmIds.addAll(protocolEnvironmentPmfmId); + if (protocol != null) { + List<String> protocolEnvironmentPmfmId = protocol.getEnvironmentPmfmId(); + if (protocolEnvironmentPmfmId != null) { + environmentPmfmIds.addAll(protocolEnvironmentPmfmId); + } } List<EnvironmentRowModel> rows = Lists.newArrayList(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-01-14 17:40:34 UTC (rev 194) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-01-14 17:46:19 UTC (rev 195) @@ -233,9 +233,11 @@ TuttiProtocol protocol = ui.getContextValue(TuttiProtocol.class); List<String> gearPmfmIds = Lists.newArrayList(); - List<String> protocolGearPmfmId = protocol.getGearPmfmId(); - if (protocol != null && protocolGearPmfmId != null) { - gearPmfmIds.addAll(protocolGearPmfmId); + if (protocol != null) { + List<String> protocolGearPmfmId = protocol.getGearPmfmId(); + if (protocolGearPmfmId != null) { + gearPmfmIds.addAll(protocolGearPmfmId); + } } List<GearShootingRowModel> rows = Lists.newArrayList(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-01-14 17:40:34 UTC (rev 194) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-01-14 17:46:19 UTC (rev 195) @@ -286,7 +286,10 @@ TuttiProtocol protocol = ui.getContextValue(TuttiProtocol.class); List<String> gearPmfmIds = Lists.newArrayList(); if (protocol != null) { - gearPmfmIds.addAll(protocol.getHydrologyPmfmId()); + List<String> protocolHydrologyPmfmId = protocol.getHydrologyPmfmId(); + if (protocolHydrologyPmfmId != null) { + gearPmfmIds.addAll(protocolHydrologyPmfmId); + } } List<HydrologyRowModel> rows = Lists.newArrayList();