WebSVN - OpenConcerto - Diff - Rev 151 and 182 - /trunk/OpenConcerto/src/org/openconcerto/sql/view/IListPanel.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 import org.openconcerto.sql.view.list.IListeAction;
 import org.openconcerto.sql.view.list.IListeAction.IListeEvent;
 import org.openconcerto.sql.view.list.ITableModel;
 import org.openconcerto.sql.view.list.RowAction;
 import org.openconcerto.sql.view.list.RowAction.PredicateRowAction;
+import org.openconcerto.sql.view.list.action.SQLRowValuesAction;
 import org.openconcerto.sql.view.search.SearchListComponent;
 import org.openconcerto.ui.ContinuousButtonModel;
 import org.openconcerto.ui.FrameUtil;
 import org.openconcerto.ui.SwingThreadUtils;
 import org.openconcerto.ui.component.JRadioButtons.JStringRadioButtons;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.prefs.Preferences;
         return getConfigFile(elem, c, null);
+    }
     static public final File getConfigFile(final SQLElement elem, final Class<? extends Container> c, final String variant) {
         final String suffix = StringUtils.isEmpty(variant, true) ? "" : "-" + variant;
-        return getConfigFile(c, elem.getCode() + suffix);
+        return getConfigFile(IListFrame.getConfDir(elem), c, elem.getCode() + suffix);
+    }
     static public final File getConfigFile(final Class<? extends Container> c, String code) {
-        final Configuration conf = Configuration.getInstance();
+        return getConfigFile(IListFrame.getConfDir(null), c, code);
+    }
+    static public final File getConfigFile(final File rootDir, final Class<? extends Container> c, String code) {
-        if (conf == null)
+        if (rootDir == null)
             return null;
-        final File structFile = new File(conf.getConfDir(), "jtableState-" + FILE_STRUCT_VERSION);
+        final File structFile = new File(rootDir, "jtableState-" + FILE_STRUCT_VERSION);
         return new File(structFile, c.getSimpleName() + File.separator + IListFrame.getConfigFileName(code));
+    }
     public static enum FrameMode {
         NO_FRAME, READ_ONLY_FRAME, READ_WRITE_FRAME;
     protected JButton buttonClone;
     protected JButton saveBtn;
     private JButton buttonPlus;
     private JButton buttonMoins;
     protected final JPanel searchPanel = new JPanel(new GridBagLayout());
     private static final JButton createBtn(Icon i) {
         final JButton res = new JButton(i);
         res.setMargin(new Insets(1, 1, 1, 1));
         res.setModel(new ContinuousButtonModel(300));
         res.setBorder(BorderFactory.createEmptyBorder());
                 throw new IllegalArgumentException("Different tables : " + elem.getTable() + " != " + list.getSource().getPrimaryTable());
             if (list.getConfigFile() == null)
                 list.setConfigFile(config);
+        }
         this.liste = list;
+        final Map<SQLRowValuesAction, IListeAction> actionsMap = new IdentityHashMap<>();
-        final IClosure<ListChangeIndex<IListeAction>> l = new IClosure<ListChangeIndex<IListeAction>>() {
+        final IClosure<ListChangeIndex<SQLRowValuesAction>> l = new IClosure<ListChangeIndex<SQLRowValuesAction>>() {
             @Override
-            public void executeChecked(ListChangeIndex<IListeAction> input) {
+            public void executeChecked(ListChangeIndex<SQLRowValuesAction> input) {
+                SwingThreadUtils.invoke(() -> {
-                getListe().removeIListeActions(input.getItemsRemoved());
+                    for (final SQLRowValuesAction a : input.getItemsRemoved()) {
-                getListe().addIListeActions(input.getItemsAdded());
+                        final IListeAction la = actionsMap.remove(a);
+                        if (la != null)
+                            getListe().removeIListeAction(la);
+                    }
+                    actionsMap.putAll(getListe().addRowValuesActions(getElement().getRowValuesActions()));
+                });
+            }
         };
         // remove listener if non displayable since getElement() never dies
         this.addHierarchyListener(new HierarchyListener() {
+            @Override
             public void hierarchyChanged(HierarchyEvent e) {
                 if ((e.getChangeFlags() & HierarchyEvent.DISPLAYABILITY_CHANGED) != 0)
                     if (isDisplayable()) {
+                        assert actionsMap.isEmpty();
-                        getListe().addIListeActions(getElement().getRowActions());
+                        actionsMap.putAll(getListe().addRowValuesActions(getElement().getRowValuesActions()));
                         getElement().addRowActionsListener(l);
                     } else {
                         getElement().removeRowActionsListener(l);
-                        getListe().removeIListeActions(getElement().getRowActions());
+                        getListe().removeIListeActions(actionsMap.values());
+                        actionsMap.clear();
+                    }
+            }
         });
         this.displayRowAction = new PredicateRowAction(new AbstractAction(TM.tr("display")) {
                 btn.setEnabled(finalOK);
+            }
+        }
         private boolean isRO() {
-            final SQLRowAccessor r = getListe().getSelectedRow();
+            final SQLRowAccessor r = getListe().getSelectedRowAccessor();
             return r != null && SQLComponent.isReadOnly(r);
+        }
+    }
     protected final void updateOrderButtons() {

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/sql/view/IListPanel.java - Rev 151 → 182