From: <de...@us...> - 2008-08-11 21:02:59
|
Revision: 3765 http://fudaa.svn.sourceforge.net/fudaa/?rev=3765&view=rev Author: deniger Date: 2008-08-11 21:02:53 +0000 (Mon, 11 Aug 2008) Log Message: ----------- maj pour les actions Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-11 21:00:25 UTC (rev 3764) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-11 21:02:53 UTC (rev 3765) @@ -10,11 +10,13 @@ import javax.swing.JMenuItem; import javax.swing.JPopupMenu; +import org.fudaa.ctulu.CtuluCommandManager; import org.netbeans.api.visual.action.ActionFactory; import org.netbeans.api.visual.action.PopupMenuProvider; import org.netbeans.api.visual.action.WidgetAction; import org.netbeans.api.visual.graph.GraphScene; import org.netbeans.api.visual.widget.LayerWidget; +import org.netbeans.api.visual.widget.Scene; import org.netbeans.api.visual.widget.Widget; /** @@ -24,21 +26,27 @@ * */ public class EbliScene extends GraphScene<EbliNode, EbliEdge> { + + public static void refreshScene(Scene _sc) { + _sc.validate(); + _sc.repaint(); + if (_sc.getView() != null) + _sc.getView().repaint(); + } + /** + * Le gestionnaire de commande associe \xE0 la scene + */ + CtuluCommandManager cmdMng_; + + /** * la visu du graphscene */ private LayerWidget visu_; - public LayerWidget getVisu_() { - return visu_; -} + private LayerWidget interactionLayer_; -public void setVisu_(LayerWidget visu_) { - this.visu_ = visu_; -} - -private LayerWidget interactionLayer_; final private WidgetAction alignWithMoveAction; /** @@ -55,7 +63,7 @@ interactionLayer_ = new LayerWidget(this); addChild(interactionLayer_); alignWithMoveAction = ActionFactory.createAlignWithMoveAction(visu_, interactionLayer_, ActionFactory - .createDefaultAlignWithMoveDecorator(),false); + .createDefaultAlignWithMoveDecorator(), false); // -- ajoute l'action du zoom ( ctrl + clic) getActions().addAction(ActionFactory.createZoomAction(1.1, true)); @@ -64,7 +72,6 @@ setMenuBase(); } - /** * Methode qui permet d ajouter un listener * @@ -112,29 +119,36 @@ return res; } - - + /** - * Called by the removeNode method to notify that a node is removed from the graph model. - * The default implementation removes the node widget from its parent widget. - * @param node the removed node - * @param widget the removed node widget; null if the node is non-visual + * Called by the removeNode method to notify that a node is removed from the + * graph model. The default implementation removes the node widget from its + * parent widget. * - * Surcharge pour faire appel au notify des listener et ainsi mettre ajour les listener + * @param node + * the removed node + * @param widget + * the removed node widget; null if the node is non-visual + * + * Surcharge pour faire appel au notify des listener et ainsi mettre + * ajour les listener */ - protected void detachNodeWidget (EbliNode node, Widget widget) { - //-- indique la suppresion du node chez le parent - notifyAllListenerNodeRemoved(node); - - if (widget != null) - widget.removeFromParent (); - - + protected void detachNodeWidget(EbliNode node, Widget widget) { + // -- indique la suppresion du node chez le parent + notifyAllListenerNodeRemoved(node); + + if (widget != null) + widget.removeFromParent(); + } - - - + /** + * @return the cmdMng + */ + public CtuluCommandManager getCmdMng() { + return cmdMng_; + } + public LayerWidget getLayerVisu() { return visu_; } @@ -143,6 +157,10 @@ return alignWithMoveAction; } + public LayerWidget getVisu_() { + return visu_; + } + /** * Methode qui permet d envoyer le signal du node ajout\xE9 a tous les listener * @@ -179,6 +197,20 @@ notifyAllListenerNodeAdded(node); } + /** + * Methode qui permet de raffraichir les elements de la scene + */ + public void refresh() { + refreshScene(this); + } + + /** + * @param _cmdMng the cmdMng to set + */ + public void setCmdMng(CtuluCommandManager _cmdMng) { + cmdMng_ = _cmdMng; + } + public void setMenuBase() { getActions().addAction(ActionFactory.createPopupMenuAction(new PopupMenuProvider() { public JPopupMenu getPopupMenu(Widget widget, Point localLocation) { @@ -220,15 +252,8 @@ })); } - - /** - * Methode qui permet de raffraichir les elements de la scene - */ - public void refresh(){ - this.validate(); - this.repaint(); - getView().repaint(); - + public void setVisu_(LayerWidget visu_) { + this.visu_ = visu_; } - + } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-11 21:00:25 UTC (rev 3764) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-11 21:02:53 UTC (rev 3765) @@ -1,6 +1,5 @@ package org.fudaa.ebli.visuallibrary; -import java.awt.Color; import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -11,12 +10,7 @@ import org.fudaa.ctulu.CtuluResource; import org.netbeans.api.visual.action.ActionFactory; import org.netbeans.api.visual.action.PopupMenuProvider; -import org.netbeans.api.visual.border.Border; -import org.netbeans.api.visual.border.BorderFactory; -import org.netbeans.api.visual.laf.LookFeel; -import org.netbeans.api.visual.layout.LayoutFactory; import org.netbeans.api.visual.model.ObjectState; -import org.netbeans.api.visual.widget.Scene; import org.netbeans.api.visual.widget.Widget; /** @@ -28,33 +22,30 @@ public class EbliWidget extends Widget { private EbliScene scene_; - public EbliScene getScene_() { - return scene_; -} + + private boolean useBorder_ = true; -private boolean useBorder_ = true; +/** + * @param scene + * @param Point + * : indiaue la location preferentiel. peut etre nul + */ +public EbliWidget(EbliScene scene) { + super(scene); + setScene_(scene); + getActions().addAction(scene.createSelectAction()); + getActions().addAction(ActionFactory.createResizeAction()); + getActions().addAction(scene.createWidgetHoverAction()); + getActions().addAction(scene.getMoveAction()); - /** - * @param scene - * @param Point - * : indiaue la location preferentiel. peut etre nul - */ - public EbliWidget(EbliScene scene) { - super(scene); - setScene_(scene); - getActions().addAction(scene.createSelectAction()); - getActions().addAction(ActionFactory.createResizeAction()); - getActions().addAction(scene.createWidgetHoverAction()); - getActions().addAction(scene.getMoveAction()); + // positionnement de la widget si precise + // if(preferredLocation!=null) + // setPreferredLocation(preferredLocation); - // positionnement de la widget si precise - // if(preferredLocation!=null) - // setPreferredLocation(preferredLocation); + // menu clic droit basique (fermeture, duplication) + setMenu(); +} - // menu clic droit basique (fermeture, duplication) - setMenu(); - } - /** * Methode de construction des menus de base * @@ -122,6 +113,18 @@ }); } + /** + * methode qui construit une widget duplication pqr default, doit etre surchargee pour reproduire l' evenement + * @return + */ + public EbliNode duplicate(){ + EbliNode duplique =null; + + + return duplique; + } + + public EbliScene getEbliScene() { return scene_; } @@ -164,17 +167,6 @@ public void setUseBorder(boolean _useBorder) { useBorder_ = _useBorder; } - - /** - * methode qui construit une widget duplication pqr default, doit etre surchargee pour reproduire l' evenement - * @return - */ - public EbliNode duplicate(){ - EbliNode duplique =null; - - - return duplique; - } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |