WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/ui/light/LightUITable.java

 import org.openconcerto.utils.NumberUtils;
 import org.openconcerto.utils.io.JSONConverter;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.util.ArrayList;
 import java.util.List;
 import javax.xml.parsers.ParserConfigurationException;
 import org.jdom2.Element;
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
-public class LightUITable extends LightUserControlContainer implements Externalizable {
+public class LightUITable extends LightUserControlContainer {
     public static final int DEFAULT_LINE_HEIGHT = 40;
     private static final String LINE_PER_ROW = "line-per-row";
     private static final String TABLE_SPEC = "table-spec";
     private Boolean allowSelection = false;
     private Boolean allowMultiSelection = false;
     private Boolean autoSelectFirstLine = true;
     private TableSpec tableSpec = null;
-    private transient List<ActionListener> selectionListeners = new ArrayList<ActionListener>();
+    private transient List<ActionListener> selectionListeners = new ArrayList<>();
     // Nombre de ligne à afficher par Row
     private int linePerRow = 1;
     private int lineHeight = DEFAULT_LINE_HEIGHT;
         this.setWeightX(1);
         this.setFillWidth(true);
         final RowSelectionSpec selection = new RowSelectionSpec(this.getId());
         final ColumnsSpec columnsSpec = new ColumnsSpec(this.getId(), new ArrayList<ColumnSpec>(), new ArrayList<String>(), new ArrayList<String>());
-        final TableSpec tableSpec = new TableSpec(this.getId(), selection, columnsSpec);
+        this.tableSpec = new TableSpec(this.getId(), selection, columnsSpec);
-        tableSpec.setContent(new TableContent(this.getId()));
+        this.tableSpec.setContent(new TableContent(this.getId()));
-        this.setTableSpec(tableSpec);
+    }
     @Override
     public void setId(final String id) {
         super.setId(id);
             this.fireSelectionChange();
+        }
+    }
     public final List<Row> getSelectedRows() {
-        final List<Row> selectedRows = new ArrayList<Row>();
+        final List<Row> selectedRows = new ArrayList<>();
         if (this.getTableSpec().getSelection() != null) {
             final List<Number> selectedIds = this.getSelectedIds();
             for (final Number selectedId : selectedIds) {
                 final Row selectedRow = this.getRowById(selectedId);
+        }
         return null;
+    }
     public <T extends LightUIElement> List<T> findChildren(final Class<T> expectedClass, final boolean recursively) {
-        final List<T> result = new ArrayList<T>();
+        final List<T> result = new ArrayList<>();
         if (this.hasRow()) {
             final int size = this.getRowsCount();
             for (int i = 0; i < size; i++) {
                 final Row row = this.getRow(i);
                 final List<Object> rowValues = row.getValues();
                 for (final Object value : rowValues) {
+                    if (value != null) {
-                    if (recursively) {
+                        if (recursively) {
-                        if (value instanceof LightUIContainer) {
+                            if (value instanceof LightUIContainer) {
-                            result.addAll(((LightUIContainer) value).findChildren(expectedClass, recursively));
+                                result.addAll(((LightUIContainer) value).findChildren(expectedClass, recursively));
-                        } else if (value instanceof LightUITable) {
+                            } else if (value instanceof LightUITable) {
-                            result.addAll(((LightUITable) value).findChildren(expectedClass, recursively));
+                                result.addAll(((LightUITable) value).findChildren(expectedClass, recursively));
-                    if (expectedClass.isAssignableFrom(value.getClass())) {
+                        if (expectedClass.isAssignableFrom(value.getClass())) {
-                        result.add(expectedClass.cast(value));
+                            result.add(expectedClass.cast(value));
+                        }
+                    }
+                }
+            }
         } else {
             System.out.println("LightUITable.getElementById() - No rows for table: " + this.getId());
+        }
         return result;
         final Element rootElement = new Element("list");
         final Document xmlConf = new Document();
         final int columnSpecCount = columnsSpec.getColumnCount();
-        final List<String> visibleIds = new ArrayList<String>();
+        final List<String> visibleIds = new ArrayList<>();
         for (int i = 0; i < columnSpecCount; i++) {
             final ColumnSpec columnSpec = columnsSpec.getColumn(i);
             final Element xmlColumn = this.createXmlColumn(columnSpec.getId(), columnSpec.getMaxWidth(), columnSpec.getMinWidth(), columnSpec.getWidth());
             rootElement.addContent(xmlColumn);
             visibleIds.add(columnSpec.getId());
             final int size = this.getRowsCount();
             for (int i = 0; i < size; i++) {
                 final Row row = this.getRow(i);
                 final List<Object> values = row.getValues();
                 for (final Object value : values) {
-                    if (value != null && value instanceof LightUIElement) {
+                    if (value instanceof LightUIElement) {
                         ((LightUIElement) value).setReadOnly(readOnly);
+                    }
+                }
+            }
+        }
                     System.err.println("LightUITable.setValueFromContext() - Incorrect line count in JSON");
                 } else {
                     for (int i = 0; i < size; i++) {
                         final Row row = this.getRow(i);
-                        final JSONObject jsonLineContext = (JSONObject) JSONConverter.getObjectFromJSON(jsonContext.get(i), JSONObject.class);
+                        final JSONObject jsonLineContext = JSONConverter.getObjectFromJSON(jsonContext.get(i), JSONObject.class);
                         final Number rowId = JSONConverter.getParameterFromJSON(jsonLineContext, "row.id", Number.class);
-                        final String rowExtendId = (String) JSONConverter.getParameterFromJSON(jsonLineContext, "row.extend.id", String.class);
+                        final String rowExtendId = JSONConverter.getParameterFromJSON(jsonLineContext, "row.extend.id", String.class);
                         if (NumberUtils.areNumericallyEqual(rowId, row.getId()) && (row.getExtendId() == null || (row.getExtendId() != null && rowExtendId.equals(row.getExtendId())))) {
                             if (row.isFillWidth()) {
                                 if (!row.getValues().isEmpty() && row.getValues().get(0) instanceof LightUserControl) {
                                     final LightUIElement element = (LightUIElement) row.getValues().get(0);
                                     if (element instanceof LightUserControl) {
                                                 "Impossible to find value for editor: " + editor.getId() + " for row: " + rowId.toString() + " at position: " + String.valueOf(k));
+                                    }
+                                }
+                            }
                         } else {
-                            final List<Number> ids = new ArrayList<Number>(size);
+                            final List<Number> ids = new ArrayList<>(size);
                             for (int j = 0; j < size; j++) {
                                 ids.add(this.getRow(j).getId());
+                            }
                             throw new IllegalArgumentException("Impossible to find row: " + rowId.toString() + " known table row ids :" + ids);
+                        }
             this.tableSpec = new TableSpec(jsonRawContent);
+        }
+    }
     @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
-        super.writeExternal(out);
-        out.writeBoolean(dynamicLoad);
-        out.writeBoolean(allowSelection);
-        out.writeBoolean(allowMultiSelection);
-        out.writeBoolean(autoSelectFirstLine);
-        tableSpec.writeExternal(out);
-    }
-    @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        super.readExternal(in);
-        this.dynamicLoad = in.readBoolean();
-        this.allowSelection = in.readBoolean();
-        this.allowMultiSelection = in.readBoolean();
-        this.autoSelectFirstLine = in.readBoolean();
-        tableSpec = new TableSpec();
-        tableSpec.readExternal(in);
-    }
-    @Override
     public void destroy() {
         super.destroy();
         this.selectionListeners.clear();
+    }
+}

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/ui/light/LightUITable.java @ 180 - Rev 156 → 174