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/5606957a4fa845850bca88895... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5606957a4fa845850bca88895... You're receiving this email because of your account on gitlab.com.