Changeset 6831 for extensions/jiwigo

Timestamp:

Sep 1, 2010, 6:48:53 PM (14 years ago)

Author:

mlg

Message:

Bug correction :
bug:0001837 : there is now a default translation file (in english), so the application won't crash when a translation is not found
bug:0001833 : the accents are manage when creating a new category
bug:0001832 : on a right click on the categories list, the selection is now visible
bug:0001830 : there is no bug on refreshing the categories tree

Features :
feature:001828 : exif and iptc tags are kept after resizing an image
feature:001827 : pwg.images.addChunk is now fully used : images are split into chunks before being sent

Other features :

• The user can manage his preferences :

-The web images size
-The chunks size

• The user can save the login informations (url, login, password) /!\ in a plain text file !

Location:

extensions/jiwigo/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/fr/mael/jiwigo/dao/CategoryDao.java (modified) (2 diffs)
• src/main/java/fr/mael/jiwigo/dao/ImageDao.java (modified) (4 diffs)
• src/main/java/fr/mael/jiwigo/service/CategoryService.java (modified) (2 diffs)
• src/main/java/fr/mael/jiwigo/service/ImageService.java (modified) (3 diffs)
• src/main/java/fr/mael/jiwigo/transverse/session/SessionManager.java (modified) (1 diff)
• src/main/java/fr/mael/jiwigo/transverse/util/MetadataExtractor.java (deleted)
• src/main/java/fr/mael/jiwigo/transverse/util/MetadataUtil.java (added)
• src/main/java/fr/mael/jiwigo/transverse/util/Outil.java (modified) (3 diffs)
• src/main/java/fr/mael/jiwigo/ui/browser/BrowserFrame.java (moved) (moved from extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/NavigateurFrame.java) (7 diffs)
• src/main/java/fr/mael/jiwigo/ui/browser/BrowserImagePanel.java (moved) (moved from extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/NavigateurImagePanel.java) (2 diffs)
• src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java (modified) (2 diffs)
• src/main/java/fr/mael/jiwigo/ui/mainframe/MainFrame.java (modified) (7 diffs)
• src/main/java/fr/mael/jiwigo/ui/mainframe/PreferencesDialog.java (added)
• src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java (moved) (moved from extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MiniaturesCategoryPanel.java) (3 diffs)
• src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java (moved) (moved from extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MiniaturePanel.java) (4 diffs)
• src/main/resources/fr/mael/jiwigo/trad/messages.properties (added)
• src/main/resources/fr/mael/jiwigo/trad/messages_fr.properties (modified) (2 diffs)

extensions/jiwigo/trunk/pom.xml

@@ -35 +35 @@
             <version>1.2.16</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sanselan</groupId>
+            <artifactId>sanselan</artifactId>
+            <version>0.97-incubator</version>
+        </dependency>
   </dependencies>
 </project>

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/dao/CategoryDao.java

@@ -52 +52 @@
      */
     private static CategoryDao instance;
-    /**
-     * Cache. non utilisé pour le moment
-     */
-    private List<Category> cache;
 
     /**
@@ -81 +77 @@
      * @throws IOException 
      */
-    public List<Category> lister(boolean rafraichir, boolean recursive) throws IOException {
-        if (cache == null || rafraichir) {
-            Document doc = Main.sessionManager.executerReturnDocument(MethodsEnum.LISTER_CATEGORIES.getLabel(),
-                    "recursive", String.valueOf(recursive));
-            Element element = doc.getRootElement().getChild("categories");
-            List<Element> listElement = (List<Element>) element.getChildren("category");
-            ArrayList<Category> categories = new ArrayList<Category>();
-            for (Element cat : listElement) {
-                Category myCat = new Category(cat);
-                categories.add(myCat);
-            }
-            this.cache = categories;
+    public List<Category> lister(boolean recursive) throws IOException {
+        Document doc = Main.sessionManager.executerReturnDocument(MethodsEnum.LISTER_CATEGORIES.getLabel(),
+                "recursive", String.valueOf(recursive));
+        Element element = doc.getRootElement().getChild("categories");
+        List<Element> listElement = (List<Element>) element.getChildren("category");
+        ArrayList<Category> categories = new ArrayList<Category>();
+        for (Element cat : listElement) {
+            Category myCat = new Category(cat);
+            categories.add(myCat);
         }
-        return cache;
+        return categories;
     }
 

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/dao/ImageDao.java

@@ -14 +14 @@
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum;
+import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum;
 import fr.mael.jiwigo.transverse.util.Outil;
+import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement;
 
 /**
@@ -157 +159 @@
         //on convertit la miniature en string base64
         BASE64Encoder base64 = new BASE64Encoder();
+
         String thumbnailBase64 = base64.encode(Outil.getBytesFromFile(image.getThumbnail()));
         //on envoie la miniature et on recupere la reponse
@@ -162 +165 @@
                 thumbnailBase64, "type", "thumb", "position", "1", "original_sum", Outil.getMD5Checksum(image
                         .getOriginale().getAbsolutePath())));
-        //on convertit le fichier original en string base64
-        String originaleBase64 = base64.encode(Outil.getBytesFromFile(image.getOriginale()));
-        //on envoie l'image originale et on recupere la reponse
-        Document reponseOriginale = (Main.sessionManager.executerReturnDocument("pwg.images.addChunk", "data",
-                originaleBase64, "type", "file", "position", "1", "original_sum", Outil.getMD5Checksum(image
-                        .getOriginale().getAbsolutePath())));
+
+        //begin feature:0001827
+        Double doubleChunk = Double.parseDouble(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE.getLabel())) * 1000 * 1024;
+        int chunk = doubleChunk.intValue();
+        ArrayList<File> fichiersAEnvoyer = Outil.splitFile(image.getOriginale(), chunk);
+        boolean echec = false;
+        for (int i = 0; i < fichiersAEnvoyer.size(); i++) {
+            File fichierAEnvoyer = fichiersAEnvoyer.get(i);
+            String originaleBase64 = base64.encode(Outil.getBytesFromFile(fichierAEnvoyer));
+            Document reponseOriginale = (Main.sessionManager.executerReturnDocument("pwg.images.addChunk", "data",
+                    originaleBase64, "type", "file", "position", String.valueOf(i), "original_sum", Outil
+                            .getMD5Checksum(image.getOriginale().getAbsolutePath())));
+            if (!Outil.checkOk(reponseOriginale)) {
+                echec = true;
+                break;
+            }
+        }
+        //end
+
         //on ajoute l'image en base et on recupere la reponse
         Document reponseAjout = (Main.sessionManager.executerReturnDocument("pwg.images.add", "file_sum", Outil
@@ -173 +189 @@
                 .getThumbnail().getCanonicalPath()), "position", "1", "original_sum", Outil.getMD5Checksum(image
                 .getOriginale().getAbsolutePath()), "categories", String.valueOf(image.getIdCategory()), "name", image
-                .getName(), "author", image.getAuteur()));
-
+                .getName(), "author", Main.sessionManager.getLogin()));
+        //      System.out.println(Main.sessionManager.executerReturnString("pwg.images.add", "file_sum", Outil
+        //              .getMD5Checksum(image.getOriginale().getAbsolutePath()), "thumbnail_sum", Outil.getMD5Checksum(image
+        //              .getThumbnail().getCanonicalPath()), "position", "1", "original_sum", Outil.getMD5Checksum(image
+        //              .getOriginale().getAbsolutePath()), "categories", String.valueOf(image.getIdCategory()), "name", image
+        //              .getName(), "author", Main.sessionManager.getLogin()));
         boolean reussite = true;
-        if (!Outil.checkOk(reponseThumb) || !Outil.checkOk(reponseOriginale) || !Outil.checkOk(reponseAjout)) {
+        if (!Outil.checkOk(reponseThumb) || echec || !Outil.checkOk(reponseAjout)) {
             reussite = false;
         }

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/service/CategoryService.java

@@ -73 +73 @@
      * @throws IOException 
      */
-    public List<Category> lister(boolean rafraichir, boolean recursive) throws IOException {
-        return CategoryDao.getInstance().lister(rafraichir, recursive);
+    public List<Category> lister(boolean recursive) throws IOException {
+        return CategoryDao.getInstance().lister(recursive);
     }
 
@@ -84 +84 @@
      */
     public List<Category> construireArbre() throws IOException {
-        List<Category> list = CategoryDao.getInstance().lister(false, true);
+        List<Category> list = CategoryDao.getInstance().lister(true);
         for (Category category : list) {
             for (Category category2 : list) {

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/service/ImageService.java

@@ -5 +5 @@
 import java.util.List;
 
-import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.dao.ImageDao;
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum;
 import fr.mael.jiwigo.transverse.util.ImagesUtil;
-import fr.mael.jiwigo.transverse.util.MetadataExtractor;
+import fr.mael.jiwigo.transverse.util.Outil;
 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement;
 
@@ -67 +66 @@
     }
 
+    /**
+     * Method called to send an image to the server.
+     
+     * @param filePath
+     * @param idCategory
+     * @return
+     * @throws Exception
+     */
     public boolean creer(String filePath, Integer idCategory) throws Exception {
+        //get the byte array of the original file, to keep metadata
+        byte[] bytesFichierOriginal = Outil.getBytesFromFile(new File(filePath));
+
+        //size taken from the user's preferences
         int widthOriginale = Integer
                 .valueOf(PreferencesManagement.getValue(PreferencesEnum.WIDTH_ORIGINALE.getLabel()));
         int heightOriginale = Integer.valueOf(PreferencesManagement
                 .getValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel()));
+        //resize the picture (or not)
         boolean originaleRedimensionnee = ImagesUtil.scale(filePath, "originale.jpg", widthOriginale, heightOriginale);
+        //create the thumbnail
         ImagesUtil.scale(filePath, "thumb.jpg", 120, 90);
+        //get the thumbnail
         File thumbnail = new File(System.getProperty("java.io.tmpdir") + "/thumb.jpg");
         File originale = null;
         if (originaleRedimensionnee) {
             originale = new File(System.getProperty("java.io.tmpdir") + "/originale.jpg");
+            //if the original file has been resized, we put the metadata in the resized file
+            //I use here a try catch because if the original file isn't a jpeg
+            //the methode Outil.enrich will fail, but the procedure has to continue
+            try {
+                byte[] fichierEnrichi = Outil.enrich(bytesFichierOriginal, Outil.getBytesFromFile(new File(System
+                        .getProperty("java.io.tmpdir")
+                        + "/originale.jpg")));
+                Outil.byteToFile(System.getProperty("java.io.tmpdir") + "/originale.jpg", fichierEnrichi);
+            } catch (Exception e) {
+            }
         } else {
             originale = new File(filePath);
-        }
-        MetadataExtractor medataExtractor = new MetadataExtractor(originale.getAbsolutePath());
-        String auteur = medataExtractor.getAuteur();
-        if (auteur == null) {
-            auteur = Main.sessionManager.getLogin();
+
         }
         Image image = new Image();
@@ -90 +110 @@
         image.setThumbnail(thumbnail);
         image.setOriginale(originale);
-        image.setAuteur(auteur);
         image.setIdCategory(idCategory);
+        //now we call the dao to send the image to the webservice
         return ImageDao.getInstance().creer(image);
     }
 
+    /**
+     * Deletes the file extension
+     * @param path
+     * @return
+     */
     private String getImageName(String path) {
         File fichier = new File(path);

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

@@ -119 +119 @@
             method.addParameter(parametres[i], parametres[i + 1]);
         }
+        //begin bug:0001833
+        method.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+        //end
+
         try {
             client.executeMethod(method);

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

@@ -2 +2 @@
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -14 +17 @@
 import java.net.URLClassLoader;
 import java.security.MessageDigest;
-
+import java.util.ArrayList;
+
+import org.apache.sanselan.Sanselan;
+import org.apache.sanselan.common.IImageMetadata;
+import org.apache.sanselan.formats.jpeg.JpegImageMetadata;
+import org.apache.sanselan.formats.jpeg.JpegPhotoshopMetadata;
+import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter;
+import org.apache.sanselan.formats.jpeg.iptc.JpegIptcRewriter;
+import org.apache.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
+import org.apache.sanselan.formats.tiff.write.TiffOutputSet;
 import org.jdom.Document;
 import org.jdom.JDOMException;
@@ -209 +221 @@
         return result.toString();
     }
+
+    /**
+     * Function that splits a file 
+     * @param fichier the file to split
+     * @param size the size of the resulting chunks
+     * @return the list of files
+     * @throws IOException
+     */
+    //feature:0001827
+    public static ArrayList<File> splitFile(File fichier, int size) throws IOException {
+        FileInputStream fis = new FileInputStream(fichier);
+        byte buffer[] = new byte[size];
+        ArrayList<File> listFichiers = new ArrayList<File>();
+        int count = 0;
+        while (true) {
+            int i = fis.read(buffer, 0, size);
+            if (i == -1)
+                break;
+            File file = new File(System.getProperty("java.io.tmpdir") + "/tempcut" + count);
+            listFichiers.add(file);
+            FileOutputStream fos = new FileOutputStream(file);
+            fos.write(buffer, 0, i);
+            fos.flush();
+            fos.close();
+
+            ++count;
+        }
+        return listFichiers;
+    }
+
+    /**
+     * Function used to put the exif and iptc metadata from one image to another
+     * @param enriched original image where the metadata comes from
+     * @param naked image where to put metadata
+     * @return enriched image
+     * @throws Exception
+     */
+    public static byte[] enrich(byte[] enriched, byte[] naked) throws Exception {
+
+        // read IPTC metadata from the original enriched image
+        IImageMetadata metadata = Sanselan.getMetadata(enriched);
+        JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
+        JpegPhotoshopMetadata photoshopMetadata = jpegMetadata.getPhotoshop();
+        if (photoshopMetadata == null) {
+            return naked;
+        }
+
+        PhotoshopApp13Data data = photoshopMetadata.photoshopApp13Data;
+
+        // read the EXIF metadata from the parsed JPEG metadata
+        TiffOutputSet outputSet = jpegMetadata.getExif().getOutputSet();
+
+        // enrich the naked byte[] with EXIF metadata
+        ExifRewriter writer = new ExifRewriter();
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        writer.updateExifMetadataLossless(naked, outputStream, outputSet);
+
+        // enrich the partially clothed byte[] with IPTC metadata
+        InputStream src = new ByteArrayInputStream(outputStream.toByteArray());
+        ByteArrayOutputStream dest = new ByteArrayOutputStream();
+        new JpegIptcRewriter().writeIPTC(src, dest, data);
+
+        // return the fully clothed image as a byte[]
+        return dest.toByteArray();
+    }
+
+    public static void byteToFile(String fichier, byte[] bytes) throws IOException {
+        FileOutputStream fos = new FileOutputStream(fichier);
+        fos.write(bytes);
+        fos.flush();
+        fos.close();
+
+    }
 }

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

@@ -68 +68 @@
  *
  */
-public class NavigateurFrame extends JFrame implements ActionListener {
+public class BrowserFrame extends JFrame implements ActionListener {
     /**
      * Logger
      */
     public static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
-            .getLog(NavigateurFrame.class);
+            .getLog(BrowserFrame.class);
     /**
      * bouton pour passer à l'image suivante
@@ -106 +106 @@
      * Panel qui contient l'image
      */
-    private NavigateurImagePanel imagePanel;
+    private BrowserImagePanel imagePanel;
 
     /**
@@ -126 +126 @@
     private AWTEventListener generalListener;
 
-    public NavigateurFrame(Image image) {
+    public BrowserFrame(Image image) {
         this.setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(Outil.getURL("fr/mael/jiwigo/img/icon.png")));
         this.setTitle(Messages.getMessage("titleBrowser"));
@@ -174 +174 @@
         try {
             img = ImageIO.read(new URL(ImagesManagement.getCurrentImage().getUrl()));
-            imagePanel = new NavigateurImagePanel(img);
+            imagePanel = new BrowserImagePanel(img);
         } catch (Exception e1) {
             LOG.error(Outil.getStackTrace(e1));
@@ -183 +183 @@
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         this.getRootPane().setWindowDecorationStyle(JRootPane.PLAIN_DIALOG);
-        this.setExtendedState(JFrame.MAXIMIZED_BOTH);
-        this.setExtendedState(JFrame.ICONIFIED | this.getExtendedState());
+        this.setExtendedState(getExtendedState() | JFrame.MAXIMIZED_BOTH);
+        //      this.setExtendedState(JFrame.ICONIFIED | this.getExtendedState());
         panelBoutons.add(imagePanel.getSlider());
         imagePanel.setLayout(new BorderLayout());
@@ -194 +194 @@
         this.setLocationRelativeTo(null);
         this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        this.setVisible(true);
+        setUpMenu();
         //instanciation du listener general
         this.generalListener = new AWTEventListener() {
@@ -209 +209 @@
             }
         };
+        this.setVisible(true);
+
         //ajout du listener general
         //Toolkit.getDefaultToolkit().addAWTEventListener(generalListener, AWTEvent.KEY_EVENT_MASK);
-        setUpMenu();
 
     }

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

@@ -52 +52 @@
  *
  */
-public class NavigateurImagePanel extends JPanel implements MouseWheelListener, Printable {
+public class BrowserImagePanel extends JPanel implements MouseWheelListener, Printable {
     private BufferedImage image;
     private double scale = 1.0;
@@ -63 +63 @@
      * @param image
      */
-    public NavigateurImagePanel(BufferedImage image) {
+    public BrowserImagePanel(BufferedImage image) {
         this.image = image;
         this.addMouseWheelListener(this);

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

@@ -106 +106 @@
      */
     public void setUpUi() {
+        //begin bug:0001830
         root.removeAllChildren();
         createNodes(root);
-        DefaultTreeModel model = (DefaultTreeModel) tree.getModel();
-        model.nodeStructureChanged(root);
+        ((DefaultTreeModel) tree.getModel()).reload();
+        //end
+
     }
 
@@ -183 +185 @@
         int selRow = tree.getRowForLocation(e.getX(), e.getY());
         TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
+        //begin bug:0001832
+        tree.setSelectionRow(selRow);
+        //end
         if (selRow != -1) {
             if (e.getButton() == 3) {

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

@@ -3 +3 @@
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -42 +47 @@
  * Frame principale
  */
-public class MainFrame extends JFrame {
+public class MainFrame extends JFrame implements ActionListener {
     /**
      * Logger
@@ -60 +65 @@
      * Panel contenant les miniatures de la catégorie courante
      */
-    public static MiniaturesCategoryPanel imagesPanel;
+    public static ThumbnailCategoryPanel imagesPanel;
     /**
      *  Scrollpane contenant le panel ci dessus
@@ -69 +74 @@
      */
     private JLabel labelMessage;
+
+    /**
+     * Barre de menu
+     */
+    private JMenuBar jMenuBar;
+
+    /**
+     * Menu d'édition
+     */
+    private JMenu jMenuEdition;
+
+    /**
+     * menu des preferences
+     */
+    private JMenuItem jMenuItemPreferences;
 
     /**
@@ -92 +112 @@
         this.setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(Outil.getURL("fr/mael/jiwigo/img/icon.png")));
         this.setLayout(new BorderLayout());
+        jMenuBar = new JMenuBar();
         labelMessage = new JLabel(Messages.getMessage("welcomeMessage"));
         splitPane = new JSplitPane();
         categoriesTree = new CategoriesTree();
         splitPane.setLeftComponent(categoriesTree);
-        imagesPanel = new MiniaturesCategoryPanel(null);
+        imagesPanel = new ThumbnailCategoryPanel(null);
         scrollPaneImagesPanel = new JScrollPane(imagesPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                 JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
@@ -104 +125 @@
         JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
         panel.add(labelMessage);
+
+        jMenuEdition = new JMenu(Messages.getMessage("mainFrame_editionMenu"));
+        jMenuBar.add(jMenuEdition);
+        jMenuItemPreferences = new JMenuItem(Messages.getMessage("mainFrame_preferencesMenu"));
+        jMenuItemPreferences.addActionListener(this);
+        jMenuEdition.add(jMenuItemPreferences);
+
+        this.setJMenuBar(jMenuBar);
         this.add(panel, BorderLayout.SOUTH);
         this.pack();
@@ -134 +163 @@
     }
 
+    @Override
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource().equals(jMenuItemPreferences)) {
+            new PreferencesDialog(this);
+        }
+
+    }
+
 }

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

@@ -43 +43 @@
  * Classe qui affiche toutes les miniatures d'une catégorie
  */
-public class MiniaturesCategoryPanel extends JPanel {
+public class ThumbnailCategoryPanel extends JPanel {
     /**
      * Logger
      */
     public static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
-            .getLog(MiniaturesCategoryPanel.class);
+            .getLog(ThumbnailCategoryPanel.class);
     /**
      * L'id de la catégorie pour laquelle les miniatures doivent être affichées
@@ -58 +58 @@
      * @param categoryId l'id de la catégorie
      */
-    public MiniaturesCategoryPanel(Integer categoryId) {
+    public ThumbnailCategoryPanel(Integer categoryId) {
         this.categoryId = categoryId;
         this.setLayout(new FlowLayout());
@@ -98 +98 @@
                 try {
                     //              MiniatureLabel label = new MiniatureLabel(image, this);
-                    MiniaturePanel panel = new MiniaturePanel(image);
+                    ThumbnailPanel panel = new ThumbnailPanel(image);
                     this.add(panel);
                 } catch (Exception e) {

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

@@ -13 +13 @@
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.ui.ImagesManagement;
-import fr.mael.jiwigo.ui.browser.NavigateurFrame;
+import fr.mael.jiwigo.ui.browser.BrowserFrame;
 
 /**
@@ -45 +45 @@
  * C'est un panel "cliquable", qui permet d'afficher l'image à taille réelle
  */
-public class MiniaturePanel extends JLabel implements MouseListener {
+public class ThumbnailPanel extends JLabel implements MouseListener {
     /**
      * Logger
      */
     public static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
-            .getLog(MiniaturePanel.class);
+            .getLog(ThumbnailPanel.class);
     /**
      * l'image
@@ -61 +61 @@
      * @param imagesPanel le panel
      */
-    public MiniaturePanel(Image image) {
+    public ThumbnailPanel(Image image) {
         this.image = image;
         this.addMouseListener(this);
@@ -88 +88 @@
         // on affiche l'image en grand
         ImagesManagement.setCurrentImage(image);
-        new NavigateurFrame(image);
+        try {
+            new BrowserFrame(image);
+        } catch (Exception e) {
+
+        }
 
     }

extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_fr.properties

@@ -8 +8 @@
 loading=Chargement...
 titleBrowser=Jiwigo :: Navigateur de fichiers
+cancel=Annuler
+
+#####################################################
+################### Main Frame ######################
+#####################################################
+mainFrame_editionMenu=Edition
+mainFrame_preferencesMenu=Préférences
+
+#####################################################
+################## Preferences ######################
+#####################################################
+preferences_tabImage=Images
+preferences_imagesSize=Taille des images
+preferences_chunkSize=Taille des "morceaux" (en Mo)
+
 
 #####################################################
@@ -20 +35 @@
 imagesListingError=Erreur lors de la récupération des images
 configDefaultCreation=Erreur lors de la création des fichiers de configuration par défaut
+preferencesCheckValues=Veuillez vérifier les valeurs entrées
+preferencesUnexpectedError=<html>Une erreur inattendue s'est produite. Les préférences ne seront<br/>probablement pas mises à jour</html>
 
 #####################################################