|
From: <de...@us...> - 2014-02-07 09:27:44
|
Revision: 8603
http://sourceforge.net/p/fudaa/svn/8603
Author: deniger
Date: 2014-02-07 09:27:41 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
CRUE-603
Modified Paths:
--------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/TreeDeleteCalqueAction.java
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java 2014-02-07 08:04:26 UTC (rev 8602)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java 2014-02-07 09:27:41 UTC (rev 8603)
@@ -320,7 +320,9 @@
int ye = _ye;
final int selRow = getRowForLocation(xe, ye);
if (selRow != -1) {
+
final TreePath selPath = getPathForLocation(xe, ye);
+ getSelectionModel().setSelectionPath(selPath);
final Object selObject = selPath.getLastPathComponent();
final JPopupMenu menu = buildPopupMenu((BCalque) selObject);
// B.M. On abandonne ce calcul cens\xE9 mieux positionner le popupmenu : Si l'arbre
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/TreeDeleteCalqueAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/TreeDeleteCalqueAction.java 2014-02-07 08:04:26 UTC (rev 8602)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/TreeDeleteCalqueAction.java 2014-02-07 09:27:41 UTC (rev 8603)
@@ -22,7 +22,7 @@
* @version $Id$
*/
public class TreeDeleteCalqueAction extends EbliActionSimple {
-
+
protected BArbreCalqueModel treeModel_;
/**
@@ -31,22 +31,22 @@
* @param _treeModel Le modele d'arbre.
*/
public TreeDeleteCalqueAction(BArbreCalqueModel _treeModel) {
- super(EbliLib.getS("D\xE9truire"), EbliResource.EBLI.getIcon("detruire"), "DETRUIRE");
+ super(EbliLib.getS("Supprimer"), EbliResource.EBLI.getIcon("detruire"), "DETRUIRE");
treeModel_ = _treeModel;
}
-
+
@Override
public void updateStateBeforeShow() {
super.updateStateBeforeShow();
setEnabled(treeModel_ != null && treeModel_.isEditable());
}
-
+
@Override
public void actionPerformed(final ActionEvent _e) {
if (treeModel_ == null || !treeModel_.isEditable()) {
return;
}
-
+
final BCalque[] c = treeModel_.getSelection();
if (c.length == 0) {
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|