Index: lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPopupMenu.java
diff -u lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPopupMenu.java:1.2 lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPopupMenu.java:1.3
--- lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPopupMenu.java:1.2	Thu Jun  1 17:56:40 2006
+++ lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPopupMenu.java	Tue Jun  6 07:32:22 2006
@@ -23,10 +23,10 @@
  * Created: 22 mars 2006 12:11:46
  *
  * @author poussin
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  *
- * Last update: $Date: 2006/06/01 17:56:40 $
- * by : $Author: bpoussin $
+ * Last update: $Date: 2006/06/06 07:32:22 $
+ * by : $Author: ruchaud $
  */
 
 package org.codelutin.math.matrix.gui;
@@ -231,9 +231,17 @@
      * @return la sous matrice en cours de saisie dans l'editeur c'est a dire la partie selectionnee
      */
     private MatrixND getSelectedMatrix() {
-        int beginSelectedColumn = matrixEditor.getTable().getSelectedColumn() -1;
+        int beginSelectedColumn = matrixEditor.getTable().getSelectedColumn();
         int nbSelectedColumn = matrixEditor.getTable().getSelectedColumnCount();
         
+        /* Prend en compte le décalage des lignes par rapport aux dimenssions */
+        int nbColumnDimRow = matrixEditor.getMatrix().getNbDim() - 1;
+        beginSelectedColumn -= nbColumnDimRow;
+        if(beginSelectedColumn < 0) {
+            beginSelectedColumn = 0;
+            nbSelectedColumn -= nbColumnDimRow;
+        }
+        
         int beginSelectedRow = matrixEditor.getTable().getSelectedRow() - 1;
         int nbSelectedRow = matrixEditor.getTable().getSelectedRowCount();
 
@@ -249,11 +257,20 @@
      * @return retourne les coordonnees de la première cellule selectionnee
      */
     private int[] getCoordinatesFirstCellSelectedMatrix() {
-        int selectedColumn = matrixEditor.getTable().getSelectedColumn() -1;
+        int selectedColumn = matrixEditor.getTable().getSelectedColumn();
+        
+        /* Prend en compte le décalage des lignes par rapport aux dimenssions */
+        int nbColumnDimRow = matrixEditor.getMatrix().getNbDim() - 1;
+        selectedColumn -= nbColumnDimRow;
+        if(selectedColumn < 0) {
+            selectedColumn = 0;
+        }
+        
         int selectedRow = matrixEditor.getTable().getSelectedRow() - 1;
+
         return new int[]{selectedRow, selectedColumn};
     }
-    
+
     /**
      * @return Selecteur de fichier CSV
      */

Index: lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPanelEditor.java
diff -u lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPanelEditor.java:1.11 lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPanelEditor.java:1.12
--- lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPanelEditor.java:1.11	Thu Jun  1 17:38:56 2006
+++ lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixPanelEditor.java	Tue Jun  6 07:32:22 2006
@@ -24,9 +24,9 @@
  * 
  * @author Benjamin Poussin <poussin@codelutin.com>
  * 
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
  * 
- * Mise a jour: $Date: 2006/06/01 17:38:56 $ par : $Author: ruchaud $
+ * Mise a jour: $Date: 2006/06/06 07:32:22 $ par : $Author: ruchaud $
  */
 
 package org.codelutin.math.matrix.gui;
@@ -292,7 +292,7 @@
             table.getActionMap().put("copy", popupMenu.getSendToClipBoardSelectionCopyAction());
             
             table.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_V, Event.CTRL_MASK), "paste");
-            table.getActionMap().put("paste", popupMenu.getSendToClipBoardSelectionCopyAction());
+            table.getActionMap().put("paste", popupMenu.getSendToClipBoardCurrentPasteAction());
 
             /*table.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_A, Event.CTRL_MASK), "selectAll");
             table.getActionMap().put("selectAll", new AbstractAction(){

Index: lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixTableModelLinear.java
diff -u lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixTableModelLinear.java:1.1 lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixTableModelLinear.java:1.2
--- lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixTableModelLinear.java:1.1	Wed Mar 22 19:38:47 2006
+++ lutinmatrix/src/java/org/codelutin/math/matrix/gui/MatrixTableModelLinear.java	Tue Jun  6 07:32:22 2006
@@ -23,10 +23,10 @@
  * Created: 22 mars 2006 12:11:46
  *
  * @author poussin
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  *
- * Last update: $Date: 2006/03/22 19:38:47 $
- * by : $Author: bpoussin $
+ * Last update: $Date: 2006/06/06 07:32:22 $
+ * by : $Author: ruchaud $
  */
 
 package org.codelutin.math.matrix.gui;
@@ -171,7 +171,7 @@
      * @see javax.swing.table.AbstractTableModel#isCellEditable(int, int)
      */
     @Override
-    public boolean isCellEditable(int rowIndex, int columnIndex) {     
+    public boolean isCellEditable(int rowIndex, int columnIndex) {
         return isEnabled() && columnIndex == m.getNbDim();
     }