Changeset 10748
- Timestamp:
- May 3, 2011, 7:51:19 PM (13 years ago)
- Location:
- extensions/jiwigo/trunk/src/main
- Files:
-
- 1 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/Main.java
r9921 r10748 66 66 try { 67 67 PreferencesManagement.creerFichierParDefaut(); 68 PreferencesManagement.checkValues(); 68 69 //dialog de connexion 69 70 ConnexionDialog dialog = new ConnexionDialog(); -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/enumeration/PreferencesEnum.java
r8830 r10748 37 37 CHUNK_SIZE("chunk_size"), WIDTH_ORIGINALE("width_original"), HEIGHT_ORIGINAL("height_original"), PASSWORD( 38 38 "password"), LOGIN("login"), URL_SITE("url"), USE_PROXY("use_proxy"), URL_PROXY("url_proxy"), PORT_PROXY( 39 "port_proxy"), USER_PROXY("user_proxy"), PASS_PROXY("password_proxy") ;39 "port_proxy"), USER_PROXY("user_proxy"), PASS_PROXY("password_proxy"), SENDING_METHOD("sending_method"); 40 40 41 41 protected String label; -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/preferences/PreferencesManagement.java
r9921 r10748 56 56 } 57 57 58 public static void checkValues() { 59 Document document = Tools.readFileAsDocument(getConfigFilePath()); 60 Element el = (Element) document.getDocumentElement().getElementsByTagName("sending_method").item(0); 61 if (el == null) { 62 setValue("sending_method", "0"); 63 } 64 } 65 58 66 /** 59 67 * Creation of the default file configuration … … 61 69 */ 62 70 public static void creerFichierParDefaut() throws IOException { 71 63 72 File outFile = new File(getConfigFilePath()); 64 73 if (!outFile.exists()) { … … 78 87 xml.append(" <user_proxy></user_proxy>\n"); 79 88 xml.append(" <password_proxy></password_proxy>\n"); 89 xml.append(" <sending_method>0</sending_method>\n"); 80 90 xml.append("</config>"); 81 91 FileWriter out = new FileWriter(outFile); … … 113 123 e.printStackTrace(); 114 124 Element element = document.createElement(key); 115 Tools.setStringValueDom(element, key,text);125 element.setTextContent(text); 116 126 document.getDocumentElement().appendChild(element); 127 117 128 } 118 129 Tools.writeXmlFile(document, getConfigFilePath()); … … 121 132 } 122 133 } 134 123 135 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java
r10697 r10748 217 217 //instanciation of the session manager 218 218 sessionManager.setLogin(loginField.getText()); 219 sessionManager.setPassword( passwordField.getText());219 sessionManager.setPassword(new String(passwordField.getPassword())); 220 220 sessionManager.setUrl(fieldUrl.getText() + "/ws.php"); 221 221 boolean echecProxy = false; … … 227 227 sessionManager.setUrlProxy(proxyPanel.getFieldUrl().getText()); 228 228 sessionManager.setLoginProxy(proxyPanel.getFieldLogin().getText()); 229 sessionManager.setPassProxy( proxyPanel.getFieldPassword().getText());229 sessionManager.setPassProxy(new String(proxyPanel.getFieldPassword().getPassword())); 230 230 sessionManager.setUsesProxy(true); 231 231 } catch (Exception e) { … … 238 238 if (checkBoxRetenir.isSelected()) { 239 239 PreferencesManagement.setValue(PreferencesEnum.LOGIN.getLabel(), loginField.getText()); 240 PreferencesManagement.setValue(PreferencesEnum.PASSWORD.getLabel(), passwordField.getText()); 240 PreferencesManagement.setValue(PreferencesEnum.PASSWORD.getLabel(), 241 new String(passwordField.getPassword())); 241 242 PreferencesManagement.setValue(PreferencesEnum.URL_SITE.getLabel(), fieldUrl.getText()); 242 243 PreferencesManagement … … 246 247 PreferencesManagement.setValue(PreferencesEnum.USER_PROXY.getLabel(), proxyPanel.getFieldLogin() 247 248 .getText()); 248 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), proxyPanel.getFieldPassword()249 .get SelectedText());249 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), new String(proxyPanel 250 .getFieldPassword().getPassword())); 250 251 PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), 251 252 String.valueOf(proxyPanel.getCheckBox().isSelected())); … … 258 259 PreferencesManagement 259 260 .setValue(PreferencesEnum.URL_PROXY.getLabel(), proxyPanel.getFieldUrl().getText()); 260 PreferencesManagement.setValue(PreferencesEnum.PORT_PROXY.getLabel(), proxyPanel.getFieldPort() 261 .getText()); 262 PreferencesManagement.setValue(PreferencesEnum.USER_PROXY.getLabel(), proxyPanel.getFieldLogin() 263 .getText()); 264 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), proxyPanel.getFieldPassword() 265 .getSelectedText()); 261 PreferencesManagement.setValue(PreferencesEnum.PORT_PROXY.getLabel(), ""); 262 PreferencesManagement.setValue(PreferencesEnum.USER_PROXY.getLabel(), ""); 263 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), ""); 266 264 PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), "false"); 267 265 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/BrowserPanel.java
r9878 r10748 100 100 private JPanel panelBoutons; 101 101 102 // private JButton delete = new JButton(); 103 102 104 /** 103 105 * clip the image … … 166 168 comment.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/comment.png"))); 167 169 cut.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/cut.png"))); 170 // delete.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/delete.png"))); 168 171 //on rend les boutons invisibles, pour ne voir que l'image 169 172 next.setFocusPainted(false); … … 188 191 cut.setBorderPainted(false); 189 192 cut.setContentAreaFilled(false); 193 // delete.setFocusPainted(false); 194 // delete.setBorderPainted(false); 195 // delete.setContentAreaFilled(false); 190 196 //ajout des action listeners 191 197 comment.addActionListener(this); … … 196 202 next.addActionListener(this); 197 203 cut.addActionListener(this); 204 // delete.addActionListener(this); 198 205 //ajout des boutons 199 206 panelBoutons.add(previous); … … 201 208 panelBoutons.add(rotateLeft); 202 209 panelBoutons.add(rotateRight); 210 // panelBoutons.add(delete); 203 211 // panelBoutons.add(cut); 204 212 panelBoutons.add(save); … … 265 273 menuBar.add(menuAffichage); 266 274 menuBar.add(menuImage); 267 menuItemSave = new JMenuItem(Messages.getMessage("imageBrowser_save"), new ImageIcon( Tools268 .getURL("fr/mael/jiwigo/img/save_mini.png")));269 menuItemPrint = new JMenuItem(Messages.getMessage("imageBrowser_print"), new ImageIcon( Tools270 .getURL("fr/mael/jiwigo/img/print.gif")));271 menuItemClose = new JMenuItem(Messages.getMessage("imageBrowser_close"), new ImageIcon( Tools272 .getURL("fr/mael/jiwigo/img/close.png")));273 menuItemZoomPlus = new JMenuItem(Messages.getMessage("imageBrowser_zoomPlus"), new ImageIcon( Tools274 .getURL("fr/mael/jiwigo/img/zoom_in.png")));275 menuItemZoomMoins = new JMenuItem(Messages.getMessage("imageBrowser_zoomMoins"), new ImageIcon( Tools276 .getURL("fr/mael/jiwigo/img/zoom_out.png")));277 menuItemNormal = new JMenuItem(Messages.getMessage("imageBrowser_zoomNormal"), new ImageIcon( Tools278 .getURL("fr/mael/jiwigo/img/zoom_n.png")));279 menuItemFlipH = new JMenuItem(Messages.getMessage("imageBrowser_flipH"), new ImageIcon( Tools280 .getURL("fr/mael/jiwigo/img/small/flip_h.png")));281 menuItemFlipV = new JMenuItem(Messages.getMessage("imageBrowser_flipV"), new ImageIcon( Tools282 .getURL("fr/mael/jiwigo/img/small/flip_v.png")));283 menuItemRotationG = new JMenuItem(Messages.getMessage("imageBrowser_rotationL"), new ImageIcon( Tools284 .getURL("fr/mael/jiwigo/img/small/left.png")));285 menuItemRotationD = new JMenuItem(Messages.getMessage("imageBrowser_rotationR"), new ImageIcon( Tools286 .getURL("fr/mael/jiwigo/img/small/right.png")));275 menuItemSave = new JMenuItem(Messages.getMessage("imageBrowser_save"), new ImageIcon( 276 Tools.getURL("fr/mael/jiwigo/img/save_mini.png"))); 277 menuItemPrint = new JMenuItem(Messages.getMessage("imageBrowser_print"), new ImageIcon( 278 Tools.getURL("fr/mael/jiwigo/img/print.gif"))); 279 menuItemClose = new JMenuItem(Messages.getMessage("imageBrowser_close"), new ImageIcon( 280 Tools.getURL("fr/mael/jiwigo/img/close.png"))); 281 menuItemZoomPlus = new JMenuItem(Messages.getMessage("imageBrowser_zoomPlus"), new ImageIcon( 282 Tools.getURL("fr/mael/jiwigo/img/zoom_in.png"))); 283 menuItemZoomMoins = new JMenuItem(Messages.getMessage("imageBrowser_zoomMoins"), new ImageIcon( 284 Tools.getURL("fr/mael/jiwigo/img/zoom_out.png"))); 285 menuItemNormal = new JMenuItem(Messages.getMessage("imageBrowser_zoomNormal"), new ImageIcon( 286 Tools.getURL("fr/mael/jiwigo/img/zoom_n.png"))); 287 menuItemFlipH = new JMenuItem(Messages.getMessage("imageBrowser_flipH"), new ImageIcon( 288 Tools.getURL("fr/mael/jiwigo/img/small/flip_h.png"))); 289 menuItemFlipV = new JMenuItem(Messages.getMessage("imageBrowser_flipV"), new ImageIcon( 290 Tools.getURL("fr/mael/jiwigo/img/small/flip_v.png"))); 291 menuItemRotationG = new JMenuItem(Messages.getMessage("imageBrowser_rotationL"), new ImageIcon( 292 Tools.getURL("fr/mael/jiwigo/img/small/left.png"))); 293 menuItemRotationD = new JMenuItem(Messages.getMessage("imageBrowser_rotationR"), new ImageIcon( 294 Tools.getURL("fr/mael/jiwigo/img/small/right.png"))); 287 295 menuFichier.add(menuItemSave); 288 296 menuFichier.addSeparator(); -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/PreferencesDialog.java
r6980 r10748 10 10 11 11 import javax.swing.JButton; 12 import javax.swing.JCheckBox; 12 13 import javax.swing.JDialog; 13 14 import javax.swing.JFrame; … … 101 102 102 103 /** 104 * label 105 */ 106 private JLabel labelMethodSending; 107 108 /** 103 109 * save the preferences 104 110 */ … … 114 120 */ 115 121 private JButton boutonAnnuler; 122 123 /** 124 * method to send 125 */ 126 private JCheckBox checkboxMethodSending; 116 127 117 128 /** … … 123 134 fieldHeight = new JTextField(PreferencesManagement.getValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel())); 124 135 fieldChunkSize = new JTextField(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE.getLabel())); 136 checkboxMethodSending = new JCheckBox(Messages.getMessage("preferences_useSimple")); 137 checkboxMethodSending.setSelected(PreferencesManagement.getValue(PreferencesEnum.SENDING_METHOD.getLabel()) 138 .equals("0")); 125 139 labelTaille = new JLabel(Messages.getMessage("preferences_imagesSize")); 126 140 labelCroix = new JLabel("x"); … … 147 161 c.gridx++; 148 162 panelImage.add(fieldChunkSize, c); 163 c.gridy++; 164 c.gridx = 0; 165 panelImage.add(checkboxMethodSending, c); 149 166 150 167 boutonAnnuler = new JButton(Messages.getMessage("cancel")); … … 179 196 PreferencesManagement.setValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel(), String.valueOf(height)); 180 197 PreferencesManagement.setValue(PreferencesEnum.CHUNK_SIZE.getLabel(), String.valueOf(chunk)); 198 PreferencesManagement.setValue(PreferencesEnum.SENDING_METHOD.getLabel(), 199 checkboxMethodSending.isSelected() ? "0" : "1"); 181 200 this.dispose(); 182 201 } catch (NumberFormatException ex) { 183 202 ex.printStackTrace(); 184 JOptionPane.showMessageDialog(this, Messages.getMessage("preferencesCheckValues"), Messages185 .getMessage("error"), JOptionPane.ERROR_MESSAGE);203 JOptionPane.showMessageDialog(this, Messages.getMessage("preferencesCheckValues"), 204 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 186 205 } catch (Exception ex) { 187 JOptionPane.showMessageDialog(this, Messages.getMessage("preferencesUnexpectedError"), Messages188 .getMessage("error"), JOptionPane.ERROR_MESSAGE);206 JOptionPane.showMessageDialog(this, Messages.getMessage("preferencesUnexpectedError"), 207 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 189 208 190 209 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java
r10717 r10748 243 243 "<html><i>" + (i + 1) + "/" + files.length + " : </i></html>"); 244 244 int nbProgressBar = ((i + 1) * 100) / files.length; 245 try { 246 Integer widthOriginal = Integer.valueOf(PreferencesManagement 247 .getValue(PreferencesEnum.WIDTH_ORIGINALE.getLabel())); 248 Integer heightOriginal = Integer.valueOf(PreferencesManagement 249 .getValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel())); 250 Double chunkSize = Double.valueOf(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE 251 .getLabel())); 252 253 SpringUtils.getImageService().create(files[i].getCanonicalPath(), categoryId, widthOriginal, 254 heightOriginal, chunkSize, imagesManagement.getPrivacyLevel()); 255 MainFrame.getInstance() 256 .setMessage(files[i].getName() + " " + Messages.getMessage("sendingSuccess")); 257 } catch (Exception e) { 258 LOG.error(Tools.getStackTrace(e)); 259 //displays a dialog if there is an error 260 JOptionPane.showMessageDialog(null, Messages.getMessage("sendingError") + files[i].getName(), 261 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 262 MainFrame.getInstance().setMessage(Messages.getMessage("sendingError") + " " + files[i].getName()); 263 } finally { 264 MainFrame.getInstance().getProgressBar().setValue(nbProgressBar); 245 if (PreferencesManagement.getValue(PreferencesEnum.SENDING_METHOD.getLabel()).equals("0")) { 246 try { 247 SpringUtils.getImageService().addSimple(files[i], category.getIdentifier(), files[i].getName()); 248 } catch (JiwigoException e) { 249 LOG.error(Tools.getStackTrace(e)); 250 //displays a dialog if there is an error 251 JOptionPane.showMessageDialog(null, Messages.getMessage("sendingError") + files[i].getName(), 252 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 253 MainFrame.getInstance().setMessage( 254 Messages.getMessage("sendingError") + " " + files[i].getName()); 255 } 256 } else { 257 try { 258 Integer widthOriginal = Integer.valueOf(PreferencesManagement 259 .getValue(PreferencesEnum.WIDTH_ORIGINALE.getLabel())); 260 Integer heightOriginal = Integer.valueOf(PreferencesManagement 261 .getValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel())); 262 Double chunkSize = Double.valueOf(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE 263 .getLabel())); 264 265 SpringUtils.getImageService().create(files[i].getCanonicalPath(), categoryId, widthOriginal, 266 heightOriginal, chunkSize, imagesManagement.getPrivacyLevel()); 267 MainFrame.getInstance().setMessage( 268 files[i].getName() + " " + Messages.getMessage("sendingSuccess")); 269 } catch (Exception e) { 270 LOG.error(Tools.getStackTrace(e)); 271 //displays a dialog if there is an error 272 JOptionPane.showMessageDialog(null, Messages.getMessage("sendingError") + files[i].getName(), 273 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 274 MainFrame.getInstance().setMessage( 275 Messages.getMessage("sendingError") + " " + files[i].getName()); 276 } finally { 277 MainFrame.getInstance().getProgressBar().setValue(nbProgressBar); 278 } 265 279 } 266 280 } … … 269 283 refresh(categoryId, true); 270 284 MainFrame.getInstance().getProgressBar().setValue(0); 271 imagesManagement.setSendingFiles( true);285 imagesManagement.setSendingFiles(false); 272 286 } 273 287 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/DialogChooseCategory.java
r10697 r10748 166 166 //at the end of the loop 167 167 for (File file : filesToSend) { 168 try { 169 Integer widthOriginal = Integer.valueOf(PreferencesManagement 170 .getValue(PreferencesEnum.WIDTH_ORIGINALE.getLabel())); 171 Integer heightOriginal = Integer.valueOf(PreferencesManagement 172 .getValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel())); 173 Double chunkSize = Double.valueOf(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE 174 .getLabel())); 175 SpringUtils.getImageService().create(file.getAbsolutePath(), category.getIdentifier(), 176 widthOriginal, heightOriginal, chunkSize, ImagesManagement.getInstance().getPrivacyLevel()); 177 } catch (WrongChunkSizeException ex) { 178 JOptionPane.showMessageDialog(null, Messages.getMessage("wrongChunkSizeError"), 179 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 180 LOG.error(Tools.getStackTrace(ex)); 181 break; 182 } catch (FileAlreadyExistsException e) { 183 alreadyExistingFiles.add(file); 184 } catch (Exception e) { 185 unExceptedFilesError.add(file); 186 LOG.error(Tools.getStackTrace(e)); 168 if (PreferencesManagement.getValue(PreferencesEnum.SENDING_METHOD.getLabel()).equals("0")) { 169 try { 170 SpringUtils.getImageService().addSimple(file, category.getIdentifier(), file.getName()); 171 } catch (JiwigoException e) { 172 LOG.error(Tools.getStackTrace(e)); 173 //displays a dialog if there is an error 174 JOptionPane.showMessageDialog(null, Messages.getMessage("sendingError") + file.getName(), 175 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 176 MainFrame.getInstance().setMessage(Messages.getMessage("sendingError") + " " + file.getName()); 177 } 178 } else { 179 try { 180 Integer widthOriginal = Integer.valueOf(PreferencesManagement 181 .getValue(PreferencesEnum.WIDTH_ORIGINALE.getLabel())); 182 Integer heightOriginal = Integer.valueOf(PreferencesManagement 183 .getValue(PreferencesEnum.HEIGHT_ORIGINAL.getLabel())); 184 Double chunkSize = Double.valueOf(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE 185 .getLabel())); 186 SpringUtils.getImageService().create(file.getAbsolutePath(), category.getIdentifier(), 187 widthOriginal, heightOriginal, chunkSize, 188 ImagesManagement.getInstance().getPrivacyLevel()); 189 } catch (WrongChunkSizeException ex) { 190 JOptionPane.showMessageDialog(null, Messages.getMessage("wrongChunkSizeError"), 191 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 192 LOG.error(Tools.getStackTrace(ex)); 193 break; 194 } catch (FileAlreadyExistsException e) { 195 alreadyExistingFiles.add(file); 196 } catch (Exception e) { 197 unExceptedFilesError.add(file); 198 LOG.error(Tools.getStackTrace(e)); 199 } 187 200 } 188 201 } -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages.properties
r10718 r10748 39 39 preferences_imagesSize=Images size 40 40 preferences_chunkSize=Chunks size (Mb) 41 preferences_useSimple=Send via "simple" method 41 42 42 43 ##################################################### -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_en.properties
r10718 r10748 39 39 preferences_imagesSize=Images size 40 40 preferences_chunkSize=Chunks size (Mb) 41 preferences_useSimple=Envoyer par méthode "simple" 41 42 42 43 ##################################################### -
extensions/jiwigo/trunk/src/main/resources/fr/mael/jiwigo/trad/messages_fr.properties
r10718 r10748 39 39 preferences_imagesSize=Taille des images 40 40 preferences_chunkSize=Taille des "morceaux" (en Mo) 41 preferences_useSimple=Envoyer par méthode "simple" 41 42 42 43 #####################################################
Note: See TracChangeset
for help on using the changeset viewer.