Changeset 6832

Timestamp:

Sep 1, 2010, 8:49:20 PM (14 years ago)

Author:

mlg

Message:

Bug correction :
The scrollpane on the thumbnails viewer did not work. Now it works and each row of the viewer contains 6 thumbnails.
The scrollpane is displayed "as needed".

Location:

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

Files:

• transverse/session/SessionManager.java (modified) (1 diff)
• ui/mainframe/MainFrame.java (modified) (3 diffs)
• ui/mainframe/ThumbnailCategoryPanel.java (modified) (3 diffs)

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

@@ -125 +125 @@
         try {
             client.executeMethod(method);
-            return (method.getResponseBodyAsString());
+            String toReturn = method.getResponseBodyAsString();
+            LOG.debug(toReturn);
+            return toReturn;
         } catch (HttpException e) {
             // TODO Auto-generated catch block

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

@@ -2 +2 @@
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -118 +120 @@
         splitPane.setLeftComponent(categoriesTree);
         imagesPanel = new ThumbnailCategoryPanel(null);
+        reduceSizeOfComponent(imagesPanel);
         scrollPaneImagesPanel = new JScrollPane(imagesPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-                JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+                JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        scrollPaneImagesPanel.setPreferredSize(new Dimension(900, 700));
         splitPane.setRightComponent(scrollPaneImagesPanel);
 
@@ -171 +175 @@
     }
 
+    public static void reduceHeightOfComponent(JComponent comp) {
+        comp.setMaximumSize(new Dimension(comp.getMaximumSize().width, comp.getPreferredSize().height));
+    }
+
+    public static void reduceWidthOfComponent(JComponent comp) {
+        comp.setMaximumSize(new Dimension(comp.getPreferredSize().width, comp.getMaximumSize().height));
+    }
+
+    public static void reduceSizeOfComponent(JComponent comp) {
+        comp.setMaximumSize(comp.getPreferredSize());
+    }
+
 }

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

@@ -1 +1 @@
 package fr.mael.jiwigo.ui.mainframe;
 
-import java.awt.Dimension;
 import java.awt.FlowLayout;
 
+import javax.swing.BoxLayout;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -60 +60 @@
     public ThumbnailCategoryPanel(Integer categoryId) {
         this.categoryId = categoryId;
-        this.setLayout(new FlowLayout());
-        this.setPreferredSize(new Dimension(1000, 750));
+        //      this.setLayout(new FlowLayout());
+        this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
+        //      this.setPreferredSize(new Dimension(900, 800));
         if (categoryId != null) {
             rafraichir(categoryId, false);
@@ -93 +94 @@
         this.categoryId = categoryId;
         this.removeAll();
+        int nb = 1;
+        JPanel panelh = new JPanel(new FlowLayout());
         try {
             ImagesManagement.LIST_IMAGE = ImageService.getInstance().listerParCategory(categoryId, rafraichir);
             for (Image image : ImagesManagement.LIST_IMAGE) {
                 try {
-                    //              MiniatureLabel label = new MiniatureLabel(image, this);
-                    ThumbnailPanel panel = new ThumbnailPanel(image);
-                    this.add(panel);
+
+                    if (nb == 7) {
+                        this.add(panelh);
+                        panelh = new JPanel(new FlowLayout());
+                        nb = 0;
+                    } else {
+                        ThumbnailPanel panel = new ThumbnailPanel(image);
+                        panelh.add(panel);
+                    }
+                    nb++;
+
                 } catch (Exception e) {