Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: dc467704 by Tony CHEMIT at 2018-11-11T19:09:29Z [FOB] Les valeurs des caractéristiques/matériaux désactivés ne sont pas affichées - Closes #1168 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTableCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeNode.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java ===================================== @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -27,7 +27,6 @@ import fr.ird.observe.client.db.ClientDataContext; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.db.constants.DataContextType; import fr.ird.observe.client.ui.content.ContentMode; -import fr.ird.observe.client.ui.content.ContentUI; import fr.ird.observe.client.ui.content.ContentUIHandler; import fr.ird.observe.client.ui.content.ContentUIModel; import fr.ird.observe.client.ui.content.ObserveLayoutFocusTraversalPolicy; @@ -312,9 +311,10 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, ObjectMaterialHierarchyDto detailedForm = getFloatingObjectService().getObjectMaterialHierarchy(); ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new); - for (ObjectMaterialHierarchyDto objectMaterialHierarchyDto : detailedForm.getChildren()) { - objectMaterialHierarchyDto.setObjectMaterialType(booleanType); + if (objectMaterialHierarchyDto.isEnabled()) { + objectMaterialHierarchyDto.setObjectMaterialType(booleanType); + } } Map<String, ObjectMaterialDto> allMap = new TreeMap<>(); 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 { Objects.requireNonNull(node); TableCellRenderer renderer = objectRenderer; Object newValue = value; - boolean enabled = true; - if (node.isEditable() && table.isCellEditable(row, column)) { - if (node.isBoolean()) { - newValue = value == null ? null : Boolean.valueOf(String.valueOf(value)); - renderer = node.isExclusive() ? booleanExclusiveRenderer : booleanInclusiveRenderer; - } - enabled = node.isEnabled(); - } else { - newValue = ""; + boolean enabled = node.isEditable() && table.isCellEditable(row, column) && node.isEnabled(); + if (node.isBoolean() && node.isColumnEditable(column)) { + newValue = value == null ? null : Boolean.valueOf(String.valueOf(value)); + renderer = node.isExclusive() ? booleanExclusiveRenderer : booleanInclusiveRenderer; } - Component component = renderer.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column); component.setEnabled(enabled); 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 return column > 0 && getUserObject().enabled && getUserObject().editable && isColumnEditable(column); } - private boolean isColumnEditable(int column) { + public boolean isColumnEditable(int column) { return getUserObject().isColumnEditable(column); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dc4677042c23274d7097a6324783... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dc4677042c23274d7097a6324783... You're receiving this email because of your account on gitlab.com.