Changeset 10751

Timestamp:

May 3, 2011, 8:46:36 PM (13 years ago)

Author:

mlg

Message:

Adds an exception management + changes privacy level dialog.

Location:

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

Files:

• DialogPrivacyLevel.java (modified) (2 diffs)
• ThumbnailPanel.java (modified) (1 diff)

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

@@ -85 +85 @@
         mapLevels.put(4, 8);
         checkBoxRemember = new JCheckBox(Messages.getMessage("dialogPrivacy_remember"));
-        labelChoice = new JLabel(Messages.getMessage("dialogPrivacy_choosePrivacy"));
-        JPanel panelChoice = new JPanel(new FlowLayout());
+        labelChoice = new JLabel(Messages.getMessage("dialogPrivacy_choosePrivacy"), JLabel.CENTER);
+        JPanel panelChoice = new JPanel(new FlowLayout(FlowLayout.CENTER));
         comboPrivacyLevel = new JComboBox(new privacyLevelModel());
         comboPrivacyLevel.setSelectedIndex(0);
@@ -96 +96 @@
         panelButton.add(buttonOk);
         this.setLayout(new BorderLayout());
-        this.add(panelChoice, BorderLayout.NORTH);
-        this.add(panelButton, BorderLayout.CENTER);
+        this.add(labelChoice, BorderLayout.NORTH);
+        this.add(panelChoice, BorderLayout.CENTER);
+        this.add(panelButton, BorderLayout.SOUTH);
 
         this.pack();

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

@@ -132 +132 @@
      */
     public Dimension getPreferredSize() {
-        int w = (int) (ImagesManagement.getInstance().getMiniatureBufferedImage(image).getWidth());
-        int h = (int) (ImagesManagement.getInstance().getMiniatureBufferedImage(image).getHeight() + 10);
-        return new Dimension(w, h);
+        try {
+            int w = (int) (ImagesManagement.getInstance().getMiniatureBufferedImage(image).getWidth());
+            int h = (int) (ImagesManagement.getInstance().getMiniatureBufferedImage(image).getHeight() + 10);
+            return new Dimension(w, h);
+        } catch (NullPointerException e) {
+            return new Dimension(100, 100);
+        }
     }