Changeset 9393 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/BrowserPanel.java

Timestamp:

Feb 27, 2011, 1:38:31 PM (13 years ago)

Author:

mlg

Message:

Modifications to use the last version of jiwigo-ws-api

File:

• extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/BrowserPanel.java (modified) (10 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/browser/BrowserPanel.java

@@ -30 +30 @@
 import fr.mael.jiwigo.transverse.util.ImagesUtil;
 import fr.mael.jiwigo.transverse.util.Messages;
-import fr.mael.jiwigo.transverse.util.Outil;
+import fr.mael.jiwigo.transverse.util.Tools;
 import fr.mael.jiwigo.ui.comments.CommentsDialog;
 import fr.mael.jiwigo.ui.mainframe.MainFrame;
 
 /**
- *    
+ *
    Copyright (c) 2010, Mael
    All rights reserved.
@@ -60 +60 @@
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
+
  * @author mael
- * 
+ *
  * Frame de navigation dans les images
  *
@@ -160 +160 @@
         panelBoutons = new JPanel(new FlowLayout());
         //ajout des images sur les boutons
-        next.setIcon(new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/next.png")));
-        previous.setIcon(new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/previous.png")));
-        rotateLeft.setIcon(new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/left.png")));
-        rotateRight.setIcon(new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/right.png")));
-        save.setIcon(new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/save.png")));
-        comment.setIcon(new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/comment.png")));
-        cut.setIcon(new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/cut.png")));
+        next.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/next.png")));
+        previous.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/previous.png")));
+        rotateLeft.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/left.png")));
+        rotateRight.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/right.png")));
+        save.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/save.png")));
+        comment.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/comment.png")));
+        cut.setIcon(new ImageIcon(Tools.getURL("fr/mael/jiwigo/img/cut.png")));
         //on rend les boutons invisibles, pour ne voir que l'image
         next.setFocusPainted(false);
@@ -211 +211 @@
             imagePanel = new BrowserImagePanel();
         } catch (Exception e1) {
-            LOG.error(Outil.getStackTrace(e1));
+            LOG.error(Tools.getStackTrace(e1));
         }
 
@@ -266 +266 @@
         menuBar.add(menuAffichage);
         menuBar.add(menuImage);
-        menuItemSave = new JMenuItem(Messages.getMessage("imageBrowser_save"), new ImageIcon(Outil
+        menuItemSave = new JMenuItem(Messages.getMessage("imageBrowser_save"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/save_mini.png")));
-        menuItemPrint = new JMenuItem(Messages.getMessage("imageBrowser_print"), new ImageIcon(Outil
+        menuItemPrint = new JMenuItem(Messages.getMessage("imageBrowser_print"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/print.gif")));
-        menuItemClose = new JMenuItem(Messages.getMessage("imageBrowser_close"), new ImageIcon(Outil
+        menuItemClose = new JMenuItem(Messages.getMessage("imageBrowser_close"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/close.png")));
-        menuItemZoomPlus = new JMenuItem(Messages.getMessage("imageBrowser_zoomPlus"), new ImageIcon(Outil
+        menuItemZoomPlus = new JMenuItem(Messages.getMessage("imageBrowser_zoomPlus"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/zoom_in.png")));
-        menuItemZoomMoins = new JMenuItem(Messages.getMessage("imageBrowser_zoomMoins"), new ImageIcon(Outil
+        menuItemZoomMoins = new JMenuItem(Messages.getMessage("imageBrowser_zoomMoins"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/zoom_out.png")));
-        menuItemNormal = new JMenuItem(Messages.getMessage("imageBrowser_zoomNormal"), new ImageIcon(Outil
+        menuItemNormal = new JMenuItem(Messages.getMessage("imageBrowser_zoomNormal"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/zoom_n.png")));
-        menuItemFlipH = new JMenuItem(Messages.getMessage("imageBrowser_flipH"), new ImageIcon(Outil
+        menuItemFlipH = new JMenuItem(Messages.getMessage("imageBrowser_flipH"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/small/flip_h.png")));
-        menuItemFlipV = new JMenuItem(Messages.getMessage("imageBrowser_flipV"), new ImageIcon(Outil
+        menuItemFlipV = new JMenuItem(Messages.getMessage("imageBrowser_flipV"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/small/flip_v.png")));
-        menuItemRotationG = new JMenuItem(Messages.getMessage("imageBrowser_rotationL"), new ImageIcon(Outil
+        menuItemRotationG = new JMenuItem(Messages.getMessage("imageBrowser_rotationL"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/small/left.png")));
-        menuItemRotationD = new JMenuItem(Messages.getMessage("imageBrowser_rotationR"), new ImageIcon(Outil
+        menuItemRotationD = new JMenuItem(Messages.getMessage("imageBrowser_rotationR"), new ImageIcon(Tools
                 .getURL("fr/mael/jiwigo/img/small/right.png")));
         menuFichier.add(menuItemSave);
@@ -325 +325 @@
     public void actionPerformed(ActionEvent e) {
         if (e.getSource().equals(comment)) {
-            new CommentsDialog(this, ImagesManagement.getInstance().getCurrentImage().getIdentifiant());
+            new CommentsDialog(this, ImagesManagement.getInstance().getCurrentImage().getIdentifier());
         } else if (e.getSource().equals(save)) {
             //opens the dialog to save the file
@@ -336 +336 @@
                         ImagesUtil.writeImageToPNG(chosenFile, imagePanel.getImage());
                     } catch (IOException ex) {
-                        LOG.error(Outil.getStackTrace(ex));
+                        LOG.error(Tools.getStackTrace(ex));
                     }
                 } else {
@@ -343 +343 @@
                                 imagePanel.getImage());
                     } catch (IOException ex) {
-                        LOG.error(Outil.getStackTrace(ex));
+                        LOG.error(Tools.getStackTrace(ex));
                     }
                 }
@@ -353 +353 @@
                 changeImage();
             } catch (Exception e1) {
-                LOG.error(Outil.getStackTrace(e1));
+                LOG.error(Tools.getStackTrace(e1));
             }
 
@@ -362 +362 @@
                 changeImage();
             } catch (Exception e1) {
-                LOG.error(Outil.getStackTrace(e1));
+                LOG.error(Tools.getStackTrace(e1));
             }