Author: dandre
Date: Sat Sep 7 01:02:57 2013
New Revision: 4537
Log:
Tree: change selection on right click so the context menu is correctly shown if
the entity is not selected
Modified:
trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java
Modified: trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java
==============================================================================
--- trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java
(original)
+++ trunk/AncestrisCore/modules.views.tree/src/genj/tree/TreeView.java Sat Sep
7 01:02:57 2013
@@ -875,10 +875,10 @@
Content.this.mousePressed(e);
}
- @Override
- public void mouseClickedFiltered(MouseEvent me) {
- Content.this.mouseClicked(me);
- }
+//FIXME: remove @Override
+// public void mouseClickedFiltered(MouseEvent me) {
+// Content.this.mouseClicked(me);
+// }
};
addMouseListener(mouseAdapter);
addMouseWheelListener(mouseAdapter);
@@ -1020,18 +1020,6 @@
repaint();
overview.repaint();
}
- // done
- }
-
- /**
- * @see java.awt.event.MouseAdapter#mouseClicked(MouseEvent)
- */
- public void mouseClicked(MouseEvent e) {
- requestFocusInWindow();
- // check node
- Point p = view2model(e.getPoint());
- Object content = model.getContentAt(p.x, p.y);
- // entity?
if (content instanceof Entity) {
Entity entity = (Entity) content;
// change current!
@@ -1056,11 +1044,47 @@
}
return;
}
- // runnable?
- if (content instanceof Runnable) {
- ((Runnable) content).run();
- }
+ // done
}
+
+// FIXME: remove /**
+// * @see java.awt.event.MouseAdapter#mouseClicked(MouseEvent)
+// */
+// public void mouseClicked(MouseEvent e) {
+// requestFocusInWindow();
+// // check node
+// Point p = view2model(e.getPoint());
+// Object content = model.getContentAt(p.x, p.y);
+// // entity?
+// if (content instanceof Entity) {
+// Entity entity = (Entity) content;
+// // change current!
+// if ((e.getModifiers() & MouseEvent.CTRL_DOWN_MASK) != 0) {
+// List<Entity> entities = new
ArrayList<Entity>(context.getEntities());
+// if (entities.contains(entity)) {
+// entities.remove(entity);
+// } else {
+// entities.add(entity);
+// }
+// } else {
+// context = new Context(entity);
+// }
+//// repaint();
+//// overview.repaint();
+// // propagate to others
+// try {
+//// ignoreContextChange = true;
+// SelectionDispatcher.fireSelection(e, context);
+// } finally {
+//// ignoreContextChange = false;
+// }
+// return;
+// }
+// // runnable?
+// if (content instanceof Runnable) {
+// ((Runnable) content).run();
+// }
+// }
} //Content
/**
---------------------------------------------------------------------
Site Web Ancestris : http://www.ancestris.org
<*> Pour vous desinscrire de cette liste, envoyez un mail a :
[email protected]
<*> Pour obtenir de l'aide sur les commandes de la liste :
[email protected]
Pour obtenir tous les messages lies a ce fil de discussion, cliquez sur le
lien ci-dessous, cela ouvrira votre logiciel de messagerie. Il vous suffira
d'envoyer le message :
[email protected]
