Changeset 10697 for extensions/jiwigo
- Timestamp:
- Apr 30, 2011, 12:43:16 PM (13 years ago)
- Location:
- extensions/jiwigo/trunk/src
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/ImagesManagement.java
r9921 r10697 2 2 3 3 import java.awt.image.BufferedImage; 4 import java.io.IOException;5 4 import java.net.URL; 6 5 import java.util.HashMap; … … 10 9 11 10 import fr.mael.jiwigo.om.Image; 12 import fr.mael.jiwigo.transverse.exception. ProxyAuthenticationException;11 import fr.mael.jiwigo.transverse.exception.JiwigoException; 13 12 import fr.mael.jiwigo.transverse.util.Tools; 14 13 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; … … 155 154 listImage = SpringUtils.getImageService().listByCategory(image.getIdCategory(), true); 156 155 currentCategory = image.getIdCategory(); 157 } catch (IOException e) { 158 LOG.error(Tools.getStackTrace(e)); 159 } catch (ProxyAuthenticationException e) { 156 } catch (JiwigoException e) { 160 157 LOG.error(Tools.getStackTrace(e)); 161 158 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java
r9921 r10697 33 33 import fr.mael.jiwigo.Main; 34 34 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; 35 import fr.mael.jiwigo.transverse.exception.JiwigoException; 36 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 35 37 import fr.mael.jiwigo.transverse.session.SessionManager; 36 38 import fr.mael.jiwigo.transverse.util.Messages; … … 207 209 //if one field is empty, an error is displayed 208 210 if (fieldUrl.getText().equals("") || loginField.getText().equals("") || passwordField.getText().equals("")) { 209 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_emptyField"), Messages210 .getMessage("error"), JOptionPane.ERROR_MESSAGE);211 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_emptyField"), 212 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 211 213 } else { 212 214 if (!fieldUrl.getText().startsWith("http://")) { … … 245 247 .getText()); 246 248 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), proxyPanel.getFieldPassword() 247 .get Text());248 PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), String.valueOf(proxyPanel249 .getCheckBox().isSelected()));249 .getSelectedText()); 250 PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), 251 String.valueOf(proxyPanel.getCheckBox().isSelected())); 250 252 } 251 253 //... or not … … 261 263 .getText()); 262 264 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), proxyPanel.getFieldPassword() 263 .get Text());265 .getSelectedText()); 264 266 PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), "false"); 265 267 } … … 268 270 JOptionPane.ERROR_MESSAGE); 269 271 } else { 270 int response = sessionManager.processLogin(); 272 int response = 0; 273 try { 274 response = sessionManager.processLogin(); 275 } catch (JiwigoException e) { 276 if (e.getCause() != null && ProxyAuthenticationException.class.equals(e.getCause().getClass())) { 277 response = 2; 278 } else { 279 response = 1; 280 } 281 } 271 282 if (response == 0) { 272 283 Main.showFrame(); … … 275 286 } else if (response == 1) { 276 287 //if the login fails, an error is displayed 277 if (!sessionManager.isProxyError()) { 278 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_connexionError"), 279 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 280 } 288 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_connexionError"), 289 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 281 290 } else if (response == 2) { 282 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_proxyAuthError"), Messages283 .getMessage("error"), JOptionPane.ERROR_MESSAGE);291 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_proxyAuthError"), 292 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 284 293 } 285 294 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/comments/CommentsDialog.java
r9921 r10697 10 10 import java.awt.event.ActionEvent; 11 11 import java.awt.event.ActionListener; 12 import java.io.IOException;13 12 import java.util.List; 14 13 … … 21 20 22 21 import fr.mael.jiwigo.om.Comment; 23 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;24 22 import fr.mael.jiwigo.transverse.util.Messages; 25 23 import fr.mael.jiwigo.transverse.util.Tools; … … 135 133 comment.getDate()); 136 134 } else { 137 panel = new CommentPanel(new Color(77, 204, 51), comment.getContent(), comment.getAuthor(), comment138 .getDate());135 panel = new CommentPanel(new Color(77, 204, 51), comment.getContent(), comment.getAuthor(), 136 comment.getDate()); 139 137 } 140 138 alternate = !alternate; … … 144 142 } catch (Exception e) { 145 143 LOG.error(Tools.getStackTrace(e)); 146 JOptionPane.showMessageDialog(null, Messages.getMessage("commentListingError"), Messages147 .getMessage("error"), JOptionPane.ERROR_MESSAGE);144 JOptionPane.showMessageDialog(null, Messages.getMessage("commentListingError"), 145 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 148 146 } 149 147 panelAjouterCommentaire.add(scrollPaneArea); … … 169 167 reussite = SpringUtils.getCommentService().create(text, this.imageId, 170 168 SpringUtils.getSessionManager().getLogin()); 171 } catch (IOException e) {172 reussite = false;173 LOG.error(Tools.getStackTrace(e));174 } catch (ProxyAuthenticationException e) {175 reussite = false;176 LOG.error(Tools.getStackTrace(e));177 169 } catch (Exception e) { 178 170 reussite = false; … … 182 174 rafraichir(); 183 175 } else { 184 JOptionPane.showMessageDialog(null, Messages.getMessage("addCommentError"), Messages185 .getMessage("error"), JOptionPane.ERROR_MESSAGE);176 JOptionPane.showMessageDialog(null, Messages.getMessage("addCommentError"), 177 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 186 178 } 187 179 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java
r9921 r10697 24 24 25 25 import fr.mael.jiwigo.om.Category; 26 import fr.mael.jiwigo.transverse.exception. ProxyAuthenticationException;26 import fr.mael.jiwigo.transverse.exception.JiwigoException; 27 27 import fr.mael.jiwigo.transverse.util.Messages; 28 28 import fr.mael.jiwigo.transverse.util.Tools; … … 234 234 setUpUi(); 235 235 } else { 236 JOptionPane.showMessageDialog(null, Messages.getMessage("categoryCreationError"), Messages237 .getMessage("error"), JOptionPane.ERROR_MESSAGE);236 JOptionPane.showMessageDialog(null, Messages.getMessage("categoryCreationError"), 237 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 238 238 239 239 } 240 240 } catch (HeadlessException e) { 241 241 LOG.error(Tools.getStackTrace(e)); 242 } catch ( ProxyAuthenticationException e) {242 } catch (JiwigoException e) { 243 243 LOG.error(Tools.getStackTrace(e)); 244 244 } catch (Exception e) { … … 250 250 setUpUi(); 251 251 } else { 252 JOptionPane.showMessageDialog(null, Messages.getMessage("categoryCreationError"), Messages253 .getMessage("error"), JOptionPane.ERROR_MESSAGE);252 JOptionPane.showMessageDialog(null, Messages.getMessage("categoryCreationError"), 253 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 254 254 255 255 } 256 256 } catch (HeadlessException e) { 257 257 LOG.error(Tools.getStackTrace(e)); 258 } catch ( ProxyAuthenticationException e) {258 } catch (JiwigoException e) { 259 259 LOG.error(Tools.getStackTrace(e)); 260 260 } catch (Exception e) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java
r9921 r10697 5 5 import java.awt.Graphics; 6 6 import java.io.File; 7 import java.io.IOException;8 7 9 8 import javax.swing.JOptionPane; … … 14 13 import fr.mael.jiwigo.transverse.ImagesManagement; 15 14 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; 16 import fr.mael.jiwigo.transverse.exception. ProxyAuthenticationException;15 import fr.mael.jiwigo.transverse.exception.JiwigoException; 17 16 import fr.mael.jiwigo.transverse.util.Messages; 18 17 import fr.mael.jiwigo.transverse.util.Tools; … … 107 106 } 108 107 if (imagesManagement.isSendingFiles()) { 109 JOptionPane.showMessageDialog(null, Messages.getMessage("alreadySendingError"), Messages110 .getMessage("error"), JOptionPane.ERROR_MESSAGE);108 JOptionPane.showMessageDialog(null, Messages.getMessage("alreadySendingError"), 109 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 111 110 } else { 112 111 new Thread(new ThreadEnvoiPhoto(files)).start(); … … 164 163 try { 165 164 imagesManagement.setListImage(SpringUtils.getImageService().listByCategory(categoryId, false)); 166 } catch ( IOException e1) {165 } catch (JiwigoException e1) { 167 166 LOG.error(Tools.getStackTrace(e1)); 168 } catch (ProxyAuthenticationException e) {169 LOG.error(Tools.getStackTrace(e));170 167 } 171 168 for (Image image : imagesManagement.getListImage()) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java
r9921 r10697 13 13 import java.awt.event.MouseEvent; 14 14 import java.awt.event.MouseListener; 15 import java.io.IOException;16 15 import java.util.List; 17 16 … … 30 29 import fr.mael.jiwigo.om.Tag; 31 30 import fr.mael.jiwigo.transverse.ImagesManagement; 32 import fr.mael.jiwigo.transverse.exception. ProxyAuthenticationException;31 import fr.mael.jiwigo.transverse.exception.JiwigoException; 33 32 import fr.mael.jiwigo.transverse.util.Messages; 34 33 import fr.mael.jiwigo.transverse.util.Tools; … … 211 210 dialogChoixTags.setLocationRelativeTo(null); 212 211 dialogChoixTags.setVisible(true); 213 } catch (IOException e) { 214 LOG.error(Tools.getStackTrace(e)); 215 } catch (ProxyAuthenticationException e) { 212 } catch (JiwigoException e) { 216 213 LOG.error(Tools.getStackTrace(e)); 217 214 } … … 224 221 tagIds.deleteCharAt(tagIds.lastIndexOf(",")); 225 222 try { 226 try { 227 if (!SpringUtils.getImageService().addTags(image, tagIds.toString())) { 228 JOptionPane.showMessageDialog(this, Messages.getMessage("addingTagsError"), Messages 229 .getMessage("error"), JOptionPane.ERROR_MESSAGE); 230 } else { 231 dialogChoixTags.dispose(); 232 } 233 } catch (HeadlessException e) { 234 LOG.error(Tools.getStackTrace(e)); 235 } catch (ProxyAuthenticationException e) { 236 LOG.error(Tools.getStackTrace(e)); 223 if (!SpringUtils.getImageService().addTags(image, tagIds.toString())) { 224 JOptionPane.showMessageDialog(this, Messages.getMessage("addingTagsError"), 225 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 226 } else { 227 dialogChoixTags.dispose(); 237 228 } 238 } catch (IOException e) { 239 e.printStackTrace(); 229 } catch (HeadlessException e) { 230 LOG.error(Tools.getStackTrace(e)); 231 } catch (JiwigoException e) { 232 LOG.error(Tools.getStackTrace(e)); 240 233 } 241 234 -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/DialogChooseCategory.java
r9921 r10697 5 5 import java.awt.event.ActionEvent; 6 6 import java.awt.event.ActionListener; 7 import java.io.IOException;8 7 import java.util.ArrayList; 9 8 import java.util.List; … … 19 18 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; 20 19 import fr.mael.jiwigo.transverse.exception.FileAlreadyExistsException; 21 import fr.mael.jiwigo.transverse.exception. ProxyAuthenticationException;20 import fr.mael.jiwigo.transverse.exception.JiwigoException; 22 21 import fr.mael.jiwigo.transverse.exception.WrongChunkSizeException; 23 22 import fr.mael.jiwigo.transverse.util.Messages; … … 99 98 categories = SpringUtils.getCategoryService().makeTree(); 100 99 createCategoriesTree(); 101 } catch ( IOException e) {100 } catch (JiwigoException e) { 102 101 e.printStackTrace(); 103 } catch (ProxyAuthenticationException e) {104 LOG.error(Tools.getStackTrace(e));105 102 } 106 103 … … 179 176 widthOriginal, heightOriginal, chunkSize, ImagesManagement.getInstance().getPrivacyLevel()); 180 177 } catch (WrongChunkSizeException ex) { 181 JOptionPane.showMessageDialog(null, Messages.getMessage("wrongChunkSizeError"), Messages182 .getMessage("error"), JOptionPane.ERROR_MESSAGE);178 JOptionPane.showMessageDialog(null, Messages.getMessage("wrongChunkSizeError"), 179 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 183 180 LOG.error(Tools.getStackTrace(ex)); 184 181 break; -
extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/TestBase.java
r9921 r10697 5 5 import org.junit.Test; 6 6 7 import fr.mael.jiwigo.transverse.exception.JiwigoException; 7 8 import fr.mael.jiwigo.transverse.session.SessionManager; 8 9 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 9 10 10 11 public class TestBase { 11 public TestBase() {12 public TestBase() throws JiwigoException { 12 13 SessionManager sessionManager = SpringUtils.getSessionManager(); 13 14 sessionManager.setLogin("mael"); -
extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/service/CategoryServiceTest.java
r9921 r10697 1 1 package fr.mael.jiwigo.service; 2 2 3 import java.io.IOException;4 3 import java.util.Date; 5 4 … … 9 8 10 9 import fr.mael.jiwigo.TestBase; 10 import fr.mael.jiwigo.transverse.exception.JiwigoException; 11 11 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 12 12 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 13 13 14 14 public class CategoryServiceTest extends TestBase { 15 public CategoryServiceTest() {15 public CategoryServiceTest() throws JiwigoException { 16 16 super(); 17 17 } … … 20 20 * Test of the listing method 21 21 * @throws ProxyAuthenticationException 22 * @throws JiwigoException 22 23 */ 23 24 @Test 24 public void ListerTest() throws ProxyAuthenticationException { 25 try { 26 SpringUtils.getCategoryService().list(true); 27 SpringUtils.getCategoryService().list(false); 28 } catch (IOException e) { 29 e.printStackTrace(); 30 } 25 public void ListerTest() throws ProxyAuthenticationException, JiwigoException { 26 SpringUtils.getCategoryService().list(true); 27 SpringUtils.getCategoryService().list(false); 31 28 } 32 29 … … 34 31 * Test of the creation method 35 32 * @throws ProxyAuthenticationException 33 * @throws JiwigoException 36 34 */ 37 35 @Test 38 public void creerTest() throws ProxyAuthenticationException {36 public void creerTest() throws ProxyAuthenticationException, JiwigoException { 39 37 Date date = new Date(); 40 38 Assert.assertSame(true, SpringUtils.getCategoryService().create("Category" + date.getTime())); -
extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/service/ServicesTest.java
r9921 r10697 9 9 import fr.mael.jiwigo.om.Comment; 10 10 import fr.mael.jiwigo.om.Image; 11 import fr.mael.jiwigo.transverse.exception.JiwigoException; 11 12 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 12 13 13 14 public class ServicesTest extends TestBase { 14 15 15 public ServicesTest() {16 public ServicesTest() throws JiwigoException { 16 17 super(); 17 18 } -
extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/service/TagServiceTest.java
r9921 r10697 1 1 package fr.mael.jiwigo.service; 2 2 3 import java.io.IOException;4 3 import java.util.Date; 5 4 … … 9 8 10 9 import fr.mael.jiwigo.TestBase; 10 import fr.mael.jiwigo.transverse.exception.JiwigoException; 11 11 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 12 12 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; … … 14 14 public class TagServiceTest extends TestBase { 15 15 16 public TagServiceTest() {16 public TagServiceTest() throws JiwigoException { 17 17 super(); 18 18 } … … 21 21 * Test of the listing method 22 22 * @throws ProxyAuthenticationException 23 * @throws JiwigoException 23 24 */ 24 25 @Test 25 public void ListerTest() throws ProxyAuthenticationException { 26 try { 27 SpringUtils.getTagService().list(); 28 } catch (IOException e) { 29 e.printStackTrace(); 30 } 26 public void ListerTest() throws ProxyAuthenticationException, JiwigoException { 27 SpringUtils.getTagService().list(); 31 28 } 32 29 … … 34 31 * Test of the creation method 35 32 * @throws ProxyAuthenticationException 33 * @throws JiwigoException 36 34 */ 37 35 @Test 38 public void creerTest() throws ProxyAuthenticationException {36 public void creerTest() throws ProxyAuthenticationException, JiwigoException { 39 37 Date date = new Date(); 40 try { 41 Assert.assertSame(true, SpringUtils.getTagService().create("Tag" + date.getTime())); 42 } catch (IOException e) { 43 // TODO Auto-generated catch block 44 e.printStackTrace(); 45 } 38 Assert.assertSame(true, SpringUtils.getTagService().create("Tag" + date.getTime())); 46 39 } 47 40
Note: See TracChangeset
for help on using the changeset viewer.