Changeset 6965 for extensions/jiwigo

Timestamp:

Sep 19, 2010, 3:38:04 PM (14 years ago)

Author:

mlg

Message:

removal of useless comments and System.out.println

Location:

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

Files:

• transverse/session/SessionManager.java (modified) (1 diff)
• transverse/util/Outil.java (modified) (1 diff)
• ui/mainframe/ThumbnailCategoryPanel.java (modified) (2 diffs)
• ui/mainframe/ThumbnailPanel.java (modified) (5 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/session/SessionManager.java

@@ -78 +78 @@
         this.motDePasse = motDePasse;
         this.url = url + "/ws.php";
-        System.out.println(this.url);
         client = new HttpClient();
         //utilisation d'un useragent linux, parce que c'est mieux 8)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/Outil.java

@@ -105 +105 @@
     public static Document stringToDocument(String string) throws JDOMException, IOException {
         SAXBuilder sb = new SAXBuilder();
-        System.out.println(string);
+        //      System.out.println(string);
         Document doc = sb.build(new StringReader(string));
         return doc;

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java

@@ -69 +69 @@
     public ThumbnailCategoryPanel(Integer categoryId) {
         this.categoryId = categoryId;
-        //      this.setLayout(new FlowLayout());
-        //      this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
         this.setLayout(new VerticalLayout());
-        //      this.setPreferredSize(new Dimension(900, 800));
         if (categoryId != null) {
             rafraichir(categoryId, false);
@@ -80 +77 @@
             public void filesDropped(final java.io.File[] files) {
                 new Thread(new ThreadEnvoiPhoto(files)).start();
-                //              for (int i = 0; i < files.length; i++) {
-                //                  try {
-                //                      ImageService.getInstance().creer(files[i].getCanonicalPath(), getCategoryId());
-                //                      //on rafraichit
-                //                      rafraichir(getCategoryId(), true);
-                //                  } catch (Exception e) {
-                //                      LOG.error(Outil.getStackTrace(e));
-                //                      //s'il y a une erreur lors de l'envoi
-                //                      JOptionPane.showMessageDialog(null, Messages.getMessage("sendingError") + files[i].getName(),
-                //                              Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
-                //                  }
-                //              }
 
             }

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java

@@ -6 +6 @@
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
 import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
 
 import fr.mael.jiwigo.om.Image;
@@ -46 +50 @@
  * C'est un panel "cliquable", qui permet d'afficher l'image à taille réelle
  */
-public class ThumbnailPanel extends JLabel implements MouseListener {
+public class ThumbnailPanel extends JLabel implements MouseListener, ActionListener {
     /**
      * Logger
@@ -56 +60 @@
      */
     private Image image;
+
+    /**
+     * Popup menu to edit images info
+     */
+    private JMenuItem menuEditer;
 
     /**
@@ -89 +98 @@
     @Override
     public void mouseClicked(MouseEvent paramMouseEvent) {
+        System.out.println(paramMouseEvent.getButton());
         // on affiche l'image en grand
         ImagesManagement.setCurrentImage(image);
         try {
-            new BrowserFrame(image);
+            if (paramMouseEvent.getButton() == 1) {
+                new BrowserFrame(image);
+            } else if (paramMouseEvent.getButton() == 3) {
+                JPopupMenu popup = new JPopupMenu();
+                JMenuItem menuEditer = new JMenuItem(Messages.getMessage("categories_add"));
+                menuEditer.addActionListener(this);
+                popup.show(this, paramMouseEvent.getX(), paramMouseEvent.getY());
+            }
         } catch (Exception e) {
             e.printStackTrace();
@@ -121 +138 @@
     }
 
+    @Override
+    public void actionPerformed(ActionEvent arg0) {
+
+    }
+
 }