WebSVN - OpenConcerto - Diff - Rev 156 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/panel/ITreeSelection.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.utils.checks.EmptyObj;
 import org.openconcerto.utils.checks.ValidListener;
 import org.openconcerto.utils.checks.ValidState;
 import java.awt.event.ActionEvent;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.sql.SQLException;
     private ITreeSelectionNode rootNode;
     private DefaultTreeModel model;
     // Map <Id, Node>
-    private Map<Integer, ITreeSelectionNode> mapNode = new HashMap<Integer, ITreeSelectionNode>();
+    private final Map<Integer, ITreeSelectionNode> mapNode = new HashMap<Integer, ITreeSelectionNode>();
     protected static final int EMPTY_ID = SQLRow.MIN_VALID_ID - 1;
     private final EmptyChangeSupport helper;
     private final PropertyChangeSupport supp;
+    private final SQLTableListener listener;
     public ITreeSelection() {
         this(null);
+    }
                 ITreeSelection.this.supp.firePropertyChange("value", null, getValue());
                 ITreeSelection.this.helper.fireEmptyChange(isEmpty());
+            }
         });
+        this.listener = new SQLTableListener() {
+            public void rowModified(SQLTable table, int id) {
+                final ITreeSelectionNode node = ITreeSelection.this.mapNode.get(Integer.valueOf(id));
+                if (node != null) {
+                    modifyNode(table.getRow(id), node);
+                }
+            }
+            public void rowAdded(SQLTable table, int id) {
+                final SQLRow row = table.getRow(id);
+                int idPere = row.getInt("ID_" + element.getTable().getName() + "_PERE");
+                addNewNode(null, row, idPere, new HashSet<>());
+            }
+            public void rowDeleted(SQLTable table, int id) {
+                final ITreeSelectionNode node = ITreeSelection.this.mapNode.get(Integer.valueOf(id));
+                for (int i = 0; i < node.getChildCount(); i++) {
+                    removeNode(table.getRow(id), node);
+                }
+            }
+        };
+    }
     private void initTree() {
         if (this.element == null) {
             this.rootNode = new ITreeSelectionNode(null);
         } else {
-            SQLRowValues row = UndefinedRowValuesCache.getInstance().getDefaultRowValues(element.getTable());
+            SQLRowValues row = UndefinedRowValuesCache.getInstance().getDefaultRowValues(this.element.getTable());
             this.rootNode = new ITreeSelectionNode(row);
+        }
         this.model = new DefaultTreeModel(this.rootNode);
         this.setModel(this.model);
         loadTree();
-        setTableListener();
         this.addMouseListener(this);
+        this.element.getTable().addTableListener(this.listener);
+        this.addHierarchyListener(new HierarchyListener() {
+            @Override
+            public void hierarchyChanged(HierarchyEvent e) {
+                // check for Hierarchy event
+                if (e.getChangeFlags() == HierarchyEvent.DISPLAYABILITY_CHANGED) {
+                    // do the required action upon close
+                    if (!isDisplayable()) {
+                        ITreeSelection.this.element.getTable().removeTableListener(ITreeSelection.this.listener);
+                    }
+                }
+            }
+        });
+    }
     public void mouseClicked(MouseEvent e) {
+    }
     /**
      * Ajouter une feuille
      */
     public void addElement(int idRoot) {
-        EditFrame frameAdd = new EditFrame(element, EditFrame.CREATION);
+        EditFrame frameAdd = new EditFrame(this.element, EditFrame.CREATION);
-        SQLRowValues rowVals = new SQLRowValues(element.getTable());
+        SQLRowValues rowVals = new SQLRowValues(this.element.getTable());
         if (idRoot > 1) {
-            rowVals.put("ID_" + element.getTable().getName() + "_PERE", idRoot);
+            rowVals.put("ID_" + this.element.getTable().getName() + "_PERE", idRoot);
             frameAdd.getSQLComponent().select(rowVals);
+        }
         FrameUtil.showPacked(frameAdd);
+    }
      * Supprimer la feuille
      */
     public void removeElement(int id) {
         if (id > 1) {
             try {
-                element.archive(id);
+                this.element.archive(id);
             } catch (SQLException e1) {
                 e1.printStackTrace();
+            }
+        }
+    }
     /**
      * Modifier la feuille
      */
     public void modifyElement(int id) {
         if (id > 1) {
-            EditFrame frameModFamille = new EditFrame(element, EditFrame.MODIFICATION);
+            EditFrame frameModFamille = new EditFrame(this.element, EditFrame.MODIFICATION);
             frameModFamille.selectionId(id, 1);
             FrameUtil.showPacked(frameModFamille);
+        }
+    }
     private void loadTree() {
         new SwingWorker<List<SQLRow>, Object>() {
             @Override
             protected List<SQLRow> doInBackground() throws Exception {
-                final SQLTable table = element.getTable();
+                final SQLTable table = ITreeSelection.this.element.getTable();
                 final SQLSelect sel = new SQLSelect();
                 sel.addSelectStar(table);
                 return SQLRowListRSH.execute(sel);
+            }
                             SQLRow row = l.get(i);
                             familles.put(row.getID(), row);
+                        }
                         for (int i = 0; i < l.size(); i++) {
                             SQLRow row = l.get(i);
-                            addNewNode(familles, row, row.getInt("ID_" + element.getTable().getName() + "_PERE"), new HashSet<>());
+                            addNewNode(familles, row, row.getInt("ID_" + ITreeSelection.this.element.getTable().getName() + "_PERE"), new HashSet<>());
+                        }
                         expandRow(0);
+                    }
                 } catch (InterruptedException e) {
                     ExceptionHandler.handle("", e);
             if (idPere > 1 && nodePere == null && familles != null) {
                 final SQLRow rowPere = familles.get(idPere);
                 if (idPere != row.getID()) {
                     if (!addedIDs.contains(idPere)) {
                         addedIDs.add(idPere);
-                        addNewNode(familles, rowPere, rowPere.getInt("ID_" + element.getTable().getName() + "_PERE"), addedIDs);
+                        addNewNode(familles, rowPere, rowPere.getInt("ID_" + this.element.getTable().getName() + "_PERE"), addedIDs);
+                    }
+                }
                 nodePere = this.mapNode.get(Integer.valueOf(idPere));
+            }
             final ITreeSelectionNode newNode = new ITreeSelectionNode(row);
             if (!row.isUndefined()) {
                 if (nodePere != null && idPere > 1) {
                     addNode(newNode, nodePere);
                 } else {
                     if (idPere == 1) {
-                        addNode(newNode, rootNode);
+                        addNode(newNode, this.rootNode);
+                    }
+                }
+            }
+        }
+    }
         for (; n < childCount; n++) {
             if (nodeToAdd.toString().compareToIgnoreCase(nodeParent.getChildAt(n).toString()) < 0) {
                 break;
+            }
+        }
-        model.insertNodeInto(nodeToAdd, nodeParent, n);
+        this.model.insertNodeInto(nodeToAdd, nodeParent, n);
+    }
     /**
+     *
      * @param row
      * @param nodeParent
      */
     private void modifyNode(SQLRow row, ITreeSelectionNode node) {
         if (row.isArchived() && node.getParent() != null) {
-            model.removeNodeFromParent(node);
+            this.model.removeNodeFromParent(node);
         } else {
             node.setRow(row);
-            model.nodeChanged(node);
+            this.model.nodeChanged(node);
+        }
+    }
     /**
      * Suppression d'un noeud
     private void removeNode(SQLRow row, ITreeSelectionNode nodeParent) {
         final int childCount = nodeParent.getChildCount();
         for (int i = 0; i < childCount; i++) {
             final ITreeSelectionNode v = (ITreeSelectionNode) nodeParent.getChildAt(i);
             if (v.getId() == row.getID()) {
-                model.removeNodeFromParent(v);
+                this.model.removeNodeFromParent(v);
+            }
+        }
+    }
     /**
      * Table listener permettant de rafraichir l'arbre
+     *
      */
     private void setTableListener() {
-        final SQLTableListener listener = new SQLTableListener() {
-            public void rowModified(SQLTable table, int id) {
-                final ITreeSelectionNode node = mapNode.get(Integer.valueOf(id));
-                if (node != null) {
-                    modifyNode(table.getRow(id), node);
-                }
-            }
-            public void rowAdded(SQLTable table, int id) {
-                final SQLRow row = table.getRow(id);
-                int idPere = row.getInt("ID_" + element.getTable().getName() + "_PERE");
-                addNewNode(null, row, idPere, new HashSet<>());
-            }
-            public void rowDeleted(SQLTable table, int id) {
-                final ITreeSelectionNode node = mapNode.get(Integer.valueOf(id));
-                for (int i = 0; i < node.getChildCount(); i++) {
-                    removeNode(table.getRow(id), node);
-                }
-            }
-        };
-        this.element.getTable().addTableListener(listener);
+        this.element.getTable().addTableListener(this.listener);
+    }
+}

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/panel/ITreeSelection.java - Rev 156 → 182