Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 09765ed1 by Tony CHEMIT at 2018-09-21T15:46:55Z [PS] Utilisation d'un objet flottant de référence - Closes #1074 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTable.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java ===================================== @@ -49,8 +49,8 @@ import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.service.actions.consolidate.dcp.ConsolidateFloatingObjectRequest; import fr.ird.observe.services.service.actions.consolidate.dcp.ConsolidateFloatingObjectResult; import fr.ird.observe.spi.DtoModelHelper; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; @@ -147,6 +147,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, Set<FloatingObjectPartReference> partsSet; Form<FloatingObjectDto> form; Optional<FloatingObjectPreset> floatingObjectReference; + boolean useReference = false; + if (dcpId == null) { Optional<FloatingObjectPreset> ref = ObserveSwingApplicationContext.get().getFloatingObjectPresetsManager().getReferenceToUse(); @@ -155,6 +157,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, String floatingObjectReferenceId = ref.map(FloatingObjectPreset::getFloatingObjectId).orElse(null); form = getFloatingObjectService().preCreate(activityId, floatingObjectReferenceId); if (floatingObjectReferenceId != null) { + useReference = true; partsSet = getFloatingObjectService().getFloatingObjectPartByFloatingObject(floatingObjectReferenceId).toSet(); for (FloatingObjectPartReference floatingObjectPartDtoDataReference : partsSet) { floatingObjectPartDtoDataReference.setId(null); @@ -180,7 +183,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, model.reset(); - getUi().getTable().openTable(model, partsSet, bean.isPersisted()); + getUi().getTable().openTable(model, partsSet, bean.isPersisted() || useReference); setContentMode(mode); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTable.java ===================================== @@ -68,7 +68,7 @@ public class FloatingObjectPartsTreeTable extends JXTreeTable { return (FloatingObjectPartsTreeTableModel) super.getTreeTableModel(); } - public void openTable(FloatingObjectUIModel model, Set<FloatingObjectPartReference> partsSet, boolean persisted) { + public void openTable(FloatingObjectUIModel model, Set<FloatingObjectPartReference> partsSet, boolean expandTree) { for (FloatingObjectPartReference p : partsSet) { String objectMaterialId = p.getObjectMaterialId(); @@ -85,7 +85,7 @@ public class FloatingObjectPartsTreeTable extends JXTreeTable { FloatingObjectPartsTreeTableModel treeTableModel = getTreeTableModel(); treeTableModel.reset(); - if (persisted) { + if (expandTree) { expandAll(); } else { // expand first level nodes (except if they are disabled) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/09765ed193a2c5859c399fbfa20a... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/09765ed193a2c5859c399fbfa20a... You're receiving this email because of your account on gitlab.com.