WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/sql/element/SQLElement.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.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.IListe.ConvertedAction;
 import org.openconcerto.sql.view.list.IListeAction;
+import org.openconcerto.sql.view.list.RowAction;
 import org.openconcerto.sql.view.list.SQLTableModelColumn;
 import org.openconcerto.sql.view.list.SQLTableModelColumnPath;
 import org.openconcerto.sql.view.list.SQLTableModelSource;
 import org.openconcerto.sql.view.list.SQLTableModelSourceOffline;
 import org.openconcerto.sql.view.list.SQLTableModelSourceOnline;
+import org.openconcerto.sql.view.list.action.SQLRowValuesAction;
 import org.openconcerto.ui.group.Group;
 import org.openconcerto.ui.light.ComboValueConvertor;
 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;
 import org.openconcerto.ui.light.StringValueConvertor;
 import org.openconcerto.utils.CollectionMap2Itf.SetMapItf;
 import org.openconcerto.utils.CollectionUtils;
 import org.openconcerto.utils.CompareUtils;
 import org.openconcerto.utils.ExceptionHandler;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
 import java.util.function.Supplier;
+import java.util.logging.Level;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.text.JTextComponent;
     // used as a key in SQLElementDirectory so it should be immutable
     private String code;
     private ComboSQLRequest combo;
     private ListSQLRequest list;
     private SQLTableModelSourceOnline tableSrc;
+    @Deprecated
     private final ListChangeRecorder<IListeAction> rowActions;
+    private final ListChangeRecorder<SQLRowValuesAction> rowValuesActions;
     private final LinkedListMap<String, ITransformer<Tuple2<SQLElement, String>, SQLComponent>> components;
     // links
     private SQLElementLinks ownedLinks;
     private SQLElementLinks otherLinks;
     // keep it for now as joins are disallowed (see initFF())
         this.primaryTable = primaryTable;
         this.setDefaultName(name);
         this.code = code == null ? createCode() : code;
         this.combo = null;
         this.list = null;
-        this.rowActions = new ListChangeRecorder<IListeAction>(new ArrayList<IListeAction>());
+        this.rowActions = new ListChangeRecorder<>(Collections.synchronizedList(new ArrayList<>()));
+        this.rowActions.getRecipe().addListener(new IClosure<ListChangeIndex<IListeAction>>() {
+            private final Map<IListeAction, SQLRowValuesAction> map = new IdentityHashMap<>();
+            @Override
+            public void executeChecked(ListChangeIndex<IListeAction> listChange) {
+                final List<SQLRowValuesAction> oldActions = new ArrayList<>();
+                for (final IListeAction action : listChange.getItemsRemoved()) {
+                    synchronized (this) {
+                        final SQLRowValuesAction ra = this.map.remove(action);
+                        if (ra != null)
+                            oldActions.add(ra);
+                    }
+                }
+                getRowValuesActions().removeAll(oldActions);
+                final List<SQLRowValuesAction> newActions = new ArrayList<>();
+                for (final IListeAction action : listChange.getItemsAdded()) {
+                    if (action instanceof RowAction) {
+                        synchronized (this) {
+                            if (!this.map.containsKey(action)) {
+                                final ConvertedAction converted = new ConvertedAction((RowAction) action);
+                                this.map.put(action, converted);
+                                newActions.add(converted);
+                            }
+                        }
+                    }
+                }
+                getRowValuesActions().addAll(newActions);
+            }
+        });
+        this.rowValuesActions = new ListChangeRecorder<>(Collections.synchronizedList(new ArrayList<>()));
         this.resetRelationships();
         this.components = new LinkedListMap<String, ITransformer<Tuple2<SQLElement, String>, SQLComponent>>();
         this.modelCache = null;
     public final void addListColumn(SQLTableModelColumn col) {
         this.additionalListCols.add(col);
+    }
+    @Deprecated
     public final Collection<IListeAction> getRowActions() {
         return this.rowActions;
+    }
+    public final List<SQLRowValuesAction> getRowValuesActions() {
+        return this.rowValuesActions;
+    }
-    public final void addRowActionsListener(final IClosure<ListChangeIndex<IListeAction>> listener) {
+    public final void addRowActionsListener(final IClosure<? super ListChangeIndex<SQLRowValuesAction>> listener) {
-        this.rowActions.getRecipe().addListener(listener);
+        this.rowValuesActions.getRecipe().addListener(listener);
+    }
-    public final void removeRowActionsListener(final IClosure<ListChangeIndex<IListeAction>> listener) {
+    public final void removeRowActionsListener(final IClosure<? super ListChangeIndex<SQLRowValuesAction>> listener) {
-        this.rowActions.getRecipe().rmListener(listener);
+        this.rowValuesActions.getRecipe().rmListener(listener);
+    }
     public String getDescription(SQLRow fromRow) {
         return fromRow.toString();
+    }
      *        {@link SQLRowAccessor#getIDNumber()} will be used (i.e. if the copy isn't to be linked
      *        to its parent, pass a {@link SQLRowAccessor#asRow() row}).
      * @return a copy ready to be inserted, or <code>null</code> if <code>row</code> cannot be
      *         copied.
      */
-    public SQLRowValues createCopy(SQLRowAccessor row, SQLRowAccessor parent) {
+    public final SQLRowValues createCopy(SQLRowAccessor row, SQLRowAccessor parent) {
         return createCopy(row, false, parent);
+    }
-    public SQLRowValues createCopy(SQLRowAccessor row, final boolean full, SQLRowAccessor parent) {
+    public final SQLRowValues createCopy(SQLRowAccessor row, final boolean full, SQLRowAccessor parent) {
         return this.createCopy(row, full, parent, null, null);
+    }
     public SQLRowValues createCopy(SQLRowAccessor row, final boolean full, SQLRowAccessor parent, final IdentityHashMap<SQLRowValues, SQLRowValues> valsMap, final Map<SQLRow, SQLRowValues> rowMap) {
         // do NOT copy the undefined

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 - Rev 180 → 182