Changeset 8831 for extensions/jiwigo

Timestamp:

Jan 21, 2011, 7:20:55 PM (13 years ago)

Author:

mlg

Message:

Changes the browser concept
This is not a new frame anymore, just a panel of the main frame.

Location:

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser

Files:

• BrowserImagePanel.java (modified) (7 diffs)
• BrowserPanel.java (copied) (copied from extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/BrowserFrame.java) (14 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/BrowserImagePanel.java

@@ -24 +24 @@
 import javax.swing.event.ChangeListener;
 
+import fr.mael.jiwigo.transverse.ImagesManagement;
 import fr.mael.jiwigo.transverse.util.ImagesUtil;
 import fr.mael.jiwigo.transverse.util.Messages;
@@ -70 +71 @@
     private int yDragPosition;
     private boolean drawSelection = false;
+    private ImagesManagement imagesManagement = ImagesManagement.getInstance();
 
     /**
@@ -75 +77 @@
      * @param image the image
      */
-    public BrowserImagePanel(BufferedImage image) {
-        this.image = image;
+    public BrowserImagePanel() {
+        this.image = imagesManagement.getCurrentBufferedImage();
         this.addMouseWheelListener(this);
         this.addMouseMotionListener(this);
@@ -106 +108 @@
         g2.drawRenderedImage(image, at);
         if (drawSelection) {
-            g2.drawRect(xTopPosition, yTopPosition, xDragPosition - xTopPosition, yDragPosition - yTopPosition);
+            //      g2.drawRect(xTopPosition, yTopPosition, xDragPosition - xTopPosition, yDragPosition - yTopPosition);
         }
 
@@ -242 +244 @@
      */
     public void rotationDroite() {
-        setImage(ImagesUtil.rotate(image, Math.PI / 2));
+        image = (ImagesUtil.rotate(image, Math.PI / 2));
+        revalidate();
+        repaint();
     }
 
@@ -249 +253 @@
      */
     public void rotationGauche() {
-        setImage(ImagesUtil.rotate(image, -Math.PI / 2));
+        image = (ImagesUtil.rotate(image, -Math.PI / 2));
+        revalidate();
+        repaint();
     }
 
@@ -262 +268 @@
      * @param image the image to set
      */
-    public void setImage(BufferedImage image) {
-        this.image = image;
+    public void changeImage() {
+        this.image = imagesManagement.getCurrentBufferedImage();
         revalidate();
         repaint();

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/BrowserPanel.java

@@ -21 +21 @@
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
-import javax.swing.JFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
-import javax.swing.JRootPane;
 import javax.swing.JScrollPane;
 
-import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.transverse.ImagesManagement;
 import fr.mael.jiwigo.transverse.util.ImagesUtil;
@@ -35 +32 @@
 import fr.mael.jiwigo.transverse.util.Outil;
 import fr.mael.jiwigo.ui.comments.CommentsDialog;
+import fr.mael.jiwigo.ui.mainframe.MainFrame;
 
 /**
@@ -68 +66 @@
  *
  */
-public class BrowserFrame extends JFrame implements ActionListener {
+public class BrowserPanel extends JPanel implements ActionListener {
     /**
      * Logger
      */
     public static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
-            .getLog(BrowserFrame.class);
+            .getLog(BrowserPanel.class);
     /**
      * bouton to go to the  next image
@@ -109 +107 @@
 
     /**
-     * Panel qui contient l'image
+     * Panel containing the image
      */
     private BrowserImagePanel imagePanel;
@@ -132 +130 @@
     private AWTEventListener generalListener;
 
-    public BrowserFrame(Image image) {
-        this.setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(Outil.getURL("fr/mael/jiwigo/img/icon.png")));
-        this.setTitle(Messages.getMessage("titleBrowser"));
+    /**
+     * Instance of the browser frame
+     */
+    private static BrowserPanel instance;
+
+    public static BrowserPanel getInstance() {
+        if (instance == null) {
+            instance = new BrowserPanel();
+        }
+        if (instance.getPanelBoutons() == null && ImagesManagement.getInstance().getCurrentImage() != null) {
+            instance.construct();
+        }
+        return instance;
+    }
+
+    /**
+     * @return the panelBoutons
+     */
+    public JPanel getPanelBoutons() {
+        return panelBoutons;
+    }
+
+    private BrowserPanel() {
+    }
+
+    public void construct() {
+        //      this.setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(Outil.getURL("fr/mael/jiwigo/img/icon.png")));
+        //      this.setTitle(Messages.getMessage("titleBrowser"));
         panelBoutons = new JPanel(new FlowLayout());
         //ajout des images sur les boutons
@@ -179 +202 @@
         panelBoutons.add(rotateLeft);
         panelBoutons.add(rotateRight);
-        panelBoutons.add(cut);
+        //      panelBoutons.add(cut);
         panelBoutons.add(save);
         panelBoutons.add(comment);
@@ -185 +208 @@
         BufferedImage img;
         try {
-            img = ImageIO.read(new URL(ImagesManagement.getCurrentImage().getUrl()));
-            imagePanel = new BrowserImagePanel(img);
+            img = ImageIO.read(new URL(ImagesManagement.getInstance().getCurrentImage().getUrl()));
+            imagePanel = new BrowserImagePanel();
         } catch (Exception e1) {
             LOG.error(Outil.getStackTrace(e1));
         }
 
-        this.getContentPane().setLayout(new BorderLayout());
+        this.setLayout(new BorderLayout());
         JScrollPane scrollpane = new JScrollPane(imagePanel);
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        this.getRootPane().setWindowDecorationStyle(JRootPane.PLAIN_DIALOG);
-        this.setExtendedState(getExtendedState() | JFrame.MAXIMIZED_BOTH);
+        //      this.getRootPane().setWindowDecorationStyle(JRootPane.PLAIN_DIALOG);
+        //      this.setExtendedState(getExtendedState() | JFrame.MAXIMIZED_BOTH);
         //      this.setExtendedState(JFrame.ICONIFIED | this.getExtendedState());
         panelBoutons.add(imagePanel.getSlider());
@@ -204 +227 @@
 
         this.setSize(screenSize);
-        this.setLocationRelativeTo(null);
-        this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        //      this.setLocationRelativeTo(null);
+        //      this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         setUpMenu();
         this.generalListener = new AWTEventListener() {
@@ -220 +243 @@
             }
         };
-        this.setVisible(true);
-
+        this.setPreferredSize(new Dimension(300, 300));
         //Toolkit.getDefaultToolkit().addAWTEventListener(generalListener, AWTEvent.KEY_EVENT_MASK);
 
     }
 
+    /**
+     * Changes the current image of the browser frame
+     */
+    public void changeImage() {
+        imagePanel.changeImage();
+        MainFrame.getInstance().getCollapsiblePanel().revalidate();
+        MainFrame.getInstance().getCollapsiblePanel().repaint();
+    }
+
     private void setUpMenu() {
-        menuBar = new JMenuBar();
 
         menuBar = new JMenuBar();
@@ -249 +279 @@
                 .getURL("fr/mael/jiwigo/img/zoom_n.png")));
         menuItemFlipH = new JMenuItem(Messages.getMessage("imageBrowser_flipH"), new ImageIcon(Outil
-                .getURL("fr/mael/jiwigo/img/flip_h.png")));
+                .getURL("fr/mael/jiwigo/img/small/flip_h.png")));
         menuItemFlipV = new JMenuItem(Messages.getMessage("imageBrowser_flipV"), new ImageIcon(Outil
-                .getURL("fr/mael/jiwigo/img/flip_v.png")));
+                .getURL("fr/mael/jiwigo/img/small/flip_v.png")));
         menuItemRotationG = new JMenuItem(Messages.getMessage("imageBrowser_rotationL"), new ImageIcon(Outil
-                .getURL("fr/mael/jiwigo/img/left.png")));
+                .getURL("fr/mael/jiwigo/img/small/left.png")));
         menuItemRotationD = new JMenuItem(Messages.getMessage("imageBrowser_rotationR"), new ImageIcon(Outil
-                .getURL("fr/mael/jiwigo/img/right.png")));
+                .getURL("fr/mael/jiwigo/img/small/right.png")));
         menuFichier.add(menuItemSave);
         menuFichier.addSeparator();
@@ -282 +312 @@
         menuItemRotationG.addActionListener(this);
         menuItemRotationD.addActionListener(this);
-        this.setJMenuBar(menuBar);
-
-    }
-
-    @Override
-    public void dispose() {
-        super.dispose();
-        Toolkit.getDefaultToolkit().removeAWTEventListener(generalListener);
-    }
+        this.add(menuBar, BorderLayout.NORTH);
+
+    }
+
+    //    @Override
+    //    public void dispose() {
+    //  //      super.dispose();
+    //  Toolkit.getDefaultToolkit().removeAWTEventListener(generalListener);
+    //    }
 
     @Override
     public void actionPerformed(ActionEvent e) {
         if (e.getSource().equals(comment)) {
-            new CommentsDialog(this, ImagesManagement.getCurrentImage().getIdentifiant());
+            new CommentsDialog(this, ImagesManagement.getInstance().getCurrentImage().getIdentifiant());
         } else if (e.getSource().equals(save)) {
             //opens the dialog to save the file
@@ -319 +349 @@
         } else if (e.getSource().equals(next)) {
             imagePanel.setDrawSelection(false);
-            ImagesManagement.next();
-            BufferedImage img;
+            ImagesManagement.getInstance().next();
             try {
-                img = ImagesManagement.getCurrentBufferedImage();
-                imagePanel.setImage(img);
+                changeImage();
             } catch (Exception e1) {
                 LOG.error(Outil.getStackTrace(e1));
@@ -330 +358 @@
         } else if (e.getSource().equals(previous)) {
             imagePanel.setDrawSelection(false);
-            ImagesManagement.previous();
-            BufferedImage img;
+            ImagesManagement.getInstance().previous();
             try {
-                img = ImagesManagement.getCurrentBufferedImage();
-                imagePanel.setImage(img);
+                changeImage();
             } catch (Exception e1) {
                 LOG.error(Outil.getStackTrace(e1));
@@ -346 +372 @@
             save.doClick();
         } else if (e.getSource().equals(menuItemClose)) {
-            this.dispose();
+            //      this.dispose();
         } else if (e.getSource().equals(menuItemZoomPlus)) {
             imagePanel.zoomIn();