diff --git a/shukan/ShukanController.java b/shukan/ShukanController.java index 76dd45be07554542c544d6a825307282ddffbcc2..afc966dec2239dc8cda0c85e1456cd251c011486 100644 --- a/shukan/ShukanController.java +++ b/shukan/ShukanController.java @@ -1,17 +1,16 @@ package shukan; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; +import java.awt.event.*; /** Shukan controller */ public class ShukanController - implements KeyListener, MouseListener//, MouseMotionListener + implements KeyListener, MouseListener, ActionListener//, MouseMotionListener { /** Controlled display area. */ private ShukanView canvas; + /** Controlled display bar */ + private ShukanViewBar bar; /** Controlled application data. */ private ShukanData data; @@ -201,4 +200,32 @@ public class ShukanController public void mouseReleased (MouseEvent e) { } + public void actionPerformed(ActionEvent e){ + if (e.getSource()== bar.buttons[0]) + System.out.println("save"); + + + /**case bar.buttons[1]: + System.out.println("back"); + break; + case bar.buttons[2]: + System.out.println("plus"); + break; + case bar.buttons[3]: + System.out.println("delete"); + break; + case bar.buttons[4]: + System.out.println("left"); + break; + case bar.buttons[5]: + System.out.println("right"); + break; + case bar.buttons[6]: + System.out.println("export"); + break; + case bar.buttons[7]: + System.out.println("parameter"); + break;*/ + + } } diff --git a/shukan/ShukanViewBar.java b/shukan/ShukanViewBar.java index 24ddaf404617a440294f63195785f7b43dd1977b..25b5e18f16d0bc15582ff7fd95ebab05f6bb0563 100644 --- a/shukan/ShukanViewBar.java +++ b/shukan/ShukanViewBar.java @@ -1,9 +1,7 @@ package shukan; -import javax.imageio.ImageIO; import javax.swing.*; import java.awt.*; -import java.io.File; public class ShukanViewBar extends JPanel { /** File manager */ @@ -12,7 +10,8 @@ public class ShukanViewBar extends JPanel { private ShukanData data = null; /** Name of the images files for the buttons of the toolbar */ private String[] imagesName = {"save", "back", "plus", "delete", "left", "right", "export", "parameter"}; - private JButton buttons[] = new JButton[8]; + /** Buttons of the toolbar */ + protected JButton buttons[] = new JButton[8]; /** type of the images */ private String imagesExtension = ".png"; /** height in pixel of the toolbar */ @@ -26,6 +25,7 @@ public class ShukanViewBar extends JPanel { for(int i = 0; i<imagesName.length;i++){ buttons[i] = new JButton("", new ImageIcon("data/images/"+imagesName[i]+imagesExtension)); buttons[i].setPreferredSize(new Dimension(80,80)); + //buttons[i].addActionListener(...); add(buttons[i]); } }