Changeset 7222
- Timestamp:
- Oct 16, 2010, 1:24:00 PM (14 years ago)
- Location:
- extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/service/ImageService.java
r7221 r7222 96 96 */ 97 97 public boolean creer(String filePath, Integer idCategory) throws Exception { 98 MainFrame.getInstance().setMessage(Messages.getMessage("mainFrame_resizing") + " " + filePath); 98 File originalFile = new File(filePath); 99 MainFrame.getInstance().setMessage(Messages.getMessage("mainFrame_resizing") + " " + originalFile.getName()); 99 100 //get the byte array of the original file, to keep metadata 100 byte[] bytesFichierOriginal = Outil.getBytesFromFile( new File(filePath));101 byte[] bytesFichierOriginal = Outil.getBytesFromFile(originalFile); 101 102 102 103 //size taken from the user's preferences … … 115 116 //I use here a try catch because if the original file isn't a jpeg 116 117 //the methode Outil.enrich will fail, but the procedure has to continue 117 MainFrame.getInstance().setMessage(Messages.getMessage("mainFrame_addMetadata") + " " + filePath);118 MainFrame.getInstance().setMessage(Messages.getMessage("mainFrame_addMetadata") + " " + originalFile.getName()); 118 119 try { 119 120 byte[] fichierEnrichi = Outil.enrich(bytesFichierOriginal, … … 123 124 } 124 125 } else { 125 originale = new File(filePath);126 originale = originalFile; 126 127 127 128 } … … 131 132 image.setOriginale(originale); 132 133 image.setIdCategory(idCategory); 133 MainFrame.getInstance().setMessage(Messages.getMessage("mainFrame_sendingFiles") + " " + filePath);134 MainFrame.getInstance().setMessage(Messages.getMessage("mainFrame_sendingFiles") + " " + originalFile.getName()); 134 135 //now we call the dao to send the image to the webservice 135 136 return ImageDao.getInstance().creer(image); -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MainFrame.java
r7221 r7222 84 84 85 85 /** 86 * label that displays additional messages 87 */ 88 private JLabel labelAdditionalMessage; 89 90 /** 86 91 * menu bar 87 92 */ … … 132 137 jMenuBar = new JMenuBar(); 133 138 labelMessage = new JLabel(Messages.getMessage("welcomeMessage")); 139 labelAdditionalMessage = new JLabel(); 134 140 splitPane = new JSplitPane(); 135 141 categoriesTree = new CategoriesTree(); … … 144 150 progressBar = new JProgressBar(0, 100); 145 151 panel.add(progressBar); 152 panel.add(labelAdditionalMessage); 146 153 panel.add(labelMessage); 147 154 panelBas.add(panel, BorderLayout.WEST); … … 221 228 222 229 230 public void setAdditionalMessage(String additionalMessage) { 231 this.labelAdditionalMessage.setText(additionalMessage); 232 } 233 234 223 235 @Override 224 236 public void actionPerformed(ActionEvent arg0) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java
r7221 r7222 216 216 217 217 for (int i = 0; i < files.length; i++) { 218 MainFrame.getInstance().setAdditionalMessage("<html><i>" + (i + 1) + "/" + files.length + " : </i></html>"); 218 219 int nbProgressBar = ((i + 1) * 100) / files.length; 219 220 try { … … 232 233 } 233 234 //refresh 235 MainFrame.getInstance().setAdditionalMessage(""); 234 236 rafraichir(categoryId, true); 235 237 MainFrame.getInstance().getProgressBar().setValue(0);
Note: See TracChangeset
for help on using the changeset viewer.