Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

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;
    33 33 
      * @since 8.0
    34 34 
      */
    35 35 
     public class ObserveLLKeyStrokes extends ObserveKeyStrokesEditorApi {
    36 
    -    public static final KeyStroke KEY_STROKE_COPY_VALUES_AND_SAVE = KeyStroke.getKeyStroke("ctrl pressed T");
    37 
    -    public static final KeyStroke KEY_STROKE_SELECT_TRANSSHIPMENT = KeyStroke.getKeyStroke("ctrl pressed T");
    38 
    -    public static final KeyStroke KEY_STROKE_RESET_BRANCHLINE = KeyStroke.getKeyStroke("ctrl pressed Z");
    39 
    -    public static final KeyStroke KEY_STROKE_SAVE_BRANCHLINE = KeyStroke.getKeyStroke("ctrl pressed G");
    40 
    -    public static final KeyStroke KEY_STROKE_GENERATE_ID = KeyStroke.getKeyStroke("ctrl pressed G");
    36 
    +    public static final KeyStroke KEY_STROKE_COPY_VALUES_AND_SAVE = KeyStroke.getKeyStroke("pressed F9");
    37 
    +    public static final KeyStroke KEY_STROKE_SELECT_TRANSSHIPMENT = KeyStroke.getKeyStroke("alt pressed T");
    38 
    +    public static final KeyStroke KEY_STROKE_RESET_BRANCHLINE = KeyStroke.getKeyStroke("alt pressed Z");
    39 
    +    public static final KeyStroke KEY_STROKE_SAVE_BRANCHLINE = KeyStroke.getKeyStroke("alt pressed G");
    40 
    +    public static final KeyStroke KEY_STROKE_GENERATE_ID = KeyStroke.getKeyStroke("alt pressed G");
    41 41 
     }

  • 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 {
    54 54 
             copySetCandidates = form.getObject().getOtherSets().stream()
    55 55 
                     .sorted(Comparator.comparing(SetStubDto::getSettingStartTimeStamp))
    56 56 
                     .collect(Collectors.toList());
    57 
    -        addPropertyChangeListener(SetDto.PROPERTY_SETTING_START_TIME_STAMP, e -> updateCopySetCandidate((Date) e.getNewValue()));
    57 
    +        getStates().getBean().addPropertyChangeListener(SetDto.PROPERTY_SETTING_START_TIME_STAMP, e -> updateCopySetCandidate((Date) e.getNewValue()));
    58 58 
             updateCopySetCandidate(getStates().getBean().getSettingStartTimeStamp());
    59 59 
         }
    60 60

  • 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
    140 140 
         private java.util.Set<SetStubDto> getBrothers(Activity parent) {
    141 141 
             java.util.Set<SetStubDto> result = new HashSet<>();
    142 142 
             Trip trip = getParent(Trip.SPI, Trip.PROPERTY_ACTIVITY_LOGBOOK, parent.getTopiaId());
    143 
    -        trip.getActivityLogbook().stream().filter(ActivityAware::isSetOperation).filter(a -> !Objects.equals(a, parent)).forEach(
    143 
    +        trip.getActivityLogbook().stream().filter(a -> a.isSetOperation() && !Objects.equals(a, parent) && a.getSet() != null).forEach(
    144 144 
                     oneParent -> {
    145 145 
                         Set otherSet = oneParent.getSet();
    146 146 
                         SetStubDto otherSetDto = Set.SET_STUB_SPI.toDto(getReferentialLocale(), otherSet);

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.