From: <de...@us...> - 2008-08-11 21:32:40
|
Revision: 3769 http://fudaa.svn.sourceforge.net/fudaa/?rev=3769&view=rev Author: deniger Date: 2008-08-11 21:32:37 +0000 (Mon, 11 Aug 2008) Log Message: ----------- Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 21:30:31 UTC (rev 3768) +++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 21:32:37 UTC (rev 3769) @@ -12,13 +12,9 @@ import java.awt.Dimension; import java.awt.Point; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import javax.swing.AbstractAction; import javax.swing.Box; -import javax.swing.JButton; import javax.swing.JFrame; -import javax.swing.JInternalFrame; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JScrollPane; @@ -28,13 +24,14 @@ import javax.swing.WindowConstants; import javax.swing.table.DefaultTableModel; +import org.fudaa.ctulu.CtuluCommandManager; import org.fudaa.ctulu.CtuluUIDefault; import org.fudaa.ctulu.gui.CtuluLibSwing; import org.fudaa.ctulu.iterator.LogarithmicNumberIterator; import org.fudaa.ebli.calque.BVueCalque; import org.fudaa.ebli.calque.ZCalqueLigneBrisee; import org.fudaa.ebli.calque.ZEbliCalquesPanel; -import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable; +import org.fudaa.ebli.commun.EbliActionSimple; import org.fudaa.ebli.courbe.EGAxeHorizontal; import org.fudaa.ebli.courbe.EGAxeVertical; import org.fudaa.ebli.courbe.EGCourbeChild; @@ -43,10 +40,8 @@ import org.fudaa.ebli.courbe.EGGraphe; import org.fudaa.ebli.courbe.EGGrapheTreeModel; import org.fudaa.ebli.courbe.EGGroup; -import org.fudaa.ebli.courbe.EGTableGraphePanel; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.ebli.visuallibrary.EbliNode; import org.fudaa.ebli.visuallibrary.EbliNodeDefault; import org.fudaa.ebli.visuallibrary.EbliScene; import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorDblFleche; @@ -66,12 +61,12 @@ import org.fudaa.ebli.visuallibrary.tree.EbliWidgetJXTreeModel; import org.netbeans.api.visual.action.ActionFactory; import org.netbeans.api.visual.border.BorderFactory; -import org.netbeans.api.visual.laf.LookFeel; import org.netbeans.api.visual.model.ObjectState; import org.netbeans.api.visual.widget.ComponentWidget; import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuPanel; +import com.memoire.bu.BuResource; import com.memoire.bu.BuScrollPane; /** @@ -194,6 +189,7 @@ // -- creation de la vue calque final TestModelLigneBrisee m = TestModelLigneBrisee.buildDefault(); ZCalqueLigneBrisee br = new ZCalqueLigneBrisee(m); + br.setTitle("test"); br.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 5, Color.RED)); BVueCalque vueC = new BVueCalque(br); vueC.setSize(new Dimension(200, 200)); @@ -330,12 +326,29 @@ JToolBar bar = new JToolBar(); f.add(bar, BorderLayout.PAGE_START); - bar.add(new EbliWidgetActionAlign.Left(scene, scene.getCmdMng())); - bar.add(new EbliWidgetActionAlign.Right(scene, scene.getCmdMng())); - bar.add(new EbliWidgetActionAlign.Middle(scene, scene.getCmdMng())); - bar.add(new EbliWidgetActionAlign.Center(scene, scene.getCmdMng())); - bar.add(new EbliWidgetActionAlign.Top(scene, scene.getCmdMng())); - bar.add(new EbliWidgetActionAlign.Bottom(scene, scene.getCmdMng())); + // om met en place le undo/redo + scene.setCmdMng(new CtuluCommandManager()); + bar.add(new EbliActionSimple("undo", BuResource.BU.getToolIcon("defaire"), "UNDO") { + @Override + public void actionPerformed(ActionEvent _e) { + if (scene.getCmdMng().canUndo()) + scene.getCmdMng().undo(); + } + }); + bar.add(new EbliActionSimple("redo", BuResource.BU.getToolIcon("refaire"), "REDO") { + @Override + public void actionPerformed(ActionEvent _e) { + if (scene.getCmdMng().canRedo()) + scene.getCmdMng().redo(); + } + }); + bar.addSeparator(); + bar.add(new EbliWidgetActionAlign.Left(scene)); + bar.add(new EbliWidgetActionAlign.Right(scene)); + bar.add(new EbliWidgetActionAlign.Middle(scene)); + bar.add(new EbliWidgetActionAlign.Center(scene)); + bar.add(new EbliWidgetActionAlign.Top(scene)); + bar.add(new EbliWidgetActionAlign.Bottom(scene)); bar = new JToolBar(); f.add(bar, BorderLayout.PAGE_END); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |