- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 3 commits: Fix when a LL logbook Activity has no set
by Tony CHEMIT 18 Dec '20

18 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7abb8b51 by Tony Chemit at 2020-12-18T01:44:30+01:00 Fix when a LL logbook Activity has no set - - - - - 628c0802 by Tony Chemit at 2020-12-18T01:52:26+01:00 Fix LL logbook Activity recopy action - - - - - eea48ea1 by Tony Chemit at 2020-12-18T02:00:51+01:00 Fix some accelerator for macos - - - - - 3 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/ObserveLLKeyStrokes.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIModel.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/ObserveLLKeyStrokes.java ===================================== @@ -33,9 +33,9 @@ import javax.swing.KeyStroke; * @since 8.0 */ public class ObserveLLKeyStrokes extends ObserveKeyStrokesEditorApi { - public static final KeyStroke KEY_STROKE_COPY_VALUES_AND_SAVE = KeyStroke.getKeyStroke("ctrl pressed T"); - public static final KeyStroke KEY_STROKE_SELECT_TRANSSHIPMENT = KeyStroke.getKeyStroke("ctrl pressed T"); - public static final KeyStroke KEY_STROKE_RESET_BRANCHLINE = KeyStroke.getKeyStroke("ctrl pressed Z"); - public static final KeyStroke KEY_STROKE_SAVE_BRANCHLINE = KeyStroke.getKeyStroke("ctrl pressed G"); - public static final KeyStroke KEY_STROKE_GENERATE_ID = KeyStroke.getKeyStroke("ctrl pressed G"); + public static final KeyStroke KEY_STROKE_COPY_VALUES_AND_SAVE = KeyStroke.getKeyStroke("pressed F9"); + public static final KeyStroke KEY_STROKE_SELECT_TRANSSHIPMENT = KeyStroke.getKeyStroke("alt pressed T"); + public static final KeyStroke KEY_STROKE_RESET_BRANCHLINE = KeyStroke.getKeyStroke("alt pressed Z"); + public static final KeyStroke KEY_STROKE_SAVE_BRANCHLINE = KeyStroke.getKeyStroke("alt pressed G"); + public static final KeyStroke KEY_STROKE_GENERATE_ID = KeyStroke.getKeyStroke("alt pressed G"); } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIModel.java ===================================== @@ -54,7 +54,7 @@ public class SetUIModel extends GeneratedSetUIModel { copySetCandidates = form.getObject().getOtherSets().stream() .sorted(Comparator.comparing(SetStubDto::getSettingStartTimeStamp)) .collect(Collectors.toList()); - addPropertyChangeListener(SetDto.PROPERTY_SETTING_START_TIME_STAMP, e -> updateCopySetCandidate((Date) e.getNewValue())); + getStates().getBean().addPropertyChangeListener(SetDto.PROPERTY_SETTING_START_TIME_STAMP, e -> updateCopySetCandidate((Date) e.getNewValue())); updateCopySetCandidate(getStates().getBean().getSettingStartTimeStamp()); } ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java ===================================== @@ -140,7 +140,7 @@ public class SetServiceLocal extends EditableDataServiceLocalSupport<Activity, S private java.util.Set<SetStubDto> getBrothers(Activity parent) { java.util.Set<SetStubDto> result = new HashSet<>(); Trip trip = getParent(Trip.SPI, Trip.PROPERTY_ACTIVITY_LOGBOOK, parent.getTopiaId()); - trip.getActivityLogbook().stream().filter(ActivityAware::isSetOperation).filter(a -> !Objects.equals(a, parent)).forEach( + trip.getActivityLogbook().stream().filter(a -> a.isSetOperation() && !Objects.equals(a, parent) && a.getSet() != null).forEach( oneParent -> { Set otherSet = oneParent.getSet(); SetStubDto otherSetDto = Set.SET_STUB_SPI.toDto(getReferentialLocale(), otherSet); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5606957a4fa845850bca8889… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5606957a4fa845850bca8889… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL][Logbooks] F5 inopérant (sur MacOS) - Closes #1678
by Tony CHEMIT 18 Dec '20

18 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5606957a by Tony Chemit at 2020-12-18T01:33:12+01:00 [LL][Logbooks] F5 inopérant (sur MacOS) - Closes #1678 - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveEdit.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveEdit.java ===================================== @@ -56,6 +56,7 @@ public final class SaveEdit<D extends DataDto, U extends ContentEditUI<D, U>> ex public static <D extends DataDto, U extends ContentEditUI<D, U>> void installAction(U ui, JButton editor, Supplier<SaveRequest> request, Function<SaveRequest, BiFunction<String, D, SaveResultDto>> consumer) { SaveEdit<D, U> action = prepareAction(ui, request, consumer, r -> new SaveEditUIAdapter<>(ui)); + action.setName(action.getName()+"_"+editor.getName()); init(ui, editor, action); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5606957a4fa845850bca88895… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5606957a4fa845850bca88895… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix navigation menu for action with empty name
by Tony CHEMIT 18 Dec '20

18 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d0953698 by Tony Chemit at 2020-12-18T01:06:53+01:00 Fix navigation menu for action with empty name - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/ContentUIMenuAction.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/ContentUIMenuAction.java ===================================== @@ -79,7 +79,12 @@ public class ContentUIMenuAction extends AbstractAction implements MenuAction { if (toolTipText != null) { toolTipText = ObserveKeyStrokesSupport.removeKeyStroke(toolTipText); putValue(SHORT_DESCRIPTION, toolTipText); + String name = (String) getValue(NAME); + if (name!=null && name.isEmpty()) { + putValue(NAME, toolTipText); + } } + this.action = new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d0953698c96624a4c76a73b24… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d0953698c96624a4c76a73b24… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: use last stable of jaxx
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1786594d by Tony Chemit at 2020-12-17T23:44:36+01:00 use last stable of jaxx - - - - - bf7c28c9 by Tony Chemit at 2020-12-17T23:46:05+01:00 Let's improve once for all select toolbar visibility (always use size of table model, but also can use selected tab for sub content table), and it works pretty well :) - - - - - 453c24b9 by Tony Chemit at 2020-12-18T00:17:50+01:00 Valider tous les écrans du modèle LL - See #1665 l'écran de composition détaillé commence à fonctionner \o/ - - - - - 8ad27d89 by Tony Chemit at 2020-12-18T00:58:37+01:00 [LL] Ajout données d'observation - Closes #1673 - - - - - 15 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/CompositionAutoSelectRowAndShowPopupAction.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionUIValidationHelper.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/basket/BasketTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/branchline/BranchlineTableModel.java - pom.xml Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java ===================================== @@ -121,7 +121,8 @@ public class ChangeModeExecutor { protected void afterOpenReselectNode(NavigationTree tree, NavigationNode selectedNode, String id) { log.info("Will reselect node: " + selectedNode); - SwingUtilities.invokeLater(() -> tree.reSelectSafeNode(selectedNode)); +// SwingUtilities.invokeLater(() -> tree.reSelectSafeNode(selectedNode)); + tree.reSelectSafeNode(selectedNode); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java ===================================== @@ -137,11 +137,17 @@ public abstract class TripActionHelper implements WithClientUIContext { NavigationNode tripNode = tree.getSelectedNode().upToReferenceNode(getReferenceType()); tree.selectSafeNode(tripNode); TripUI<?> tripUI = (TripUI<?>) ui.getHandler().getDataSourceEditor().getModel().getContent(); + if (tripNode.getInitializer().getEditNodeId() == null) { + ((ContentUI) tripUI).getMode().doClick(); + tripUI = (TripUI<?>) ui.getHandler().getDataSourceEditor().getModel().getContent(); + } // set availability flag to true tripUI.getModel().set(availabilityPropertyName, true); // go to meta-data tab TabInfo tabInfo = tabGetter.apply(tripUI); - SwingUtilities.invokeLater(() -> tripUI.selectTab(tabInfo)); + TripUI<?> finalTripUI = tripUI; + SwingUtilities.invokeLater(() -> finalTripUI.selectTab(tabInfo)); + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java ===================================== @@ -91,6 +91,9 @@ public class TripUIHelper<D extends DataDto, U extends ContentOpenableUI<D, U> & } private void buildTripMap() { + if (ui.getModel().getStates().isCreatingMode()) { + return; + } SwingUtilities.invokeLater(() -> { getClientUIContext().getBusyModel().addTask("Build map"); try { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java ===================================== @@ -144,7 +144,8 @@ public abstract class ContentListUIHandler<D extends DataDto, R extends DataDtoR Class<? extends DataDtoReference> referenceType = ui.getModel().getSource().getScope().getMainReferenceType(); NavigationNode referenceNode = tree.getSelectedNode().downToReferenceNode(referenceType, id); log.info(String.format("Will reselect node: %s", selectedNode)); - SwingUtilities.invokeLater(() -> tree.reSelectSafeNode(referenceNode)); +// SwingUtilities.invokeLater(() -> tree.reSelectSafeNode(referenceNode)); + tree.reSelectSafeNode(referenceNode); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java ===================================== @@ -57,7 +57,7 @@ class LandingUIHandler extends GeneratedLandingUIHandler { @Override public void onMainTabChanged(int previousIndex, int selectedIndex) { super.onMainTabChanged(previousIndex, selectedIndex); - ui.getLandingPartUI().getSelectToolbar().setVisible(selectedIndex == 1); + ui.getLandingPartUI().getSelectToolbar().setVisible(selectedIndex == 1 && ui.getLandingPartUI().getTableModel().getRowCount() > 1); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIHandler.java ===================================== @@ -55,7 +55,7 @@ class SampleUIHandler extends GeneratedSampleUIHandler { @Override public void onMainTabChanged(int previousIndex, int selectedIndex) { super.onMainTabChanged(previousIndex, selectedIndex); - ui.getSamplePartUI().getSelectToolbar().setVisible(selectedIndex == 1); + ui.getSamplePartUI().getSelectToolbar().setVisible(selectedIndex == 1 && ui.getSamplePartUI().getTableModel().getRowCount()>1); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUIHandler.java ===================================== @@ -56,6 +56,15 @@ class SetGlobalCompositionUIHandler extends GeneratedSetGlobalCompositionUIHandl getContentOpen().initTabUI(ui.getBaitsCompositionUI(), ui.getBaitsCompositionPanel(), 3); } + @Override + public void onMainTabChanged(int previousIndex, int selectedIndex) { + super.onMainTabChanged(previousIndex, selectedIndex); + ui.getFloatlinesCompositionUI().getSelectToolbar().setVisible(selectedIndex == 0 && ui.getFloatlinesCompositionUI().getTableModel().getRowCount() > 1); + ui.getBranchlinesCompositionUI().getSelectToolbar().setVisible(selectedIndex == 1 && ui.getBranchlinesCompositionUI().getTableModel().getRowCount() > 1); + ui.getHooksCompositionUI().getSelectToolbar().setVisible(selectedIndex == 2 && ui.getHooksCompositionUI().getTableModel().getRowCount() > 1); + ui.getBaitsCompositionUI().getSelectToolbar().setVisible(selectedIndex == 3 && ui.getBaitsCompositionUI().getTableModel().getRowCount() > 1); + } + @Override protected void installResetAction() { ResetForm.installAction(ui, ui.getReset(), new DefaultResetAdapter<SetGlobalCompositionUI>() { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java ===================================== @@ -76,7 +76,6 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition private final PropertyChangeListener branchlineDetailChanged; private final PropertyChangeListener modelCanGenerateChanged; private final JVetoableTabbedPane.ChangeSelectedIndex tabbedPaneWillChanged; - public SetDetailCompositionUIValidationHelper validationHelper; SetDetailCompositionUIHandler() { @@ -106,7 +105,6 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition @Override public void onInit(SetDetailCompositionUI ui) { - this.validationHelper = new SetDetailCompositionUIValidationHelper(ui); super.onInit(ui); ui.getSectionTemplatesTable().setCellSelectionEnabled(false); ui.get$objectMap().put(DefaultUIInitializer.SUB_TABBED_PANE, ui.getBranchlineDetailUI().getSubTabbedPane()); @@ -118,7 +116,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition @Override protected void installResetAction() { - ResetForm.installAction(ui, ui.getReset(), new DefaultResetAdapter<SetDetailCompositionUI>() { + ResetForm.installAction(ui, ui.getReset(), new DefaultResetAdapter<>() { @Override public void onUpdate(SetDetailCompositionUI ui) { BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); @@ -157,6 +155,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition Form<BranchlineDto> branchlineDtoForm = Form.newFormDto(BranchlineDto.class, null); BranchlineUIModel branchlineUIModel = model.getBranchlineUIModel(); + branchlineUIModel.setMode(model.getStates().getMode()); Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = ObserveBusinessProject.get().getOptionalFormDefinition(BranchlineDto.class); optionalFormDefinition.ifPresent(t -> branchlineObsUI.getModel().getReferenceCache().loadReferentialReferenceSetsInModel(t, true)); branchlineUIModel.setForm(branchlineDtoForm); @@ -171,7 +170,8 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition // TODO Use a cache of templates on setLongline (session scope) model.getSectionTemplatesTableModel().setData(new ArrayList<>()); - branchlineObsUI.edit(null); + BranchlineDto selectedRow = model.getBranchlinesTableModel().getSelectedRow(); + branchlineObsUI.edit(selectedRow); } @Override @@ -180,6 +180,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition SetDetailCompositionUIModel model = getModel(); List<SectionWithTemplateDto> section = SectionWithTemplateDto.getSectionTemplates(model.getStates().getBean().getSection()); model.getSectionsTableModel().setData(section); + SetDetailCompositionUIValidationHelper validationHelper = model.getValidationHelper(); validationHelper.setObjectValueAdjusting(true); try { model.getSectionTemplatesTableModel().onSectionTemplatesTableModelModified(false); @@ -306,10 +307,6 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition } } - public SetDetailCompositionUIValidationHelper getValidationHelper() { - return validationHelper; - } - protected void editBranchline(BranchlineDto branchline) { boolean changed = ui.getValidator().isChanged(); try { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModel.java ===================================== @@ -246,7 +246,7 @@ public class SetDetailCompositionUIModel extends GeneratedSetDetailCompositionUI public void init(ContentUI ui, DefaultUIInitializerResult initializerResult) { super.init(ui, initializerResult); SetDetailCompositionUI ui1 = (SetDetailCompositionUI) ui; - validationHelper = ui1.getHandler().getValidationHelper(); + validationHelper = new SetDetailCompositionUIValidationHelper(ui1); getSectionTemplatesTableModel().init(ui1); getSectionsTableModel().init(); getBasketsTableModel().init(ui1); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUIHandler.java ===================================== @@ -56,6 +56,15 @@ class SetGlobalCompositionUIHandler extends GeneratedSetGlobalCompositionUIHandl getContentOpen().initTabUI(ui.getBaitsCompositionUI(), ui.getBaitsCompositionPanel(), 3); } + @Override + public void onMainTabChanged(int previousIndex, int selectedIndex) { + super.onMainTabChanged(previousIndex, selectedIndex); + ui.getFloatlinesCompositionUI().getSelectToolbar().setVisible(selectedIndex == 0 && ui.getFloatlinesCompositionUI().getTableModel().getRowCount() > 1); + ui.getBranchlinesCompositionUI().getSelectToolbar().setVisible(selectedIndex == 1 && ui.getBranchlinesCompositionUI().getTableModel().getRowCount() > 1); + ui.getHooksCompositionUI().getSelectToolbar().setVisible(selectedIndex == 2 && ui.getHooksCompositionUI().getTableModel().getRowCount() > 1); + ui.getBaitsCompositionUI().getSelectToolbar().setVisible(selectedIndex == 3 && ui.getBaitsCompositionUI().getTableModel().getRowCount() > 1); + } + @Override protected void installResetAction() { ResetForm.installAction(ui, ui.getReset(), new DefaultResetAdapter<SetGlobalCompositionUI>() { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/CompositionAutoSelectRowAndShowPopupAction.java ===================================== @@ -26,7 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSi import fr.ird.observe.client.datasource.editor.api.content.ui.table.EditableTableModelSupport; import fr.ird.observe.client.datasource.editor.api.content.ui.table.popup.AutoSelectRowAndShowPopupActionSupport; import fr.ird.observe.client.datasource.editor.ll.data.observation.SetDetailCompositionUI; -import fr.ird.observe.dto.data.DataDto; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto; import javax.swing.JMenuItem; @@ -57,11 +57,11 @@ public class CompositionAutoSelectRowAndShowPopupAction extends AutoSelectRowAnd @Override protected void beforeOpenPopup(int modelRowIndex, int modelColumnIndex) { - @SuppressWarnings("unchecked") EditableTableModelSupport<DataDto> model = (EditableTableModelSupport<DataDto>) getTable().getModel(); + @SuppressWarnings("unchecked") EditableTableModelSupport<IdDto> model = (EditableTableModelSupport<IdDto>) getTable().getModel(); boolean selectionNotEmpty = !model.isSelectionEmpty(); boolean selectedRowIsNotEmpty = false; if (selectionNotEmpty) { - DataDto selectedData = model.getSelectedRow(); + IdDto selectedData = model.getSelectedRow(); selectedRowIsNotEmpty = model.isRowNotEmpty(selectedData); } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionUIValidationHelper.java ===================================== @@ -60,7 +60,7 @@ public class SetDetailCompositionUIValidationHelper { public SetDetailCompositionUIValidationHelper(SetDetailCompositionUI ui) { this.model = ui.getModel(); - this.errorTableModel = (ContentMessageTableModel) ui.getErrorTableModel(); + this.errorTableModel = ui.getErrorTableModel(); SwingValidator<SectionDto> sectionValidator = ui.getSectionValidator(); SwingValidator<BasketDto> basketValidator = ui.getBasketValidator(); SwingValidator<BranchlineDto> branchlineValidator = ui.getBranchlineValidator(); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/basket/BasketTableModel.java ===================================== @@ -60,7 +60,7 @@ public class BasketTableModel extends LonglineCompositionTableModelSupport<Baske } public void init(SetDetailCompositionUI ui) { - validationHelper = ui.getHandler().getValidationHelper(); + validationHelper = ui.getModel().getValidationHelper(); PropertyChangeListener basketsTableModelModified = evt -> { Boolean newValue = (Boolean) evt.getNewValue(); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/branchline/BranchlineTableModel.java ===================================== @@ -132,6 +132,8 @@ public class BranchlineTableModel extends LonglineCompositionTableModelSupport<B result = !isGenerateHaulingIds(); break; case 2: + case 3: + // can always change length ? result = true; break; default: ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@   - <lib.version.java4all.jaxx>3.0-alpha-85-SNAPSHOT</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0-alpha-85</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fb0090f8d4acbb49eb2c8c1b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fb0090f8d4acbb49eb2c8c1b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL][Logbook] Quadrant - Closes #1675
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fb0090f8 by Tony Chemit at 2020-12-17T22:52:49+01:00 [LL][Logbook] Quadrant - Closes #1675 - - - - - 2 changed files: - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml Changes: ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml ===================================== @@ -105,7 +105,7 @@ <field name="quadrant"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]> </param> <message>observe.data.Data.validation.required.quadrant</message> </field-validator> @@ -117,7 +117,7 @@ <field name="latitude"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]> </param> <message>observe.Id.validation.required.latitude</message> </field-validator> @@ -129,7 +129,7 @@ <field name="longitude"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]> </param> <message>observe.Id.validation.required.longitude</message> </field-validator> ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml ===================================== @@ -60,7 +60,7 @@ <field name="quadrant"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ quadrant != null || (latitude == null && longitude == null )]]> </param> <message>observe.data.Data.validation.required.quadrant</message> </field-validator> @@ -72,7 +72,7 @@ <field name="latitude"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ latitude != null || ( quadrant == null && longitude == null )]]> </param> <message>observe.Id.validation.required.latitude</message> </field-validator> @@ -84,7 +84,7 @@ <field name="longitude"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + <![CDATA[ longitude != null || ( quadrant == null && latitude == null )]]> </param> <message>observe.Id.validation.required.longitude</message> </field-validator> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fb0090f8d4acbb49eb2c8c1bb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fb0090f8d4acbb49eb2c8c1bb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL][Logbooks] Pêche / Onglet cyalumes - Closes #1677
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a64ad720 by Tony Chemit at 2020-12-17T22:43:45+01:00 [LL][Logbooks] Pêche / Onglet cyalumes - Closes #1677 - - - - - 1 changed file: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIHandler.java Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIHandler.java ===================================== @@ -118,19 +118,22 @@ class SetUIHandler extends GeneratedSetUIHandler { SetDto tableEditBean = getModel().getStates().getBean(); if (Objects.equals(true, newValue)) { - // depredated + // with lightsticks ui.getTotalLightsticksCount().setEnabled(true); ui.getLightsticksType().setEnabled(true); ui.getLightsticksColor().setEnabled(true); + ui.getLightsticksPerBasketCount().setEnabled(true); } else { - // not depredated + // without lightsticks ui.getTotalLightsticksCount().setEnabled(false); ui.getLightsticksType().setEnabled(false); ui.getLightsticksColor().setEnabled(false); + ui.getLightsticksPerBasketCount().setEnabled(false); tableEditBean.setTotalLightsticksCount(null); tableEditBean.setLightsticksType(null); tableEditBean.setLightsticksColor(null); + tableEditBean.setLightsticksPerBasketCount(null); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a64ad7200f18f562af17771bb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a64ad7200f18f562af17771bb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL][Logbook] Quadrant - Closes #1675
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a5ac56b6 by Tony Chemit at 2020-12-17T22:37:40+01:00 [LL][Logbook] Quadrant - Closes #1675 - - - - - 2 changed files: - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml Changes: ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml ===================================== @@ -103,18 +103,36 @@ </field-validator> </field> <field name="quadrant"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.data.Data.validation.required.quadrant</message> + </field-validator> <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentLlCommonTrip.ocean</param> <message/> </field-validator> </field> <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.Id.validation.required.latitude</message> + </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> </field-validator> </field> <field name="longitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.Id.validation.required.longitude</message> + </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml ===================================== @@ -56,19 +56,38 @@ <message/> </field-validator> </field> + <field name="quadrant"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.data.Data.validation.required.quadrant</message> + </field-validator> <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentLlCommonTrip.ocean</param> <message/> </field-validator> </field> <field name="latitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.Id.validation.required.latitude</message> + </field-validator> <field-validator type="coordinateLatitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> </field-validator> </field> <field name="longitude"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ quadrant != null || latitude != null || longitude != null ]]> + </param> + <message>observe.Id.validation.required.longitude</message> + </field-validator> <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">coordinate</param> <message/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a5ac56b6f5f569078b3ed0a3c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a5ac56b6f5f569078b3ed0a3c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [LL][Logbook] Quadrant - See #1675
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cc1912bb by Tony Chemit at 2020-12-17T22:13:26+01:00 [LL][Logbook] Quadrant - See #1675 ajout du validateur sur le quadrant - - - - - 63b22d79 by Tony Chemit at 2020-12-17T22:36:42+01:00 go to jaxx snapshot - - - - - 2 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - pom.xml Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx ===================================== @@ -55,6 +55,7 @@ errorTableModel='{getErrorTableModel()}' context='create'> <field name='longitude' component='coordinate'/> <field name='latitude' component='coordinate'/> + <field name='quadrant' component='coordinate'/> <field name='endDate' component='endTimeStamp'/> <field name='endTime' component='endTimeStamp'/> <field name='startDate' component='startTimeStamp'/> ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@   - + <lib.version.java4all.jaxx>3.0-alpha-85-SNAPSHOT</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fa41288eef2e2d823a2fb58b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fa41288eef2e2d823a2fb58b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: show error when can not load a content
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a2e34b84 by Tony Chemit at 2020-12-17T19:49:47+01:00 show error when can not load a content - - - - - fbf9c9d1 by Tony Chemit at 2020-12-17T19:50:24+01:00 Move editor is AbstractButton but not JButton - - - - - 947474e0 by Tony Chemit at 2020-12-17T21:12:11+01:00 Peux-ton afficher ici le racourcis F2 qui permet de basculer lecture/mise à jour ? - Closes #1674 - - - - - d2654a9a by Tony Chemit at 2020-12-17T21:14:52+01:00 Peux-ton afficher ici le racourcis F2 qui permet de basculer lecture/mise à jour ? - Closes #1674 La petite sœur F3 - - - - - 725d52c6 by Tony Chemit at 2020-12-17T21:29:16+01:00 Peux-ton afficher ici le racourcis F2 qui permet de basculer lecture/mise à jour ? - Closes #1674 et les petits frères Alft+F1 - - - - - 06056c4d by Tony Chemit at 2020-12-17T21:34:22+01:00 [LL][Logbooks] Impossible d'afficher le form Débarquements - Closes #1682 - - - - - cf8f0c51 by Tony Chemit at 2020-12-17T21:34:58+01:00 remove unnecessary super method call - - - - - 0ef804b0 by Tony Chemit at 2020-12-17T21:35:26+01:00 Avoid nasty NPe while quitting waiting to refactor focus API - - - - - e3b79bfd by Tony Chemit at 2020-12-17T21:35:41+01:00 remove unnecessary super method call - - - - - fa41288e by Tony Chemit at 2020-12-17T21:36:18+01:00 [LL][Logbooks] Impossible d'afficher le form Echantillons - Closes #1681 - - - - - 29 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleConfigure.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleInsert.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/CollapseAll.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ExpandAll.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoDown.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoNext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoPrevious.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoUp.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/NavigationConfigUIActionSupport.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUIHandler.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java ===================================== @@ -108,6 +108,7 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit } catch (Exception e) { setNoContent(); ui.getModel().setContent(null); + throw e; } finally { contentAdjusting = false; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -427,6 +427,9 @@ public abstract class ContentUIHandler implements ObserveSe if (newValue == null) { return; } + if (getClientUIContext().getMainUIModel() == null) { + return; + } if (getClientUIContext().getMainUIModel().isBlockFocus()) { return; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleConfigure.java ===================================== @@ -45,7 +45,7 @@ import static io.ultreia.java4all.i18n.I18n.n; public class ToggleConfigure extends ContentUIActionSupport { public ToggleConfigure() { - super(null, n("observe.ui.content.action.configure.tip"), "generate", ObserveKeyStrokesEditorApi.KEY_STROKE_NAVIGATION_CONFIGURE); + super("", n("observe.ui.content.action.configure.tip"), "generate", ObserveKeyStrokesEditorApi.KEY_STROKE_NAVIGATION_CONFIGURE); // setIcon(getContentScaledImage("configure")); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleInsert.java ===================================== @@ -44,7 +44,7 @@ import static io.ultreia.java4all.i18n.I18n.n; public class ToggleInsert extends ContentUIActionSupport { public ToggleInsert() { - super(null, n("observe.ui.content.action.insert.tip"), "add", ObserveKeyStrokesEditorApi.KEY_STROKE_INSERT_CONFIGURE); + super("", n("observe.ui.content.action.insert.tip"), "add", ObserveKeyStrokesEditorApi.KEY_STROKE_INSERT_CONFIGURE); // setIcon(getContentScaledImage("add",22)); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java ===================================== @@ -103,7 +103,7 @@ public class ChangeMode extends ContentUIActionSupport { } public ChangeMode(ChangeModeRequest request, ChangeModeProducer changeModeProducer, ChangeModeExecutor executor) { - super(null, null, null, ObserveKeyStrokesEditorApi.KEY_STROKE_CONTENT_CHANGE_MODE); + super("", null, null, ObserveKeyStrokesEditorApi.KEY_STROKE_CONTENT_CHANGE_MODE); this.request = Objects.requireNonNull(request); this.changeModeProducer = Objects.requireNonNull(changeModeProducer); this.executor = executor; @@ -229,6 +229,7 @@ public class ChangeMode extends ContentUIActionSupport { setIcon(icon); KeyStroke acceleratorKey = getAcceleratorKey(); if (!editable) { + removeKeyStrokeToText(); setKeyStroke(null); } updateToolTipText(tip); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java ===================================== @@ -32,7 +32,7 @@ import fr.ird.observe.client.datasource.editor.api.content.data.edit.ContentEdit import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUII18nHelper; import fr.ird.observe.dto.data.DataDto; -import javax.swing.JButton; +import javax.swing.AbstractButton; import java.awt.event.ActionEvent; import java.util.Objects; import java.util.function.BiConsumer; @@ -52,7 +52,7 @@ public final class MoveEdit<D extends DataDto, U extends ContentEditUI<D, U>> ex public static <D extends DataDto, U extends ContentEditUI<D, U>> void installAction(U ui, Supplier<MoveRequestBuilder.StepBuild> requestBuilderSupplier, Function<MoveRequest, BiConsumer<String, ImmutableSet<String>>> requestConsumer, Function<MoveRequest, MoveTreeAdapter> treeAdapter) { MoveExecutor moveExecutor = new MoveExecutor(requestBuilderSupplier, requestConsumer, treeAdapter); MoveEdit<D, U> action = new MoveEdit<>(ui.getModel().getSource().getScope().getMainType(), moveExecutor); - init(ui, (JButton) Objects.requireNonNull(ui).getObjectById("move"), action); + init(ui, (AbstractButton) Objects.requireNonNull(ui).getObjectById("move"), action); } protected MoveEdit(Class<D> dataType, MoveExecutor executor) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/CollapseAll.java ===================================== @@ -34,6 +34,7 @@ public class CollapseAll extends NavigationConfigUIActionSupport { public CollapseAll() { super(n("observe.ui.tree.action.collapseAll.tip"), "collapse", ObserveKeyStrokesEditorApi.KEY_STROKE_COLLAPSE_TREE_TABLE_NODE); + setText(null); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ExpandAll.java ===================================== @@ -34,6 +34,7 @@ public class ExpandAll extends NavigationConfigUIActionSupport { public ExpandAll() { super(n("observe.ui.tree.action.expandAll.tip"), "expand", ObserveKeyStrokesEditorApi.KEY_STROKE_EXPAND_TREE_TABLE_NODE); + setText(null); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoDown.java ===================================== @@ -51,6 +51,7 @@ public class GoDown extends NavigationConfigUIActionSupport implements ReloadAct public GoDown() { super(n("observe.ui.action.goDown.tip"), "navigate-down", ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN); + setText(null); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoNext.java ===================================== @@ -48,6 +48,7 @@ public class GoNext extends NavigationConfigUIActionSupport implements ReloadAct public GoNext() { super(n("observe.ui.tree.action.goNext.tip"), "navigate-next", ObserveKeyStrokesEditorApi.KEY_STROKE_GO_NEXT); + setText(null); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoPrevious.java ===================================== @@ -48,6 +48,7 @@ public class GoPrevious extends NavigationConfigUIActionSupport implements Reloa public GoPrevious() { super(n("observe.ui.tree.action.goPrevious.tip"), "navigate-previous", ObserveKeyStrokesEditorApi.KEY_STROKE_GO_PREVIOUS); + setText(null); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoUp.java ===================================== @@ -49,6 +49,7 @@ public class GoUp extends NavigationConfigUIActionSupport implements ReloadActio public GoUp() { super(n("observe.ui.action.goUp.tip"), "navigate-up", ObserveKeyStrokesEditorApi.KEY_STROKE_GO_UP); + setText(null); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/NavigationConfigUIActionSupport.java ===================================== @@ -49,7 +49,7 @@ abstract class NavigationConfigUIActionSupport extends JComponentActionSupport<N } NavigationConfigUIActionSupport(String shortDescription, String actionIcon, KeyStroke acceleratorKey) { - super(null, shortDescription, actionIcon, acceleratorKey); + super("", shortDescription, actionIcon, acceleratorKey); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx ===================================== @@ -20,7 +20,7 @@ <fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI beanScope="bean" i18n="fr.ird.observe.dto.data.ll.landing.LandingPartDto" superGenericType='LandingDto, LandingPartDto, LandingPartUI' - implements='fr.ird.observe.client.datasource.editor.api.content.NotStandaloneContentUI<LandingDto>'> + implements='fr.ird.observe.client.datasource.editor.api.content.NotStandaloneContentUI<LandingDto>, fr.ird.observe.client.datasource.editor.api.content.data.table.SortableTableUI'> <import> fr.ird.observe.dto.data.ll.landing.LandingDto ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx ===================================== @@ -174,5 +174,5 @@ </JPanel> <Object id="delegateContentUI" initializer="mainTabbedPane"/> - <ContentTableUIModelStates id='landingPartStates' genericType='LandingDto, LandingPartDto' initializer="getModel().getLandingPartUIModel().getStates()"/> + <ContentTableUIModelStates id='landingPartStates' genericType='LandingDto, LandingPartDto' initializer="landingPartUI.getModel().getStates()"/> </fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jcss ===================================== @@ -28,9 +28,9 @@ enabled:{!states.isReadingMode()}; } -#mainTabbedPane { +/*#mainTabbedPane { _focusComponent:{newComponentArray(dataSource,landingPartUI.getSpecies())}; -} +}*/ #landingPartUI { _tab:{"landingPartTab"}; ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.landing; * #L% */ +import fr.ird.observe.client.datasource.editor.api.content.ContentUIInitializer; import fr.ird.observe.dto.data.ll.landing.LandingDto; import fr.ird.observe.dto.referential.ll.landing.DataSourceReference; @@ -41,6 +42,12 @@ class LandingUIHandler extends GeneratedLandingUIHandler { dataSourceChanged = evt -> onDataSourceChanged((DataSourceReference) evt.getNewValue()); } + @Override + protected void onBeforeInit(LandingUI ui, ContentUIInitializer<LandingUI> initializer) { + LandingPartUIModel partUIModel = LandingPartUIModel.create(ui); + initializer.registerDependencies(partUIModel); + } + @Override public void onInit(LandingUI ui) { super.onInit(ui); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUI.jaxx ===================================== @@ -61,7 +61,7 @@ </JPanel> <Object id="delegateContentUI" initializer="samplePartPanel"/> - <ContentTableUIModelStates id='samplePartStates' genericType='SampleDto, SamplePartDto' initializer="getModel().getSamplePartUIModel().getStates()"/> + <ContentTableUIModelStates id='samplePartStates' genericType='SampleDto, SamplePartDto' initializer="samplePartUI.getModel().getStates()"/> <JMenuItem id='move' styleClass="ifOpen"/> </fr.ird.observe.client.datasource.editor.api.content.data.edit.ContentEditUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUIHandler.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook; * #L% */ +import fr.ird.observe.client.datasource.editor.api.content.ContentUIInitializer; import fr.ird.observe.client.datasource.editor.api.content.actions.move.MoveRequestBuilder; import fr.ird.observe.client.datasource.editor.api.content.data.edit.ContentEditUILayoutFocusTraversalPolicy; import fr.ird.observe.client.datasource.editor.api.content.data.edit.actions.MoveEdit; @@ -41,6 +42,11 @@ import java.awt.Container; * @since 3.8 */ public class ActivitySampleUIHandler extends GeneratedActivitySampleUIHandler { + @Override + protected void onBeforeInit(ActivitySampleUI ui, ContentUIInitializer<ActivitySampleUI> initializer) { + SamplePartUIModel partUIModel = SamplePartUIModel.create(ui); + initializer.registerDependencies(partUIModel); + } @Override public void onInit(ActivitySampleUI ui) { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIModel.java ===================================== @@ -57,6 +57,7 @@ public class SamplePartUIModel extends GeneratedSamplePartUIModel { public static SamplePartUIModel create(ActivitySampleUI parentUI) { ActivitySampleUINavigationNode parentSource = ActivitySampleUI.getNavigationSource(parentUI); SamplePartUINavigationNode node = parentSource.newTableNode(SamplePartUINavigationNode.class, parentSource.getParentReference()); + node.setParent(parentSource); return new SamplePartUIModel(node, parentUI.getBean()); } @@ -114,7 +115,6 @@ public class SamplePartUIModel extends GeneratedSamplePartUIModel { @Override public void onAfterInitAddReferentialFilters(ClientConfig clientConfig, ObserveServicesProvider servicesProvider, ReferencesCache referenceCache) { referenceCache.addReferentialFilter(SamplePartDto.PROPERTY_SPECIES, ReferencesFilterHelper.newLlSpeciesList(servicesProvider, getClientUIContext().getObserveSelectModel(), clientConfig.getSpeciesListLonglineLogbookSampleId())); - } public SampleUIModelSupport<SamplePartDto> getSupport() { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUI.jaxx ===================================== @@ -97,5 +97,5 @@ </JPanel> <Object id="delegateContentUI" initializer="mainTabbedPane"/> - <ContentTableUIModelStates id='samplePartStates' genericType='SampleDto, SamplePartDto' initializer="getModel().getSamplePartUIModel().getStates()"/> + <ContentTableUIModelStates id='samplePartStates' genericType='SampleDto, SamplePartDto' initializer="samplePartUI.getModel().getStates()"/> </fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIHandler.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook; */ import fr.ird.observe.client.datasource.editor.api.content.ContentMode; +import fr.ird.observe.client.datasource.editor.api.content.ContentUIInitializer; import fr.ird.observe.client.datasource.editor.api.content.actions.move.tree.DefaultSingleMoveTreeAdapter; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUILayoutFocusTraversalPolicy; import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.MoveOpenable; @@ -39,6 +40,11 @@ import java.awt.Container; * @since 3.8 */ class SampleUIHandler extends GeneratedSampleUIHandler { + @Override + protected void onBeforeInit(SampleUI ui, ContentUIInitializer<SampleUI> initializer) { + SamplePartUIModel partUIModel = SamplePartUIModel.create(ui); + initializer.registerDependencies(partUIModel); + } @Override public void onInit(SampleUI ui) { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUIHandler.java ===================================== @@ -40,7 +40,6 @@ class SetGlobalCompositionUIHandler extends GeneratedSetGlobalCompositionUIHandl @Override protected void onBeforeInit(SetGlobalCompositionUI ui, ContentUIInitializer<SetGlobalCompositionUI> initializer) { - super.onBeforeInit(ui, initializer); initializer.registerDependencies( SetFloatlinesCompositionUIModel.create(ui), SetBranchlinesCompositionUIModel.create(ui), ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java ===================================== @@ -96,7 +96,6 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition @Override protected void onBeforeInit(SetDetailCompositionUI ui, ContentUIInitializer<SetDetailCompositionUI> initializer) { - super.onBeforeInit(ui, initializer); initializer.registerDependencies(BranchlineUIModel.create(ui)); } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUIHandler.java ===================================== @@ -40,7 +40,6 @@ class SetGlobalCompositionUIHandler extends GeneratedSetGlobalCompositionUIHandl @Override protected void onBeforeInit(SetGlobalCompositionUI ui, ContentUIInitializer<SetGlobalCompositionUI> initializer) { - super.onBeforeInit(ui, initializer); initializer.registerDependencies( SetFloatlinesCompositionUIModel.create(ui), SetBranchlinesCompositionUIModel.create(ui), ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUIHandler.java ===================================== @@ -51,7 +51,6 @@ public class DiscardedTargetSampleUIHandler extends GeneratedDiscardedTargetSamp @Override protected void onBeforeInit(DiscardedTargetSampleUI ui, ContentUIInitializer<DiscardedTargetSampleUI> initializer) { - super.onBeforeInit(ui, initializer); initializer.registerDependencies(sampleHandler = new TargetSampleImplHandler<>(ui)); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUIHandler.java ===================================== @@ -51,7 +51,6 @@ public class KeptTargetSampleUIHandler extends GeneratedKeptTargetSampleUIHandle @Override protected void onBeforeInit(KeptTargetSampleUI ui, ContentUIInitializer<KeptTargetSampleUI> initializer) { - super.onBeforeInit(ui, initializer); sampleHandler = new TargetSampleImplHandler<>(ui); initializer.registerDependencies(sampleHandler); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUIHandler.java ===================================== @@ -39,7 +39,6 @@ public class NonTargetSampleUIHandler extends GeneratedNonTargetSampleUIHandler @Override protected void onBeforeInit(NonTargetSampleUI ui, ContentUIInitializer<NonTargetSampleUI> initializer) { - super.onBeforeInit(ui, initializer); sampleHandler = new NonTargetSampleImplHandler(ui); ui.setContextValue(sampleHandler); } ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUIHandler.java ===================================== @@ -57,7 +57,6 @@ public class GenerateContentTableUIHandler extends GenerateContentTableUISupport public static final String NOT_STANDALONE_METHODS = "" + " @Override\n" + " protected void onBeforeInit(%1$s ui, ContentUIInitializer<%1$s> initializer) {\n" + - " super.onBeforeInit(ui, initializer);\n" + " EditableContentUI<%2$s> parentUI = initializer.getParentEditUI();\n" + " %1$sModel model = parentUI.getContextValue(%1$sModel.class);\n" + " initializer.registerDependencies(model, new %1$sTableModel(parentUI, ui, model));\n" + View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/01f6ceba96c8fadf630a7f9c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/01f6ceba96c8fadf630a7f9c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Let's generate add edit node :)
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 01f6ceba by Tony Chemit at 2020-12-17T18:19:56+01:00 Let's generate add edit node :) for special case FOB now we are doing the preset selection in his form and stop pushing in some dark contexts some reference grab later by another handler) : do all the stuff at the right place, and then remove dark references :) - - - - - 13 changed files: - client/configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModel.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/ContentNodeType.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIHandlerHelper.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java ===================================== @@ -50,7 +50,6 @@ public class FloatingObjectPresetsManager { private final ClientConfig config; private Map<Path, FloatingObjectPreset> psObservation; private Map<Path, FloatingObjectPreset> psLogbook; - private FloatingObjectPreset referenceToUse; public FloatingObjectPresetsManager(ClientConfig config) { this.config = Objects.requireNonNull(config); @@ -87,7 +86,6 @@ public class FloatingObjectPresetsManager { default: throw new IllegalStateException("Can't deal with model: " + model); } - try { Path nextFilename = FloatingObjectPresetStorage.getNextFilename(directory); Path file = directory.resolve(nextFilename); @@ -100,14 +98,6 @@ public class FloatingObjectPresetsManager { } } - public FloatingObjectPreset getReferenceToUse() { - return referenceToUse; - } - - public void setReferenceToUse(FloatingObjectPreset referenceToUse) { - this.referenceToUse = referenceToUse; - } - public int size() { return getPsLogbook().size() + getPsObservation().size(); } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx ===================================== @@ -24,6 +24,7 @@ <import> fr.ird.observe.dto.data.ll.logbook.ActivityDto fr.ird.observe.dto.data.ll.logbook.SetDto + fr.ird.observe.dto.data.ll.observation.ActivityReference fr.ird.observe.dto.data.ll.pairing.ActivityPairingResultItem fr.ird.observe.dto.referential.common.FpaZoneReference fr.ird.observe.dto.referential.common.WindReference @@ -170,7 +171,7 @@ <JLabel id='relatedObservedActivityLabel'/> </cell> <cell anchor='east' fill="both"> - <JaxxComboBox id='relatedObservedActivity' genericType='fr.ird.observe.dto.data.ll.observation.ActivityReference' constructorParams='this'/> + <JaxxComboBox id='relatedObservedActivity' genericType='ActivityReference' constructorParams='this'/> </cell> </row> @@ -183,10 +184,7 @@ </Table> </JScrollPane> </JPanel> - -  <JButton id='actionDown'/> - <JMenuItem id='addSet'/> <JMenuItem id='addSample'/> </fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java ===================================== @@ -22,18 +22,8 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook; * #L% */ -import fr.ird.observe.client.datasource.editor.api.content.ContentUIInitializer; -import fr.ird.observe.client.datasource.editor.api.content.actions.open.ContentOpen; -import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUIOpenExecutor; import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveOpenable; -import fr.ird.observe.client.util.init.DefaultUIInitializerResult; import fr.ird.observe.dto.data.ll.logbook.ActivityDto; -import fr.ird.observe.dto.data.ll.logbook.SampleDto; -import fr.ird.observe.dto.data.ll.logbook.SetDto; -import fr.ird.observe.dto.form.Form; -import fr.ird.observe.services.service.data.ll.pairing.ActivityPairingEngine; - -import java.util.List; /** * Created on 8/29/14. @@ -43,43 +33,6 @@ import java.util.List; */ class ActivityUIHandler extends GeneratedActivityUIHandler { - private ActivityPairingEngine pairingEngine; - - @Override - protected ContentOpen<ActivityUI> createContentOpen(ActivityUI ui) { - ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI> executor = new ContentOpenableUIOpenExecutor<>() { - @Override - public void openModel(ActivityUI ui) { - ActivityUIModel model = getModel(); - List<fr.ird.observe.dto.data.ll.observation.ActivityReference> allActivityLonglineObs = getLlObservationActivityService().getChildren(model.getStates().getSelectedParentId()).toList(); - Form<ActivityDto> form = model.openForm(allActivityLonglineObs, pairingEngine); - onOpenForm(form); - onOpenAfterOpenModel(); - } - }; - return new ContentOpen<>(ui, executor, executor) { - @Override - public DefaultUIInitializerResult init(ContentUIInitializer<ActivityUI> initializer) { - //FIXME Bug in Jaxx - this.getUi().getRelatedObservedActivity().setBeanType(fr.ird.observe.dto.data.ll.observation.ActivityReference.class); - return super.init(initializer); - } - }; - } - - @Override - public void onInit(ActivityUI ui) { - super.onInit(ui); - pairingEngine = new ActivityPairingEngine(getClientConfig().getReferentialLocale(), getLlCommonTripService(), getLlLogbookActivityService()); - } - - @Override - protected void installCreateNewAction() { - super.installCreateNewAction(); - installCreateNewEditableAction(SetDto.class, getModel().getSource()::addEmptySetUINavigationNode); - installCreateNewEditableAction(SampleDto.class, getModel().getSource()::addEmptyActivitySampleUINavigationNode); - } - @Override protected void installSaveAction() { SaveOpenable.installAction(ui, ActivityDto::isSetOperation, ActivityUI::getAddSet); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModel.java ===================================== @@ -59,7 +59,6 @@ public class ActivityUIModel extends GeneratedActivityUIModel { private static final Logger log = LogManager.getLogger(ActivityUIModel.class); - private boolean opening = false; private List<ActivityReference> activityObs; private TripPairingContext pairingContext; @@ -68,22 +67,19 @@ public class ActivityUIModel extends GeneratedActivityUIModel { getStates().getBean().attachSetOperationListener(); getStates().getBean().addPropertyChangeListener(evt -> { String propertyName = evt.getPropertyName(); - if (opening || !PROPERTIES_FOR_UPDATE_ACTIVITIES_OBS_LIST.contains(propertyName)) { + if (!getStates().isOpened() || !PROPERTIES_FOR_UPDATE_ACTIVITIES_OBS_LIST.contains(propertyName)) { return; } updateActivityObsCandidates(); }); } - public Form<ActivityDto> openForm(List<ActivityReference> allActivityObs, ActivityPairingEngine pairingEngine) { + @Override + public Form<ActivityDto> openForm(String selectedId) { + List<fr.ird.observe.dto.data.ll.observation.ActivityReference> allActivityObs = getReferenceCache().getDataSource().getLlObservationActivityService().getChildren(getStates().getSelectedParentId()).toList(); + ActivityPairingEngine pairingEngine = new ActivityPairingEngine(getClientUIContext().getClientConfig().getReferentialLocale(), getReferenceCache().getDataSource().getLlCommonTripService(), getReferenceCache().getDataSource().getLlLogbookActivityService()); this.pairingContext = pairingEngine.newTripContext(getStates().getSelectedParentId(), ImmutableList.copyOf(allActivityObs)); - opening = true; - Form<ActivityDto> form; - try { - form = super.openForm(getStates().getSelectedId()); - } finally { - opening = false; - } + Form<ActivityDto> form = super.openForm(selectedId); updateActivityObsCandidates(); return form; } @@ -97,14 +93,14 @@ public class ActivityUIModel extends GeneratedActivityUIModel { this.activityObs = Objects.requireNonNull(activityObs); boolean removeRelatedObservedActivity = relatedObservedActivity != null && !activityObs.contains(relatedObservedActivity); firePropertyChange(PROPERTY_ACTIVITY_OBS, null, activityObs); - if (removeRelatedObservedActivity) { + if (getStates().isOpened() && removeRelatedObservedActivity) { log.info(String.format("%s Removed not matching related observed activity: %s", getPrefix(), relatedObservedActivity)); getStates().getBean().setRelatedObservedActivity(null); } } private void updateActivityObsCandidates() { - if (opening) { + if (!getStates().isOpened()) { return; } log.info(String.format("%s Will update release observed activities...", getPrefix())); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUIHandler.java ===================================== @@ -24,7 +24,6 @@ package fr.ird.observe.client.datasource.editor.ll.data.observation; import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveOpenable; import fr.ird.observe.dto.data.ll.observation.ActivityDto; -import fr.ird.observe.dto.data.ll.observation.SetDto; /** * Created on 8/29/14. @@ -40,12 +39,6 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { super.onInit(ui); } - @Override - protected void installCreateNewAction() { - super.installCreateNewAction(); - installCreateNewEditableAction(SetDto.class, getModel().getSource()::addEmptySetUINavigationNode); - } - @Override protected void installSaveAction() { SaveOpenable.installAction(ui, ActivityDto::isSetOperation, ActivityUI::getAddSet); ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java ===================================== @@ -21,34 +21,12 @@ */ package fr.ird.observe.client.datasource.editor.ps.data.observation; -import fr.ird.observe.client.ClientUIContext; -import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManager; import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveOpenable; -import fr.ird.observe.client.datasource.editor.ps.ObservePsKeyStrokes; -import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPreset; -import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPresetModel; import fr.ird.observe.dto.data.ps.observation.ActivityDto; -import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; -import fr.ird.observe.dto.data.ps.observation.SetDto; -import fr.ird.observe.dto.decoration.WithDecoratorService; import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import javax.swing.AbstractAction; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.KeyStroke; -import java.awt.Font; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; import java.util.List; -import java.util.Objects; -import java.util.Set; -import static fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageUIHandlerSupport.findButton; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -57,36 +35,6 @@ import static io.ultreia.java4all.i18n.I18n.t; */ class ActivityUIHandler extends GeneratedActivityUIHandler { - private static final Logger log = LogManager.getLogger(ActivityUIHandler.class); - - private static class UsePresetAction extends AbstractAction implements WithDecoratorService { - - private final FloatingObjectPreset preset; - private final KeyStroke keyStroke; - private JOptionPane pane; - - public UsePresetAction(FloatingObjectPreset preset, int index) { - this.preset = Objects.requireNonNull(preset); - this.keyStroke = Objects.requireNonNull(KeyStroke.getKeyStroke("F" + index)); - putValue(UsePresetAction.class.getName(), getClass().getName() + "_" + index); - putValue(NAME, getDecoratorService().getDecoratorByType(preset.getClass()).toString(preset)); - } - - public void install(JButton parent, JOptionPane pane) { - this.pane = pane; - String actionMapKey = (String) getValue(UsePresetAction.class.getName()); - pane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(keyStroke, actionMapKey); - pane.getActionMap().put(actionMapKey, this); - ObservePsKeyStrokes.addKeyStroke(parent, keyStroke); - } - - @Override - public void actionPerformed(ActionEvent e) { - log.info(String.format("Choose dcp preset: %s", preset.getLabel1())); - pane.setValue(preset); - } - } - @Override public void onInit(ActivityUI ui) { super.onInit(ui); @@ -96,64 +44,22 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { ui.vesselActivityInformation.setToolTipText(text); } - @Override - protected void installCreateNewAction() { - super.installCreateNewAction(); - installCreateNewEditableAction(SetDto.class, ui.getModel().getSource()::addEmptySetUINavigationNode); - installCreateNewEditableAction(FloatingObjectDto.class, this::chooseFloatingObjectPreset, ui.getModel().getSource()::addEmptyFloatingObjectUINavigationNode); - } - @Override protected void installSaveAction() { SaveOpenable.installAction(ui, ActivityDto::isStrongSetOperation, ActivityUI::getAddSet); } private String getActivity6Label() { - List<VesselActivityReference> activities = getReferentialReferences(VesselActivityReference.class); - for (VesselActivityReference vesselActivity : activities) { if (ActivityDto.isFishingOperation(vesselActivity)) { - return getDecoratorService().getReferentialReferenceDecorator(VesselActivityReference.class).toString(vesselActivity); + return vesselActivity.toString(); +// return getDecoratorService().getReferentialReferenceDecorator(VesselActivityReference.class).toString(vesselActivity); } } throw new IllegalStateException(t("observe.data.ps.observation.Activity.error.no.activity.6")); } - private boolean chooseFloatingObjectPreset(ActivityDto bean) { - - FloatingObjectPresetsManager floatingObjectPresetsManager = getClientUIContext().getFloatingObjectPresetsManager(); - Set<FloatingObjectPreset> psObservation = floatingObjectPresetsManager.getPresets(FloatingObjectPresetModel.ps_observation); - if (!psObservation.isEmpty()) { - - JPanel userConfigs = new JPanel(new GridLayout(0, 2)); - - String replaceText = t("observe.ui.choice.dcp.default") + " (Enter)"; - Object[] options = {replaceText}; - JOptionPane pane = new JOptionPane(userConfigs, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); - JButton jButton = Objects.requireNonNull(findButton(pane, replaceText)); - Font font = jButton.getFont().deriveFont(18f); - jButton.setFont(font.deriveFont(Font.ITALIC)); - int index = 0; - for (FloatingObjectPreset preset : psObservation) { - UsePresetAction a = new UsePresetAction(preset, ++index); - JButton b = new JButton(a); - b.setFont(font); - userConfigs.add(b); - a.install(b, pane); - } - int response = ClientUIContext.askUser(pane, t("observe.data.ps.observation.FloatingObjectReference.choose.title"), options); - Object value = pane.getValue(); - if (value instanceof FloatingObjectPreset) { - floatingObjectPresetsManager.setReferenceToUse((FloatingObjectPreset) value); - } else { - return response != JOptionPane.CLOSED_OPTION; - } - } - return true; - } - - // @Override // protected ContentOpenableUILayoutFocusTraversalPolicy<ActivityUI> createFocusTraversalPolicy() { // return new ContentOpenableUILayoutFocusTraversalPolicy<ActivityUI>() { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIModel.java ===================================== @@ -44,15 +44,6 @@ public class ActivityUIModel extends GeneratedActivityUIModel { boolean newValue = ActivityDto.isChangedZoneOperation(newActivitySeine); firePropertyChange(PROPERTY_CHANGED_ZONE_OPERATION, oldValue, newValue); }); - - } - - public boolean isSetOperation() { - return getStates().getBean().isSetOperation(); - } - - public boolean isDcpOperation() { - return getStates().getBean().isDcpOperation(); } public boolean isChangedZoneOperation() { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jcss ===================================== @@ -35,6 +35,10 @@ enabled:{model.isLeaving() && model.isArriving()}; } +#addFloatingObjectPreset { + enabled:{states.isUpdatingMode() && getModel().getReference() == null}; +} + #objectOperation { enabled:{states.isCreatingMode()}; } @@ -68,11 +72,6 @@ text:{model.getComputedWhenLeavingSimplifiedObjectTypeValue()}; } -/*#addFloatingObjectReference { - visible:{states.isUpdatingMode()}; - focusable:false; -}*/ - #typeOperation { selectedItem:{bean.getTypeTransmittingBuoyOperation()}; _skipBindingToBean:true; ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIHandler.java ===================================== @@ -280,29 +280,21 @@ public class FloatingObjectUIHandler extends GeneratedFloatingObjectUIHandler { TransmittingBuoyDto transmittingBuoy) { if (transmittingBuoy == null) { - TransmittingBuoyDto.newDto(new Date()).copy(editBean); editBean.setCreateDate(new Date()); editBean.setTransmittingBuoyOperation(operation); - log.debug(String.format("Reuse an empty balise lue for objectOperation %s", operation.getLabel())); - if (isBalisePose(operation)) { - // objectOperation de pose // toujours appartient au navire TransmittingBuoyOwnershipReference r = getModel().getReferenceCache().<TransmittingBuoyOwnershipReference>tryGetReferentialReferenceById(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OWNERSHIP, ProtectedIdsPs.PS_COMMON_TRANSMITTING_BUOY_OWNERSHIP_THIS_SHIP_ID).orElse(null); log.info("Using ownership this vessel: " + r); editBean.setTransmittingBuoyOwnership(r); } - } else { - editBean.copy(transmittingBuoy); // TransmittingBuoyHelper.copyTransmittingBuoyDto(editBean, transmittingBuoy); - } - getModel().getStates().getBean().getTransmittingBuoy().add(editBean); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModel.java ===================================== @@ -23,16 +23,22 @@ package fr.ird.observe.client.datasource.editor.ps.data.observation; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.WithClientUIContext; +import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManager; +import fr.ird.observe.client.datasource.editor.ps.ObservePsKeyStrokes; import fr.ird.observe.dto.I18nEnumHelper; import fr.ird.observe.dto.data.ps.DcpComputedValue; import fr.ird.observe.dto.data.ps.consolidate.dcp.ConsolidateFloatingObjectResult; import fr.ird.observe.dto.data.ps.consolidate.dcp.SimplifiedObjectTypeSpecializedRules; import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPreset; +import fr.ird.observe.dto.data.ps.dcp.FloatingObjectPresetModel; +import fr.ird.observe.dto.data.ps.observation.ActivityDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.data.ps.observation.TransmittingBuoyDto; import fr.ird.observe.dto.data.ps.observation.consolidate.ConsolidateFloatingObjectRequest; +import fr.ird.observe.dto.decoration.WithDecoratorService; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.form.FormDefinition; import fr.ird.observe.dto.referential.ReferentialLocale; @@ -42,6 +48,15 @@ import fr.ird.observe.spi.module.ObserveBusinessProject; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.swing.AbstractAction; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.KeyStroke; +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; import java.io.File; import java.io.IOException; import java.util.Date; @@ -53,6 +68,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import static fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageUIHandlerSupport.findButton; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -85,6 +101,34 @@ public class FloatingObjectUIModel extends GeneratedFloatingObjectUIModel implem this.whenLeaving = new LinkedHashMap<>(); } + private static class UsePresetAction extends AbstractAction implements WithDecoratorService { + + private final FloatingObjectPreset preset; + private final KeyStroke keyStroke; + private JOptionPane pane; + + public UsePresetAction(FloatingObjectPreset preset, int index) { + this.preset = Objects.requireNonNull(preset); + this.keyStroke = Objects.requireNonNull(KeyStroke.getKeyStroke("F" + index)); + putValue(UsePresetAction.class.getName(), getClass().getName() + "_" + index); + putValue(NAME, getDecoratorService().getDecoratorByType(preset.getClass()).toString(preset)); + } + + public void install(JButton parent, JOptionPane pane) { + this.pane = pane; + String actionMapKey = (String) getValue(UsePresetAction.class.getName()); + pane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(keyStroke, actionMapKey); + pane.getActionMap().put(actionMapKey, this); + ObservePsKeyStrokes.addKeyStroke(parent, keyStroke); + } + + @Override + public void actionPerformed(ActionEvent e) { + log.info(String.format("Choose dcp preset: %s", preset.getLabel1())); + pane.setValue(preset); + } + } + public ImmutableSet<FloatingObjectPartDto> toParts() { ImmutableSet.Builder<FloatingObjectPartDto> result = ImmutableSet.builder(); Date now = new Date(); @@ -131,13 +175,14 @@ public class FloatingObjectUIModel extends GeneratedFloatingObjectUIModel implem @Override public void open() { - Optional<FloatingObjectPreset> floatingObjectReference = Optional.ofNullable(getClientUIContext().getFloatingObjectPresetsManager().getReferenceToUse()); - setReference(floatingObjectReference.orElse(null)); if (reference != null) { log.info(String.format("%s Will use dcp preset: %s", getPrefix(), reference)); } - getClientUIContext().getFloatingObjectPresetsManager().setReferenceToUse(null); super.open(); + if (getStates().isCreatingMode()) { + FloatingObjectPreset reference = chooseFloatingObjectPreset(); + setReference(reference); + } } @Override @@ -152,6 +197,37 @@ public class FloatingObjectUIModel extends GeneratedFloatingObjectUIModel implem fireComputedValuesChanged(); } + private FloatingObjectPreset chooseFloatingObjectPreset() { + + FloatingObjectPresetsManager floatingObjectPresetsManager = getClientUIContext().getFloatingObjectPresetsManager(); + Set<FloatingObjectPreset> psObservation = floatingObjectPresetsManager.getPresets(FloatingObjectPresetModel.ps_observation); + if (!psObservation.isEmpty()) { + + JPanel userConfigs = new JPanel(new GridLayout(0, 2)); + + String replaceText = t("observe.ui.choice.dcp.default") + " (Enter)"; + Object[] options = {replaceText}; + JOptionPane pane = new JOptionPane(userConfigs, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); + JButton jButton = Objects.requireNonNull(findButton(pane, replaceText)); + Font font = jButton.getFont().deriveFont(18f); + jButton.setFont(font.deriveFont(Font.ITALIC)); + int index = 0; + for (FloatingObjectPreset preset : psObservation) { + UsePresetAction a = new UsePresetAction(preset, ++index); + JButton b = new JButton(a); + b.setFont(font); + userConfigs.add(b); + a.install(b, pane); + } + ClientUIContext.askUser(pane, t("observe.data.ps.observation.FloatingObjectReference.choose.title"), options); + Object value = pane.getValue(); + if (value instanceof FloatingObjectPreset) { + return (FloatingObjectPreset) value; + } + } + return null; + } + public void fireComputedValuesChanged() { firePropertyChange("computedWhenArrivingBiodegradableValue", getComputedWhenArrivingBiodegradableValue()); firePropertyChange("computedWhenArrivingNonEntanglingValue", getComputedWhenArrivingNonEntanglingValue()); @@ -244,7 +320,6 @@ public class FloatingObjectUIModel extends GeneratedFloatingObjectUIModel implem return arriving; } - public void setArriving(boolean arriving) { this.arriving = arriving; log.debug("setArriving: " + arriving); @@ -301,4 +376,5 @@ public class FloatingObjectUIModel extends GeneratedFloatingObjectUIModel implem map.put(dto, value); } } + } ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java ===================================== @@ -111,6 +111,8 @@ public class CapabilityDescriptor { " }\n"; public static final String INSTALL_CREATE_NEW_TABLE_ACTION = "" + " installCreateNewTableEntryAction(%1$s.class);\n"; + public static final String INSTALL_CREATE_NEW_EDIT_ACTION = "" + + " installCreateNewEditableAction(%1$sDto.class, getModel().getSource()::addEmpty%2$s);\n"; public static final String INSTALL_CREATE_NEW_ACTION = "" + " installCreateNewOpenableAction(t-> true);\n"; public static final String INSTALL_CREATE_NEW_ACTION_WITH_PREDICATE = "" + @@ -386,8 +388,12 @@ public class CapabilityDescriptor { case TABLE: imports.add(CreateNewContentTableUIEntry.class.getName()); return String.format(INSTALL_CREATE_NEW_TABLE_ACTION, getNodeTypeName()); + case EDIT: - break; + if (dtoType!=null) { + imports.add(dtoType.getName()); + return String.format(INSTALL_CREATE_NEW_EDIT_ACTION, dtoType.getSimpleName().replace("Dto", ""), getNodeTypeSimpleName()); + } case SIMPLE: case ROOT: case REFERENTIAL_HOME: ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/ContentNodeType.java ===================================== @@ -156,7 +156,7 @@ public enum ContentNodeType { public Class<? extends IdDto> getDto(BusinessProject businessProject, String nodeTypeName) { - return null; + return getDto0(businessProject, nodeTypeName); } Class<? extends IdDto> getDto0(BusinessProject businessProject, String nodeTypeName) { ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIHandlerHelper.java ===================================== @@ -91,8 +91,15 @@ public class ContentUIHandlerHelper extends ContentUIHelperSupport { } if (generator.capabilitiesDescriptor != null) { for (CapabilityDescriptor capabilityDescriptor : generator.capabilitiesDescriptor) { - if (editNode != null && editNode.getType().equals(capabilityDescriptor.getOptionalDtoType())) { - continue; + + ContentNodeType contentNodeType = capabilityDescriptor.getContentNodeType(); + + Class<? extends IdDto> optionalDtoType = capabilityDescriptor.getOptionalDtoType(); + + if (editNode != null) { + if (editNode.getType().equals(optionalDtoType)) { + continue; + } } String method = capabilityDescriptor.generateAddNewAction(imports, generator); createChildrenMethodBuilder.append(method); @@ -160,6 +167,11 @@ public class ContentUIHandlerHelper extends ContentUIHelperSupport { } extraMethods += generateListCreateNewAction(imports, generator); extraMethods += String.format(INSTALL_MOVE_ACTION, methodName); + generator.capabilitiesDescriptor.forEach(c-> { + if (c.getContentNodeType()==ContentNodeType.EDIT) { + // add + } + }); return generate(ContentUIHandlerHelper.UI_HANDLER_GENERATED2, imports, generator.cleanClassName, uiHandler, dtoType, extraType, extraMethods); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/01f6ceba96c8fadf630a7f9cd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/01f6ceba96c8fadf630a7f9cd… You're receiving this email because of your account on gitlab.com.

1 0