| ... |
... |
@@ -33,7 +33,6 @@ import fr.ird.observe.client.util.table.EditableTableModelWithCache; |
|
33
|
33
|
import fr.ird.observe.client.util.table.JXTableUtil;
|
|
34
|
34
|
import fr.ird.observe.dto.BusinessDto;
|
|
35
|
35
|
import fr.ird.observe.dto.data.ContainerChildDto;
|
|
36
|
|
-import fr.ird.observe.dto.data.ContainerDto;
|
|
37
|
36
|
import fr.ird.observe.dto.data.GearUseFeaturesAware;
|
|
38
|
37
|
import fr.ird.observe.dto.data.GearUseFeaturesMeasurementAware;
|
|
39
|
38
|
import fr.ird.observe.dto.referential.common.GearCharacteristicListItemReference;
|
| ... |
... |
@@ -47,7 +46,6 @@ import org.apache.logging.log4j.Logger; |
|
47
|
46
|
import org.nuiton.jaxx.validator.swing.SwingValidator;
|
|
48
|
47
|
|
|
49
|
48
|
import javax.swing.JScrollPane;
|
|
50
|
|
-import javax.swing.JTable;
|
|
51
|
49
|
import java.util.ArrayList;
|
|
52
|
50
|
import java.util.List;
|
|
53
|
51
|
import java.util.Objects;
|
| ... |
... |
@@ -108,22 +106,22 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus |
|
108
|
106
|
super(listProperty);
|
|
109
|
107
|
}
|
|
110
|
108
|
|
|
111
|
|
- @Override
|
|
112
|
|
- public void onBeforeResetRow(String prefix, int editingRow, JTable table) {
|
|
113
|
|
- if (!isEditable()) {
|
|
114
|
|
- return;
|
|
115
|
|
- }
|
|
116
|
|
- log.info(String.format("%sBefore reset edit bean at row: %d", prefix, editingRow));
|
|
117
|
|
- UIHelper.cancelEditing(table);
|
|
118
|
|
- @SuppressWarnings("unchecked") ContainerDto<P> containerBean = (ContainerDto<P>) ui.getBean();
|
|
119
|
|
- List<P> children = containerBean.getChildren();
|
|
120
|
|
- P bean = children.get(editingRow);
|
|
121
|
|
- @SuppressWarnings("unchecked") List<E> gearUseFeaturesMeasurement = (List<E>) bean.getGearUseFeaturesMeasurement();
|
|
122
|
|
- cache().replace(editingRow, gearUseFeaturesMeasurement);
|
|
123
|
|
- List<E> newData = cache().get(editingRow);
|
|
124
|
|
- setData(newData);
|
|
125
|
|
- validate();
|
|
126
|
|
- }
|
|
|
109
|
+// @Override
|
|
|
110
|
+// public void onBeforeResetRow(String prefix, int editingRow, JTable table) {
|
|
|
111
|
+// if (!isEditable()) {
|
|
|
112
|
+// return;
|
|
|
113
|
+// }
|
|
|
114
|
+// log.info(String.format("%sBefore reset edit bean at row: %d", prefix, editingRow));
|
|
|
115
|
+// UIHelper.cancelEditing(table);
|
|
|
116
|
+// @SuppressWarnings("unchecked") ContainerDto<P> containerBean = (ContainerDto<P>) ui.getBean();
|
|
|
117
|
+// List<P> children = containerBean.getChildren();
|
|
|
118
|
+// P bean = children.get(editingRow);
|
|
|
119
|
+// @SuppressWarnings("unchecked") List<E> gearUseFeaturesMeasurement = (List<E>) bean.getGearUseFeaturesMeasurement();
|
|
|
120
|
+// cache().replace(editingRow, gearUseFeaturesMeasurement);
|
|
|
121
|
+// List<E> newData = cache().get(editingRow);
|
|
|
122
|
+// setData(newData);
|
|
|
123
|
+// validate();
|
|
|
124
|
+// }
|
|
127
|
125
|
|
|
128
|
126
|
private void onGearChanged(ContentTableUI<?, P, ?> ui, ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear, boolean selectionRowChanged) {
|
|
129
|
127
|
if (!tableModel.isEditable()) {
|
| ... |
... |
@@ -178,7 +176,7 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus |
|
178
|
176
|
List<E> measurements = getDefaultGearUseFeaturesMeasurement(gearId);
|
|
179
|
177
|
log.info(String.format("User mode, use default measurements: %d", measurements.size()));
|
|
180
|
178
|
//FIXME Error no list for row -1
|
|
181
|
|
- cache().replace(editingRow, measurements);
|
|
|
179
|
+ cache().update(editingRow, measurements);
|
|
182
|
180
|
setData(measurements);
|
|
183
|
181
|
setModified(false);
|
|
184
|
182
|
listProperty().set(measurements);
|