r707 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions - Simexplorer-si-commits

7 Feb 2008

Author: tchemit
Date: 2008-02-07 11:05:57 +0000 (Thu, 07 Feb 2008)
New Revision: 707

Modified:
   trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java
   trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java
Log:
ajout attachments
renommage m?\195?\169thodes
passage en log debug sur les changements de propri?\195?\169t?\195?\169s

Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java
===================================================================

--- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java	2008-02-07 11:05:05 UTC (rev 706)
+++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java	2008-02-07 11:05:57 UTC (rev 707)
@@ -18,6 +18,7 @@
 * ##% */
 package fr.cemagref.simexplorer.is.ui.swing;
 
+import fr.cemagref.simexplorer.is.attachment.Attachment;
 import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
 import fr.cemagref.simexplorer.is.entities.metadata.MetaData;
 import fr.cemagref.simexplorer.is.entities.metadata.Version;
@@ -37,15 +38,18 @@
 
 import javax.swing.AbstractButton;
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.DefaultListModel;
 import javax.swing.JComboBox;
+import javax.swing.JList;
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
-import javax.swing.tree.DefaultTreeModel;
+import java.awt.Dimension;
 import java.text.SimpleDateFormat;
+import java.util.List;
 import java.util.regex.Matcher;
-import java.awt.Dimension;
 
 /**
  * Cette classe contient les méthodes utiles et réutilisables pour rafraichit
@@ -253,7 +257,7 @@
             while (size > combo.getItemCount()) {
                 combo.addItem(combo.getItemCount());
             }
-        }        
+        }
         //System.out.println("new page size : " + combo.getItemCount());
 
         combo.setSelectedIndex(model.getPagination().getCurrentPage());
@@ -269,7 +273,7 @@
         boolean nodetail = versions == null || selectedNode == null;
         // and the selection
         if (nodetail) {
-            resetDetail(ui);
+            resetDetailPanel(ui);
         } else {
             for (Version version : versions) {
                 historyModel.addElement(version);
@@ -286,13 +290,19 @@
         }
     }
 
-    public static void resetDetail(final JApplicationDetailTab ui) {
+    public static void resetDetailPanel(final JApplicationDetailTab ui) {
         ui.getDetailHeader().setText(_("simexplorer.node.nodetail"));
+        ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.noattachments"));
+        JList listAttchments = ui.getDetailAttachments();
+        listAttchments.clearSelection();
+        DefaultListModel listModel = (DefaultListModel) listAttchments.getModel();
+        listModel.setSize(0);
+        listModel.trimToSize();
         ui.getDetail().setVisible(false);
         ((JDetailTableModel) ui.getDetailTable().getModel()).setData(null);
     }
 
-    public static void updateDetail(Integer index, final JApplicationDetailTab ui, DetailTabModel model, LoggableElement selectedNode) {
+    public static void updateDetailPanel(Integer index, final JApplicationDetailTab ui, DetailTabModel model, LoggableElement selectedNode) {
         MetaData detail = model.getDetail();
         ui.getDetailVersions().setSelectedIndex(index);
         ui.getDetailHeader().setText(_("simexplorer.node.detail", selectedNode.getMetaData().getName(), model.getSelectedVersion()));
@@ -302,17 +312,31 @@
         ui.getDetail().setVisible(true);
         JTable table = ui.getDetailTable();
         ((JDetailTableModel) table.getModel()).setData(detail);
-        int nbRows = table.getRowCount()+1;
-        if (nbRows>20) {
-            nbRows=20;
+        int nbRows = table.getRowCount() + 1;
+        if (nbRows > 20) {
+            nbRows = 20;
         }
-        ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(),2+(nbRows*(4+table.getFont().getSize()))));
+        ui.getScrollTable().setPreferredSize(new Dimension((int) table.getSize().getWidth(), 2 + (nbRows * (4 + table.getFont().getSize()))));
+        List<Attachment> attachments = detail.getAttachments();
+        JList listAttachments = ui.getDetailAttachments();
+        DefaultListModel listModel = (DefaultListModel) listAttachments.getModel();
+        listModel.setSize(0);
+        if (!attachments.isEmpty()) {
+            ui.getDetailAttachmentsHeader().setText(_("simexplorer.node.attachments"));
+            for (Attachment attachment : attachments) {
+                listModel.addElement(attachment);
+            }
+            listAttachments.setSelectedIndex(0);
+        }
+
         table.invalidate();
+        listAttachments.invalidate();
+
         ui.getScrollPane().repaint();
         ui.repaint();
     }
 
-    public static void updateNavigationTree(JApplicationDetailTab ui, DetailTabModel model) {
+    public static void updateDetailNavigationTree(JApplicationDetailTab ui, DetailTabModel model) {
         // create navigation tree
         TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode());
         // push it in tree model

Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java
===================================================================
--- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java	2008-02-07 11:05:05 UTC (rev 706)
+++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java	2008-02-07 11:05:57 UTC (rev 707)
@@ -28,6 +28,7 @@
 import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab;
 
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.DefaultListModel;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.TreePath;
@@ -76,7 +77,7 @@
     }
 
     protected void initUI(JApplicationDetailTab ui, DetailTabModel model) {
-        SimExplorerUIRefreshHelper.updateNavigationTree(ui, model);
+        SimExplorerUIRefreshHelper.updateDetailNavigationTree(ui, model);
     }
 
     /**
@@ -143,7 +144,7 @@
          * @param evt event coming from DetailTabModel
          */
         public void propertyChange(PropertyChangeEvent evt) {
-            log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue());
+            log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue());
             JApplicationDetailTab ui = getTabUI();
             DetailTabModel model = getTabModel();
             DefaultComboBoxModel historyModel = (DefaultComboBoxModel) ui.getDetailVersions().getModel();
@@ -182,7 +183,7 @@
                 throw new NullPointerException("can not have a selectedItem null");
             }
             Version selectedVersion = Version.valueOf(selectedItem.toString());
-            log.info("selected version (" + selectedVersion+ ") " + selectedItem);
+            log.debug("selected version (" + selectedVersion+ ") " + selectedItem);
             metas = StorageServiceHelper.getMetaData(
                     getContext(),
                     model.isRemote(),
@@ -203,7 +204,7 @@
          * @param evt property changed event
          */
         public void propertyChange(PropertyChangeEvent evt) {
-            log.info(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue());
+            log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue());
             Integer index = (Integer) evt.getNewValue();
             JApplicationDetailTab ui = getTabUI();
             DetailTabModel model = getTabModel();
@@ -214,9 +215,9 @@
             // again
             setEnabled(false);
             if (index == null || index == -1) {
-                SimExplorerUIRefreshHelper.resetDetail(ui);
+                SimExplorerUIRefreshHelper.resetDetailPanel(ui);
             } else {
-                SimExplorerUIRefreshHelper.updateDetail(index, ui, model, selectedNode);
+                SimExplorerUIRefreshHelper.updateDetailPanel(index, ui, model, selectedNode);
             }
             setEnabled(wasEnable);
         }

    

r707 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)