Author: tchemit Date: 2014-02-12 18:30:49 +0100 (Wed, 12 Feb 2014) New Revision: 1591 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1591 Log: clean some codes Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2014-02-12 17:26:34 UTC (rev 1590) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2014-02-12 17:30:49 UTC (rev 1591) @@ -81,7 +81,7 @@ SelectCruiseUIModel model = new SelectCruiseUIModel(); - List<Program> programs = persistenceService.getAllProgram(); + List<Program> programs = Lists.newArrayList(persistenceService.getAllProgram()); model.setPrograms(programs); if (programs.isEmpty()) { @@ -98,7 +98,7 @@ List<Cruise> cruises = null; if (getContext().isProgramFilled()) { selectedProgram = getDataContext().getProgram(); - cruises = persistenceService.getAllCruise(selectedProgram.getId()); + cruises = Lists.newArrayList(persistenceService.getAllCruise(selectedProgram.getId())); } model.setProgram(selectedProgram); @@ -145,28 +145,28 @@ SelectCruiseUIModel model = getModel(); - List<Program> programs = Lists.newArrayList(); - if (model.getPrograms() != null) { - programs.addAll(model.getPrograms()); - } +// List<Program> programs = Lists.newArrayList(); +// if (model.getPrograms() != null) { +// programs.addAll(model.getPrograms()); +// } initBeanFilterableComboBox(ui.getProgramCombobox(), - programs, + model.getPrograms(), model.getProgram()); - List<Cruise> cruises = Lists.newArrayList(); - if (model.getCruises() != null) { - cruises.addAll(model.getCruises()); - } +// List<Cruise> cruises = Lists.newArrayList(); +// if (model.getCruises() != null) { +// cruises.addAll(model.getCruises()); +// } initBeanFilterableComboBox(ui.getCruiseCombobox(), - cruises, + model.getCruises(), model.getCruise()); - List<TuttiProtocol> protocols = Lists.newArrayList(); - if (model.getProtocols() != null) { - protocols.addAll(model.getProtocols()); - } +// List<TuttiProtocol> protocols = Lists.newArrayList(); +// if (model.getProtocols() != null) { +// protocols.addAll(model.getProtocols()); +// } initBeanFilterableComboBox(ui.getProtocolCombobox(), - Lists.newArrayList(model.getProtocols()), + model.getProtocols(), model.getProtocol()); initActionComboBox(ui.getEditProgramComboBox()); @@ -182,7 +182,9 @@ List<TuttiProtocol> protocols = (List<TuttiProtocol>) evt.getNewValue(); combobox.setData(null); - combobox.setData(protocols); + if (protocols != null) { + combobox.setData(protocols); + } SelectCruiseUIHandler.this.ui.applyDataBinding(SelectCruiseUI.BINDING_PROTOCOL_COMBOBOX_ENABLED); } @@ -201,7 +203,7 @@ if (noProgram) { cruises = Lists.newArrayList(); } else { - cruises = getPersistenceService().getAllCruise(newValue.getId()); + cruises = Lists.newArrayList(getPersistenceService().getAllCruise(newValue.getId())); } SelectCruiseUIModel source = (SelectCruiseUIModel) evt.getSource(); source.setCruises(cruises); @@ -216,7 +218,9 @@ BeanFilterableComboBox<Cruise> combobox = SelectCruiseUIHandler.this.ui.getCruiseCombobox(); List<Cruise> campaigns = (List<Cruise>) evt.getNewValue(); combobox.setData(null); - combobox.setData(campaigns); + if (campaigns != null) { + combobox.setData(campaigns); + } } }); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-02-12 17:26:34 UTC (rev 1590) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-02-12 17:30:49 UTC (rev 1591) @@ -745,9 +745,9 @@ List<TuttiLocation> location = getPersistenceService().getAllFishingOperationLocation(zoneId, strataId, null); - ui.getSubStrataComboBox().setData(subStrata); + ui.getSubStrataComboBox().setData(Lists.newArrayList(subStrata)); - ui.getLocationComboBox().setData(location); + ui.getLocationComboBox().setData(Lists.newArrayList(location)); if (newStrata == null) { @@ -786,7 +786,7 @@ List<TuttiLocation> location = getPersistenceService().getAllFishingOperationLocation(zoneId, strataId, subStrataId); - ui.getLocationComboBox().setData(location); + ui.getLocationComboBox().setData(Lists.newArrayList(location)); if (newSubStrata == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2014-02-12 17:26:34 UTC (rev 1590) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2014-02-12 17:30:49 UTC (rev 1591) @@ -212,7 +212,7 @@ categories.remove(0); initBeanFilterableComboBox(this.ui.getCategoryComboBox(), - Lists.<SampleCategoryModelEntry>newArrayList(categories), + Lists.newArrayList(categories), null); Caracteristic caracteristic = @@ -274,45 +274,9 @@ newValue ); -// if (getDataContext().isProtocolFilled()) { -// -// // try to find the first category from protocol -//// TuttiProtocol protocol = getDataContext().getProtocol(); -// SpeciesProtocol speciesProtocol = getPersistenceService().getBenthosProtocol(newValue); -// if (speciesProtocol != null) { -// -// // species defined in protocol -// if (speciesProtocol.sizeMandatorySampleCategoryId() > 1) { -// -// // use the second category (the first one is V/HV) -// Integer categoryId = speciesProtocol.getMandatorySampleCategoryId().get(1); -// selectedCategory = sampleCategoryModel.getCategoryById(categoryId); -// if (log.isInfoEnabled()) { -// log.info("Use category from protocol: " + categoryId + " :: " + selectedCategory); -// } -// } -// } -// } -// -// if (selectedCategory == null) { -// -// // by default use the first one -// List<SampleCategoryModelEntry> categories = -// getUI().getCategoryComboBox().getData(); -// if (!categories.isEmpty()) { -// selectedCategory = categories.get(0); -// -// if (log.isInfoEnabled()) { -// log.info("Use default first category: " + selectedCategory); -// } -// } -// } - if (log.isDebugEnabled()) { log.debug("Selected category : " + selectedCategory); } -// // force reset of selected category -// source.setSelectedCategory(null); // set new selected category source.setSelectedCategory(selectedCategory); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2014-02-12 17:26:34 UTC (rev 1590) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2014-02-12 17:30:49 UTC (rev 1591) @@ -213,14 +213,14 @@ categories.remove(0); initBeanFilterableComboBox(this.ui.getCategoryComboBox(), - Lists.<SampleCategoryModelEntry>newArrayList(categories), + Lists.newArrayList(categories), null); Caracteristic caracteristic = getPersistenceService().getSortedUnsortedCaracteristic(); initBeanFilterableComboBox(this.ui.getSampleCategoryComboBox(), - caracteristic.getQualitativeValue(), + Lists.newArrayList(caracteristic.getQualitativeValue()), null); CreateSpeciesBatchUIModel model = getModel(); @@ -275,54 +275,9 @@ newValue ); -// if (getDataContext().isProtocolFilled()) { -// -// if (log.isInfoEnabled()) { -// log.info("Use protocol to find first category"); -// } -// // try to find the first category from protocol -//// TuttiProtocol protocol = getDataContext().getProtocol(); -// SpeciesProtocol speciesProtocol = getPersistenceService().getSpeciesProtocol(newValue); -// if (speciesProtocol != null) { -// -// if (log.isInfoEnabled()) { -// log.info("Use protocol species to find first category: " + speciesProtocol.getMandatorySampleCategoryId()); -// } -// -// // species defined in protocol -// if (!speciesProtocol.isMandatorySampleCategoryIdEmpty()) { -// -// // use the first category -// Integer categoryId = speciesProtocol.getMandatorySampleCategoryId().get(0); -// -// selectedCategory = sampleCategoryModel.getCategoryById(categoryId); -// if (log.isInfoEnabled()) { -// log.info("Use category from protocol: " + categoryId + " :: " + selectedCategory); -// } -// } -// } -// } -// -// if (selectedCategory == null) { -// -// // by default use the first one -// List<SampleCategoryModelEntry> categories = -// getUI().getCategoryComboBox().getData(); -// -// if (!categories.isEmpty()) { -// selectedCategory = categories.get(0); -// -// if (log.isInfoEnabled()) { -// log.info("Use default first category: " + selectedCategory); -// } -// } -// } - if (log.isDebugEnabled()) { log.debug("Selected category : " + selectedCategory); } -// // force reset of selected category -// source.setSelectedCategory(null); // set new selected category source.setSelectedCategory(selectedCategory);