Changeset 10750

Timestamp:

May 3, 2011, 8:27:59 PM (13 years ago)

Author:

mlg

Message:

Fixes a bug on the privacy level.

Location:

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

Files:

• mainframe/DialogPrivacyLevel.java (modified) (5 diffs)
• mainframe/ThumbnailCategoryPanel.java (modified) (1 diff)
• search/DialogChooseCategory.java (modified) (1 diff)

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

@@ -71 +71 @@
     private JLabel labelChoice;
 
+    private HashMap<Integer, Integer> mapLevels = new HashMap<Integer, Integer>();
+
     /**
      * Constructor
@@ -77 +79 @@
         super(MainFrame.getInstance());
         setModal(true);
+        mapLevels.put(0, 0);
+        mapLevels.put(1, 1);
+        mapLevels.put(2, 2);
+        mapLevels.put(3, 4);
+        mapLevels.put(4, 8);
         checkBoxRemember = new JCheckBox(Messages.getMessage("dialogPrivacy_remember"));
         labelChoice = new JLabel(Messages.getMessage("dialogPrivacy_choosePrivacy"));
@@ -101 +108 @@
     public void actionPerformed(ActionEvent arg0) {
         if (arg0.getSource().equals(buttonOk)) {
-            ImagesManagement.getInstance().setPrivacyLevel(comboPrivacyLevel.getSelectedIndex() + 1);
+            System.out.println(mapLevels.get(comboPrivacyLevel.getSelectedIndex()));
+            ImagesManagement.getInstance().setPrivacyLevel(mapLevels.get(comboPrivacyLevel.getSelectedIndex()));
             if (checkBoxRemember.isSelected()) {
                 ImagesManagement.getInstance().setRememberPrivacyLevel(true);
@@ -116 +124 @@
      */
     class privacyLevelModel extends AbstractListModel implements ComboBoxModel {
-        HashMap<Integer, String> mapLevels = new HashMap<Integer, String>();
 
         String[] privacies = new String[5];
@@ -123 +130 @@
 
         public privacyLevelModel() {
-            HashMap<Integer, String> mapLevels = new HashMap<Integer, String>();
-            mapLevels.put(0, "dialogPrivacy_none");
-            mapLevels.put(1, "dialogPrivacy_contacts");
-            mapLevels.put(2, "dialogPrivacy_friends");
-            mapLevels.put(3, "dialogPrivacy_family");
-            mapLevels.put(4, "dialogPrivacy_admin");
+
             privacies[0] = Messages.getMessage("dialogPrivacy_none");
             privacies[1] = Messages.getMessage("dialogPrivacy_contacts") + ", "

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

@@ -245 +245 @@
                 if (PreferencesManagement.getValue(PreferencesEnum.SENDING_METHOD.getLabel()).equals("0")) {
                     try {
-                        SpringUtils.getImageService().addSimple(files[i], category.getIdentifier(), files[i].getName());
+                        SpringUtils.getImageService().addSimple(files[i], category.getIdentifier(), files[i].getName(),
+                                imagesManagement.getPrivacyLevel());
                     } catch (JiwigoException e) {
                         LOG.error(Tools.getStackTrace(e));

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/DialogChooseCategory.java

@@ -168 +168 @@
                 if (PreferencesManagement.getValue(PreferencesEnum.SENDING_METHOD.getLabel()).equals("0")) {
                     try {
-                        SpringUtils.getImageService().addSimple(file, category.getIdentifier(), file.getName());
+                        SpringUtils.getImageService().addSimple(file, category.getIdentifier(), file.getName(),
+                                ImagesManagement.getInstance().getPrivacyLevel());
                     } catch (JiwigoException e) {
                         LOG.error(Tools.getStackTrace(e));