WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/sql/element/SQLElement.java

 import org.openconcerto.sql.request.ComboSQLRequest;
 import org.openconcerto.sql.request.ListSQLRequest;
 import org.openconcerto.sql.request.SQLCache;
 import org.openconcerto.sql.request.SQLFieldTranslator;
 import org.openconcerto.sql.sqlobject.SQLTextCombo;
+import org.openconcerto.sql.ui.light.CustomRowEditor;
 import org.openconcerto.sql.ui.light.GroupToLightUIConvertor;
 import org.openconcerto.sql.ui.light.LightEditFrame;
 import org.openconcerto.sql.ui.light.LightUIPanelFiller;
-import org.openconcerto.sql.ui.light.SavableCustomEditorProvider;
 import org.openconcerto.sql.users.rights.UserRightsManager;
 import org.openconcerto.sql.utils.SQLUtils;
 import org.openconcerto.sql.utils.SQLUtils.SQLFactory;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.sql.view.EditPanel.EditMode;
 import org.openconcerto.sql.view.list.SQLTableModelSource;
 import org.openconcerto.sql.view.list.SQLTableModelSourceOffline;
 import org.openconcerto.sql.view.list.SQLTableModelSourceOnline;
 import org.openconcerto.ui.group.Group;
 import org.openconcerto.ui.light.ComboValueConvertor;
-import org.openconcerto.ui.light.CustomEditorProvider;
 import org.openconcerto.ui.light.IntValueConvertor;
 import org.openconcerto.ui.light.LightUIComboBox;
 import org.openconcerto.ui.light.LightUIElement;
 import org.openconcerto.ui.light.LightUIFrame;
 import org.openconcerto.ui.light.LightUIPanel;
         if (editMode.equals(EditMode.CREATION)) {
             editFrame.createTitlePanel(this.getCreationFrameTitle());
         } else if (editMode.equals(EditMode.MODIFICATION)) {
             editFrame.createTitlePanel(this.getModificationFrameTitle(sqlRow));
-            new LightUIPanelFiller(editFrame.getContentPanel()).fillFromRow(configuration, sqlRow);
+            new LightUIPanelFiller(editFrame.getContentPanel()).fillFromRow(configuration, this, sqlRow, sessionSecurityToken);
         } else if (editMode.equals(EditMode.READONLY)) {
             editFrame.createTitlePanel(this.getReadOnlyFrameTitle(sqlRow));
-            new LightUIPanelFiller(editFrame.getContentPanel()).fillFromRow(configuration, sqlRow);
+            new LightUIPanelFiller(editFrame.getContentPanel()).fillFromRow(configuration, this, sqlRow, sessionSecurityToken);
+        }
         this.setEditFrameModifiers(editFrame, sessionSecurityToken);
         return editFrame;
+     *
      * @return An initialized GroupToLightUIConvertor
      */
     public GroupToLightUIConvertor getGroupToLightUIConvertor(final PropsConfiguration configuration, final EditMode editMode, final SQLRowAccessor sqlRow, final String token) {
         final GroupToLightUIConvertor convertor = new GroupToLightUIConvertor(configuration);
-        if (editMode.equals(EditMode.CREATION)) {
+        // if (editMode.equals(EditMode.CREATION)) {
-            convertor.putAllCustomEditorProvider(this.getCustomEditorProviderForCreation(configuration, token));
+        convertor.putAllCustomEditorProvider(this.getCustomRowEditors(configuration, token));
-        } else {
+        // } else {
-            convertor.putAllCustomEditorProvider(this.getCustomEditorProviderForModification(configuration, sqlRow, token));
+        // convertor.putAllCustomEditorProvider(this.getCustomRowEditors(configuration, sqlRow,
+        // token));
-        }
+        // }
         return convertor;
+    }
     /**
      * Override this function in an element and put new value in map for use ComboValueConvertor.
      */
     // TODO: implement with IClosure
     public void setEditFrameModifiers(final LightEditFrame frame, final String sessionToken) {
+    }
-    public final Map<String, CustomEditorProvider> getCustomEditorProviderForCreation(final Configuration configuration, final String sessionToken) {
+    public List<CustomRowEditor> getCustomRowEditors(final Configuration configuration, final String sessionToken) {
-        final Map<String, CustomEditorProvider> map = this.getDefaultCustomEditorProvider(configuration, null, sessionToken);
-        map.putAll(this._getCustomEditorProviderForCreation(configuration, sessionToken));
-        return map;
-    }
-    public final Map<String, CustomEditorProvider> getCustomEditorProviderForModification(final Configuration configuration, final SQLRowAccessor sqlRow, final String sessionToken) {
-        final Map<String, CustomEditorProvider> map = this.getDefaultCustomEditorProvider(configuration, sqlRow, sessionToken);
-        map.putAll(this._getCustomEditorProviderForModification(configuration, sqlRow, sessionToken));
-        return map;
-    }
-    protected Map<String, CustomEditorProvider> _getCustomEditorProviderForCreation(final Configuration configuration, final String sessionToken) {
-        return new HashMap<String, CustomEditorProvider>();
-    }
-    protected Map<String, CustomEditorProvider> _getCustomEditorProviderForModification(final Configuration configuration, final SQLRowAccessor sqlRow, final String sessionToken) {
-        return new HashMap<String, CustomEditorProvider>();
-    }
-    protected Map<String, CustomEditorProvider> _getDefaultCustomEditorProvider(final Configuration configuration, final SQLRowAccessor sqlRow, final String sessionToken) {
-        return new HashMap<String, CustomEditorProvider>();
-    }
-    private final Map<String, CustomEditorProvider> getDefaultCustomEditorProvider(final Configuration configuration, final SQLRowAccessor sqlRow, final String sessionToken) {
         final Map<String, ComboValueConvertor<?>> comboConvertors = this.getComboConvertors();
-        final Map<String, CustomEditorProvider> result = new HashMap<String, CustomEditorProvider>();
+        final List<CustomRowEditor> result = new ArrayList<>();
         for (final Entry<String, ComboValueConvertor<?>> entry : comboConvertors.entrySet()) {
+            final String itemId = entry.getKey();
-            result.put(entry.getKey(), new SavableCustomEditorProvider() {
+            result.add(new CustomRowEditor(itemId) {
                 final ComboValueConvertor<?> convertor = entry.getValue();
                 @Override
-                public LightUIElement createUIElement(final String elementId) {
+                public LightUIElement createUIElement() {
-                    final LightUIComboBox uiCombo = new LightUIComboBox(elementId);
+                    final LightUIComboBox uiCombo = new LightUIComboBox(getItemId());
-                    if (sqlRow == null) {
-                        this.convertor.fillCombo(uiCombo, null);
+                    this.convertor.fillCombo(uiCombo, null);
+                    return uiCombo;
+                }
-                    } else {
+                @Override
+                public void fillFrom(LightUIElement uiElement, SQLRowAccessor sqlRow) {
+                    final LightUIComboBox uiCombo = (LightUIComboBox) uiElement;
-                        final SQLField field = configuration.getFieldMapper().getSQLFieldForItem(elementId);
+                    final SQLField field = configuration.getFieldMapper().getSQLFieldForItem(getItemId());
-                        if (this.convertor instanceof StringValueConvertor) {
+                    if (this.convertor instanceof StringValueConvertor) {
-                            ((StringValueConvertor) this.convertor).fillCombo(uiCombo, sqlRow.getString(field.getFieldName()));
+                        ((StringValueConvertor) this.convertor).fillCombo(uiCombo, sqlRow.getString(field.getFieldName()));
-                        } else if (this.convertor instanceof IntValueConvertor) {
+                    } else if (this.convertor instanceof IntValueConvertor) {
-                            if (sqlRow.getObject(field.getFieldName()) == null) {
+                        if (sqlRow.getObject(field.getFieldName()) != null) {
-                                this.convertor.fillCombo(uiCombo, null);
-                            } else {
-                                ((IntValueConvertor) this.convertor).fillCombo(uiCombo, sqlRow.getInt(field.getFieldName()));
+                            ((IntValueConvertor) this.convertor).fillCombo(uiCombo, sqlRow.getInt(field.getFieldName()));
+                        }
+                    }
-                    }
-                    return uiCombo;
+                }
                 @Override
-                protected void _save(final SQLRowValues sqlRow, final SQLField sqlField, final LightUIElement uiElement) {
+                public void store(LightUIElement uiElement, SQLRowValues sqlRow) {
-                    final LightUIComboBox combo = (LightUIComboBox) uiElement;
+                    final LightUIComboBox combobox = (LightUIComboBox) uiElement;
+                    final String fieldName = configuration.getFieldMapper().getSQLFieldForItem(getItemId()).getName();
-                    if (combo.hasSelectedValue()) {
+                    if (combobox.hasSelectedValue()) {
                         if (this.convertor instanceof StringValueConvertor) {
-                            sqlRow.put(sqlField.getName(), ((StringValueConvertor) this.convertor).getIdFromIndex(combo.getSelectedValue().getId()));
+                            sqlRow.put(fieldName, ((StringValueConvertor) this.convertor).getIdFromIndex(combobox.getSelectedValue().getId()));
                         } else if (this.convertor instanceof IntValueConvertor) {
-                            sqlRow.put(sqlField.getName(), combo.getSelectedValue().getId());
+                            sqlRow.put(fieldName, combobox.getSelectedValue().getId());
                         } else {
-                            throw new IllegalArgumentException("the save is not implemented for the class: " + this.convertor.getClass().getName() + " - ui element id: " + uiElement.getId());
+                            throw new IllegalArgumentException("the save is not implemented for the class: " + this.convertor.getClass().getName() + " - ui id: " + getItemId());
+                        }
                     } else {
-                        sqlRow.put(sqlField.getName(), null);
+                        sqlRow.put(fieldName, null);
+                    }
+                }
             });
+        }
-        result.putAll(this._getDefaultCustomEditorProvider(configuration, sqlRow, sessionToken));
         return result;
+    }
     /**
      * Override this function in an element to execute some code just after inserted new row in

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/sql/element/SQLElement.java @ 180 - Rev 156 → 174