From: <de...@us...> - 2008-08-11 21:05:07
|
Revision: 3766 http://fudaa.svn.sourceforge.net/fudaa/?rev=3766&view=rev Author: deniger Date: 2008-08-11 21:04:55 +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:02:53 UTC (rev 3765) +++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 21:04:55 UTC (rev 3766) @@ -174,7 +174,6 @@ tree.setCellEditor(new EbliCheckBoxNodeEditor(tree)); tree.setEditable(true); - // -- creation d un noeud Graphe --// final EbliNodeDefault nodeG = new EbliNodeDefault(); nodeG.setCreator(new EbliWidgetCreatorGraphe(g)); @@ -202,13 +201,13 @@ nodeCalque.setTitle("Vue Calque"); nodeCalque.setPreferedSize(new Dimension(400, 200)); nodeCalque.setPreferedLocation(new Point(250, 170)); -// JFrame fr = new JFrame(); + // JFrame fr = new JFrame(); ZEbliCalquesPanel ebliCalquesPanel = new ZEbliCalquesPanel(br, new CtuluUIDefault()); -// fr.setContentPane(ebliCalquesPanel); -// ebliCalquesPanel.setPreferredSize(new Dimension(400, 400)); -// fr.setPreferredSize(new Dimension(400, 400)); -// fr.setVisible(true); + // fr.setContentPane(ebliCalquesPanel); + // ebliCalquesPanel.setPreferredSize(new Dimension(400, 400)); + // fr.setPreferredSize(new Dimension(400, 400)); + // fr.setVisible(true); nodeCalque.setCreator(new EbliWidgetCreatorVueCalque(ebliCalquesPanel)); scene.addNode(nodeCalque); // scene.addChild(new ComponentWidget(scene, @@ -218,11 +217,9 @@ final EbliNodeDefault nodeRect = new EbliNodeDefault(); nodeRect.setTitle("Rectangle"); nodeRect.setCreator(new EbliWidgetCreatorRectangle("Test recangle")); - nodeRect.setPreferedSize(new Dimension(200, 100)); + nodeRect.setPreferedSize(new Dimension(200, 100)); nodeRect.setPreferedLocation(new Point(350, 125)); scene.addNode(nodeRect); - - // -- ajout du fleche double sens diagonale--// node = new EbliNodeDefault(); @@ -248,13 +245,9 @@ nodeFleche.setPreferedLocation(new Point(250, 525)); scene.addNode(nodeFleche); - - - // node.getCreator().getWidget().setState(state) - //if(node.getCreator().getWidget().) - - - + // node.getCreator().getWidget().setState(state) + // if(node.getCreator().getWidget().) + // WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe, // graphe.getClientArea()); @@ -304,9 +297,9 @@ boxEast.add(new BuScrollPane(t)); p.add(new JScrollPane(boxEast), BuBorderLayout.EAST); f.setLayout(new BorderLayout()); - - //f.setContentPane(p); - f.add(p,BorderLayout.CENTER); + + // f.setContentPane(p); + f.add(p, BorderLayout.CENTER); // fin p.add(new JScrollPane(scene.createView()), BuBorderLayout.CENTER); @@ -335,31 +328,28 @@ * scene.addNode(node); */ -JToolBar bar =new JToolBar(); -f.add(bar,BorderLayout.PAGE_START); -bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNLEFT)); -bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNRIGHT)); -bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNCENTERHORIZONTAL)); -bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNCENTERVERTICAL)); -bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNTOP)); -bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNBOTTOM)); - -bar =new JToolBar(); -f.add(bar,BorderLayout.PAGE_END); + 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())); -bar.add(new EbliWidgetActionDuplicate(scene)); + bar = new JToolBar(); + f.add(bar, BorderLayout.PAGE_END); + bar.add(new EbliWidgetActionDuplicate(scene)); -bar.add(new EbliWidgetActionForeGround(scene)); + bar.add(new EbliWidgetActionForeGround(scene)); -bar.add(new EbliWidgetActionBackGround(scene)); + bar.add(new EbliWidgetActionBackGround(scene)); -/* -JFrame frame2=new JFrame(); -frame2.getContentPane().add(new EGFillePanel(g)); -frame2.setSize(500,500); -frame2.setVisible(true); -*/ -p.doLayout(); + /* + * JFrame frame2=new JFrame(); frame2.getContentPane().add(new + * EGFillePanel(g)); frame2.setSize(500,500); frame2.setVisible(true); + */ + p.doLayout(); } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |