Author: tchemit Date: 2013-01-30 10:56:33 +0100 (Wed, 30 Jan 2013) New Revision: 263 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/263 Log: fix build + begin to improve protocol (to do the pmfm import) Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo 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/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) 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 2013-01-30 09:13:40 UTC (rev 262) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-30 09:56:33 UTC (rev 263) @@ -288,18 +288,18 @@ //init gear shooting GearShootingTabUIModel gearShootingModel = ui.getGearShootingTabContent().getModel(); - gearShootingModel.setAvailableCaracteristics(persistenceService.getAllFishingOperationGearCaracteristic()); + gearShootingModel.setAvailableCaracteristics(persistenceService.getAllCaracteristic()); setCustomTab(1, gearShootingModel); //init environment EnvironmentTabUIModel environmentModel = ui.getEnvironmentTabContent().getModel(); - environmentModel.setAvailableCaracteristics(persistenceService.getAllFishingOperationEnvironmentCaracteristic()); + environmentModel.setAvailableCaracteristics(persistenceService.getAllCaracteristic()); setCustomTab(2, environmentModel); //init hydrology HydrologyTabUIModel hydrologyModel = ui.getHydrologyTabContent().getModel(); - hydrologyModel.setAvailableCaracteristics(persistenceService.getAllFishingOperationHydrologicCaracteristic()); + hydrologyModel.setAvailableCaracteristics(persistenceService.getAllCaracteristic()); setCustomTab(3, hydrologyModel); if (TuttiUIContext.VALIDATION_CONTEXT_VALIDATE.equals(model.getValidationContext())) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-30 09:13:40 UTC (rev 262) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-30 09:56:33 UTC (rev 263) @@ -394,10 +394,10 @@ model.setTableViewMode(TableViewMode.ALL); ui.setContextValue(model); + //TODO Use protocol values if exists ? PersistenceService service = context.getService(PersistenceService.class); - List<Caracteristic> lengthCaracterics = - service.getAllSpeciesLengthStepCaracteristic(); + List<Caracteristic> lengthCaracterics = service.getAllCaracteristic(); FREQUENCY_LENGTH_CONTEXT_ENTRY.setContextValue(ui, lengthCaracterics); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-30 09:13:40 UTC (rev 262) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-30 09:56:33 UTC (rev 263) @@ -52,18 +52,12 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.TableColumnModelEvent; -import javax.swing.event.TableColumnModelListener; import java.util.Collection; import java.util.List; import java.util.Map; /** - * TODO - * * @author tchemit <chemit@codelutin.com> * @since 0.3 */ @@ -183,11 +177,11 @@ model.setProtocolNames(protocolNames); allLengthStepPmfm = TuttiEntities.splitById( - persistenceService.getAllSpeciesLengthStepCaracteristic()); + persistenceService.getAllCaracteristic()); hydroCaracteristics = ArrayListMultimap.create(); for (Caracteristic caracteristic : - persistenceService.getAllFishingOperationHydrologicCaracteristic()) { + persistenceService.getAllCaracteristic()) { String name = HydrologicCaracteristicUtil.getGlobalName(caracteristic.getName()); hydroCaracteristics.put(name, caracteristic.getId()); } @@ -324,12 +318,12 @@ // init gear pmfm double list List<Caracteristic> gearPmfm = - persistenceService.getAllFishingOperationGearCaracteristic(); + persistenceService.getAllCaracteristic(); initDoubleList(ui.getGearList(), gearPmfm, model.getGearPmfmId()); // init environement pmfm double list List<Caracteristic> environmentPmfm = - persistenceService.getAllFishingOperationEnvironmentCaracteristic(); + persistenceService.getAllCaracteristic(); initDoubleList(ui.getEnvironmentList(), environmentPmfm, model.getEnvironmentPmfmId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-30 09:13:40 UTC (rev 262) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-30 09:56:33 UTC (rev 263) @@ -46,6 +46,8 @@ public static final String PROPERTY_NAME = "name"; + public static final String PROPERTY_LENGTH_CLASSES_PMFM_ID = "lengthClassesPmfmId"; + public static final String PROPERTY_GEAR_PMFM_ID = "gearPmfmId"; public static final String PROPERTY_ENVIRONMENT_PMFM_ID = "environmentPmfmId"; @@ -55,13 +57,15 @@ public static final String PROPERTY_SAMPLE_CATEGORY_ORDER = "sampleCategoryOrder"; public static final String PROPERTY_REMOVE_SPECIES_ENABLED = "removeSpeciesEnabled"; - + public static final String PROPERTY_IMPORTED = "imported"; protected String name; protected String comment; + protected List<String> lengthClassesPmfmId; + protected List<String> gearPmfmId; protected List<String> environmentPmfmId; @@ -74,7 +78,7 @@ SampleCategoryEnum.sex, SampleCategoryEnum.maturity, SampleCategoryEnum.age); - + protected boolean imported; /** @@ -117,6 +121,16 @@ firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + public List<String> getLengthClassesPmfmId() { + return lengthClassesPmfmId; + } + + public void setLengthClassesPmfmId(List<String> lengthClassesPmfmId) { + Object oldValue = getLengthClassesPmfmId(); + this.lengthClassesPmfmId = lengthClassesPmfmId; + firePropertyChange(PROPERTY_LENGTH_CLASSES_PMFM_ID, oldValue, lengthClassesPmfmId); + } + public List<String> getGearPmfmId() { return gearPmfmId; } @@ -212,5 +226,5 @@ this.imported = imported; firePropertyChange(PROPERTY_IMPORTED, oldValue, imported); } - + } \ No newline at end of file