[Fudaa-svn-commit] SF.net SVN: fudaa:[9311] trunk/framework/ebli-1d/src/main/java/org/fudaa/ ebli/courbe/EGTableAction.java

[<de...@us...>]

Revision: 9311
          http://sourceforge.net/p/fudaa/svn/9311
Author:   deniger
Date:     2016-03-09 15:19:34 +0000 (Wed, 09 Mar 2016)
Log Message:
-----------
organisation des imports

Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java	2016-03-03 09:20:09 UTC (rev 9310)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java	2016-03-09 15:19:34 UTC (rev 9311)
@@ -30,6 +30,7 @@
 import javax.swing.SwingUtilities;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumnModel;
+import org.fudaa.ctulu.CtuluUI;
 import org.fudaa.ctulu.gui.CtuluCellTextDecimalRenderer;
 import org.fudaa.ctulu.gui.CtuluPopupMenu;
 import org.fudaa.ctulu.gui.CtuluTableExportPanel;
@@ -53,18 +54,24 @@
 
   final EGGraphe graphe_;
   EbliTableInfoPanel infoPanel = null;
+  private CtuluUI ui;
+
   public EGTableAction(final EGGraphe _graphe) {
     super(EbliLib.getS("Tableau des valeurs"), BuResource.BU.getToolIcon("tableau"), "TABLE");
     graphe_ = _graphe;
   }
 
+  public void setUi(CtuluUI ui) {
+    this.ui = ui;
+  }
+
   @Override
   public void actionPerformed(final ActionEvent _e) {
 
-	  infoPanel = new EbliTableInfoPanel(new CtuluUIDialog(graphe_), this, null);
-	  infoPanel.setExportTableCommentSupplier(graphe_.getExportTableCommentSupplier());
-	  infoPanel.showInDialog();
-	 
+    infoPanel = new EbliTableInfoPanel(ui == null ? new CtuluUIDialog(graphe_) : ui, this, null);
+    infoPanel.setExportTableCommentSupplier(graphe_.getExportTableCommentSupplier());
+    infoPanel.showInDialog();
+
   }
   boolean displayAll;
   boolean addOptions = true;
@@ -85,7 +92,6 @@
     this.showColumnToExport = showColumnToExport;
   }
 
-
   public boolean isAddCheckbox() {
     return addCheckbox;
   }
@@ -198,21 +204,18 @@
         }
       });
 
-      
-      if(table.getModel() instanceof EGMultiCourbeTableModel ) {
-    	  EGMultiCourbeTableModel modelInit = ((EGMultiCourbeTableModel)table.getModel());
-      	int[] vals = modelInit.getSelectedRows();
-      	if(vals != null && vals.length>0 ) {
-      		//TODO... ajout de la checkbox pour filtrer
-      		ActionListener actionL = new OptionActionListener(modelInit, table);
-      		menu.addCheckBox(EbliLib.getS("Afficher les points initiaux"), "SHOW_INITIAL_POINT", true,false)
-            .addActionListener(actionL);
-      	}
+      if (table.getModel() instanceof EGMultiCourbeTableModel) {
+        EGMultiCourbeTableModel modelInit = ((EGMultiCourbeTableModel) table.getModel());
+        int[] vals = modelInit.getSelectedRows();
+        if (vals != null && vals.length > 0) {
+          //TODO... ajout de la checkbox pour filtrer
+          ActionListener actionL = new OptionActionListener(modelInit, table);
+          menu.addCheckBox(EbliLib.getS("Afficher les points initiaux"), "SHOW_INITIAL_POINT", true, false)
+                  .addActionListener(actionL);
+        }
       }
-      
-      
+
       //EbliTableInfoPanel.setJMenuBarComponents(table, new JComponent[]{menu});
-
       components.add(menu);
 
     }
@@ -264,13 +267,13 @@
           ((CtuluTableColumnHeader) table_.getTableHeader()).adjustWidth(table_.getColumnModel().getColumn(i));
         }
         putCellsRenderer(cellsRenderer);
-      } else if("SHOW_INITIAL_POINT".equals(com)) {
-    	  //-- AHX - TODO filter table model --//
-    	  boolean activateFilter = ((AbstractButton) _e.getSource()).isSelected();
-    	  target_.setSelectRows(activateFilter);
-    	  //-- refresh table --//
-    	  target_.fireTableDataChanged();
-    	  
+      } else if ("SHOW_INITIAL_POINT".equals(com)) {
+        //-- AHX - TODO filter table model --//
+        boolean activateFilter = ((AbstractButton) _e.getSource()).isSelected();
+        target_.setSelectRows(activateFilter);
+        //-- refresh table --//
+        target_.fireTableDataChanged();
+
       }
       if (idx > 0 && model != null) {
         model.removeSortingColumn(idx);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.