Changeset 9921 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java

Timestamp:

Mar 29, 2011, 8:24:34 PM (13 years ago)

Author:

mlg

Message:

Adds spring for the dependency injection
Deletion of jdom (not useful just for a class that manipulates a simple XML file)

File:

• extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java (modified) (3 diffs)

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

@@ -27 +27 @@
 import javax.swing.ListSelectionModel;
 
-import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.om.Image;
 import fr.mael.jiwigo.om.Tag;
-import fr.mael.jiwigo.service.ImageService;
-import fr.mael.jiwigo.service.TagService;
 import fr.mael.jiwigo.transverse.ImagesManagement;
 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.util.Messages;
 import fr.mael.jiwigo.transverse.util.Tools;
+import fr.mael.jiwigo.transverse.util.spring.SpringUtils;
 import fr.mael.jiwigo.ui.browser.BrowserPanel;
 import fr.mael.jiwigo.ui.layout.VerticalLayout;
@@ -176 +174 @@
             try {
                 //getting the list of tags
-                List<Tag> tagsDispo = TagService.getInstance(Main.sessionManager).list();
+                List<Tag> tagsDispo = SpringUtils.getTagService().list();
                 //list to array (cause fucking JList does not support Lists)
                 Tag[] tableauTagDispo = (Tag[]) tagsDispo.toArray(new Tag[tagsDispo.size()]);
                 //getting the image's tags to preselect them
-                List<Tag> tagsDeLimage = TagService.getInstance(Main.sessionManager).tagsForImage(image);
+                List<Tag> tagsDeLimage = SpringUtils.getTagService().tagsForImage(image);
                 listTags = new JList(tableauTagDispo);
                 //multiple selection is allowed
@@ -227 +225 @@
             try {
                 try {
-                    if (!ImageService.getInstance(Main.sessionManager).addTags(image, tagIds.toString())) {
+                    if (!SpringUtils.getImageService().addTags(image, tagIds.toString())) {
                         JOptionPane.showMessageDialog(this, Messages.getMessage("addingTagsError"), Messages
                                 .getMessage("error"), JOptionPane.ERROR_MESSAGE);