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

Commits:

3 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java
    ... ... @@ -8,12 +8,12 @@
    8 8
      * it under the terms of the GNU General Public License as
    
    9 9
      * published by the Free Software Foundation, either version 3 of the
    
    10 10
      * License, or (at your option) any later version.
    
    11
    - * 
    
    11
    + *
    
    12 12
      * This program is distributed in the hope that it will be useful,
    
    13 13
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    14 14
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    15 15
      * GNU General Public License for more details.
    
    16
    - * 
    
    16
    + *
    
    17 17
      * You should have received a copy of the GNU General Public
    
    18 18
      * License along with this program.  If not, see
    
    19 19
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    ... ... @@ -27,7 +27,6 @@ import fr.ird.observe.client.db.ClientDataContext;
    27 27
     import fr.ird.observe.client.db.ObserveSwingDataSource;
    
    28 28
     import fr.ird.observe.client.db.constants.DataContextType;
    
    29 29
     import fr.ird.observe.client.ui.content.ContentMode;
    
    30
    -import fr.ird.observe.client.ui.content.ContentUI;
    
    31 30
     import fr.ird.observe.client.ui.content.ContentUIHandler;
    
    32 31
     import fr.ird.observe.client.ui.content.ContentUIModel;
    
    33 32
     import fr.ird.observe.client.ui.content.ObserveLayoutFocusTraversalPolicy;
    
    ... ... @@ -312,9 +311,10 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto,
    312 311
             ObjectMaterialHierarchyDto detailedForm = getFloatingObjectService().getObjectMaterialHierarchy();
    
    313 312
     
    
    314 313
             ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new);
    
    315
    -
    
    316 314
             for (ObjectMaterialHierarchyDto objectMaterialHierarchyDto : detailedForm.getChildren()) {
    
    317
    -            objectMaterialHierarchyDto.setObjectMaterialType(booleanType);
    
    315
    +            if (objectMaterialHierarchyDto.isEnabled()) {
    
    316
    +                objectMaterialHierarchyDto.setObjectMaterialType(booleanType);
    
    317
    +            }
    
    318 318
             }
    
    319 319
             Map<String, ObjectMaterialDto> allMap = new TreeMap<>();
    
    320 320
             detailedForm.getAllDtos().forEach(s -> allMap.putIfAbsent(s.getId(), s));
    

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTableCellRenderer.java
    ... ... @@ -60,17 +60,11 @@ public class FloatingObjectPartsTableCellRenderer implements TableCellRenderer {
    60 60
             Objects.requireNonNull(node);
    
    61 61
             TableCellRenderer renderer = objectRenderer;
    
    62 62
             Object newValue = value;
    
    63
    -        boolean enabled = true;
    
    64
    -        if (node.isEditable() && table.isCellEditable(row, column)) {
    
    65
    -            if (node.isBoolean()) {
    
    66
    -                newValue = value == null ? null : Boolean.valueOf(String.valueOf(value));
    
    67
    -                renderer = node.isExclusive() ? booleanExclusiveRenderer : booleanInclusiveRenderer;
    
    68
    -            }
    
    69
    -            enabled = node.isEnabled();
    
    70
    -        } else {
    
    71
    -            newValue = "";
    
    63
    +        boolean enabled = node.isEditable() && table.isCellEditable(row, column) && node.isEnabled();
    
    64
    +        if (node.isBoolean() && node.isColumnEditable(column)) {
    
    65
    +            newValue = value == null ? null : Boolean.valueOf(String.valueOf(value));
    
    66
    +            renderer = node.isExclusive() ? booleanExclusiveRenderer : booleanInclusiveRenderer;
    
    72 67
             }
    
    73
    -
    
    74 68
             Component component = renderer.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column);
    
    75 69
             component.setEnabled(enabled);
    
    76 70
             return component;
    

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeNode.java
    ... ... @@ -101,7 +101,7 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im
    101 101
             return column > 0 && getUserObject().enabled && getUserObject().editable && isColumnEditable(column);
    
    102 102
         }
    
    103 103
     
    
    104
    -    private boolean isColumnEditable(int column) {
    
    104
    +    public boolean isColumnEditable(int column) {
    
    105 105
             return getUserObject().isColumnEditable(column);
    
    106 106
         }
    
    107 107