Changeset 9921 for extensions/jiwigo
- Timestamp:
- Mar 29, 2011, 8:24:34 PM (13 years ago)
- Location:
- extensions/jiwigo/trunk
- Files:
-
- 6 added
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/.classpath
r9903 r9921 1 <?xml version="1.0" encoding="UTF-8"?>2 1 <classpath> 3 <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> 4 <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/> 5 <classpathentry including="**/*.java" kind="src" path="src/main/java"/> 6 <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/> 7 <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/> 8 <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> 9 <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"/> 10 <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> 11 <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> 12 <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar"/> 13 <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/> 14 <classpathentry kind="var" path="M2_REPO/net/iharder/filedrop/1.0/filedrop-1.0.jar"/> 15 <classpathentry kind="var" path="M2_REPO/com/jhlabs/filters/2.0.235/filters-2.0.235.jar"/> 16 <classpathentry kind="var" path="M2_REPO/org/jdom/jdom/1.1/jdom-1.1.jar"/> 17 <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/> 18 <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> 19 <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/> 20 <classpathentry kind="var" path="M2_REPO/com/drew/metadata-extractor/2.3.1/metadata-extractor-2.3.1.jar"/> 21 <classpathentry kind="var" path="M2_REPO/org/apache/sanselan/sanselan/0.97-incubator/sanselan-0.97-incubator.jar"/> 22 <classpathentry kind="var" path="M2_REPO/org/swinglabs/swing-worker/1.1/swing-worker-1.1.jar"/> 23 <classpathentry kind="var" path="M2_REPO/org/swinglabs/swingx/1.6.1/swingx-1.6.1.jar"/> 24 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-openjdk"/> 25 <classpathentry combineaccessrules="false" kind="src" path="/jiwigo-ws-api"/> 26 <classpathentry kind="output" path="target/classes"/> 2 <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> 3 <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> 4 <classpathentry kind="src" path="src/main/java" including="**/*.java"/> 5 <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 6 <classpathentry kind="output" path="target/classes"/> 7 <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/> 8 <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> 9 <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"/> 10 <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"/> 11 <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar"/> 12 <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/> 13 <classpathentry kind="var" path="M2_REPO/net/iharder/filedrop/1.0/filedrop-1.0.jar"/> 14 <classpathentry kind="var" path="M2_REPO/com/jhlabs/filters/2.0.235/filters-2.0.235.jar"/> 15 <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1/httpclient-4.1.jar"/> 16 <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar"/> 17 <classpathentry kind="src" path="/jiwigo-ws-api"/> 18 <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/> 19 <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> 20 <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/> 21 <classpathentry kind="var" path="M2_REPO/com/drew/metadata-extractor/2.3.1/metadata-extractor-2.3.1.jar"/> 22 <classpathentry kind="var" path="M2_REPO/org/apache/sanselan/sanselan/0.97-incubator/sanselan-0.97-incubator.jar"/> 23 <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/> 24 <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar"/> 25 <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar"/> 26 <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar"/> 27 <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar"/> 28 <classpathentry kind="var" path="M2_REPO/org/swinglabs/swing-worker/1.1/swing-worker-1.1.jar"/> 29 <classpathentry kind="var" path="M2_REPO/org/swinglabs/swingx/1.6.1/swingx-1.6.1.jar"/> 30 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-openjdk"/> 27 31 </classpath> -
extensions/jiwigo/trunk/pom.xml
r9903 r9921 31 31 <version>0.2b</version> 32 32 </dependency> 33 <dependency> 34 <groupId>org.slf4j</groupId> 35 <artifactId>slf4j-log4j12</artifactId> 36 <version>1.6.1</version> 37 </dependency> 38 <!-- <dependency>--> 39 <!-- <groupId>org.jdom</groupId>--> 40 <!-- <artifactId>jdom</artifactId>--> 41 <!-- <version>1.1</version>--> 42 <!-- </dependency>--> 43 <dependency> 44 <groupId>org.springframework</groupId> 45 <artifactId>spring-beans</artifactId> 46 <version>3.0.5.RELEASE</version> 47 </dependency> 33 48 34 49 </dependencies> -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/Main.java
r9393 r9921 8 8 import com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel; 9 9 10 import fr.mael.jiwigo.transverse.session.SessionManager;11 10 import fr.mael.jiwigo.transverse.util.Tools; 12 11 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement; … … 39 38 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 40 39 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 41 40 42 41 * Main class 43 42 * @author mael … … 50 49 */ 51 50 public static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory.getLog(Main.class); 52 /**53 * The login and session manager that allows to connect to54 * the webservice and to query it55 */56 public static SessionManager sessionManager;57 51 58 52 /** -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/ImagesManagement.java
r9878 r9921 9 9 import javax.imageio.ImageIO; 10 10 11 import fr.mael.jiwigo.Main;12 11 import fr.mael.jiwigo.om.Image; 13 import fr.mael.jiwigo.service.ImageService;14 12 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 15 13 import fr.mael.jiwigo.transverse.util.Tools; 14 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 16 15 17 16 /** … … 154 153 if (!image.getIdCategory().equals(currentCategory)) { 155 154 try { 156 listImage = ImageService.getInstance(Main.sessionManager).listByCategory(image.getIdCategory(), true);155 listImage = SpringUtils.getImageService().listByCategory(image.getIdCategory(), true); 157 156 currentCategory = image.getIdCategory(); 158 157 } catch (IOException e) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/preferences/PreferencesManagement.java
r9393 r9921 5 5 import java.io.IOException; 6 6 7 import org.jdom.Document; 8 import org.jdom.Element; 9 import org.jdom.input.SAXBuilder; 10 import org.jdom.output.XMLOutputter; 7 import org.w3c.dom.Document; 8 import org.w3c.dom.Element; 11 9 12 10 import fr.mael.jiwigo.transverse.util.Tools; … … 37 35 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 38 36 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 39 37 40 38 * Classe de gestion des preferences 41 39 * @author mael … … 93 91 */ 94 92 public static String getValue(String key) { 95 SAXBuilder sxb = new SAXBuilder();96 93 try { 97 Document document = sxb.build(new File(getConfigFilePath()));98 return document.getRootElement().getChildText(key);94 Document document = Tools.readFileAsDocument(getConfigFilePath()); 95 return Tools.getStringValueDom(document.getDocumentElement(), key); 99 96 } catch (Exception e) { 100 97 LOG.error(Tools.getStackTrace(e)); … … 109 106 */ 110 107 public static void setValue(String key, String text) { 111 SAXBuilder sxb = new SAXBuilder();112 108 try { 113 Document document = sxb.build(new File(getConfigFilePath()));109 Document document = Tools.readFileAsDocument(getConfigFilePath()); 114 110 try { 115 document.getRootElement().getChild(key).setText(text); 116 } catch (NullPointerException e) { 117 Element element = new Element(key); 118 element.addContent(text); 119 document.getRootElement().addContent(element); 111 Tools.setStringValueDom(document.getDocumentElement(), key, text); 112 } catch (Exception e) { 113 e.printStackTrace(); 114 Element element = document.createElement(key); 115 Tools.setStringValueDom(element, key, text); 116 document.getDocumentElement().appendChild(element); 120 117 } 121 XMLOutputter out = new XMLOutputter(); 122 FileWriter writer = new FileWriter(getConfigFilePath()); 123 out.output(document, writer); 124 writer.flush(); 125 writer.close(); 118 Tools.writeXmlFile(document, getConfigFilePath()); 126 119 } catch (Exception e) { 127 120 LOG.error(Tools.getStackTrace(e)); -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java
r9431 r9921 36 36 import fr.mael.jiwigo.transverse.util.Messages; 37 37 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement; 38 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 38 39 39 40 /** … … 116 117 */ 117 118 private ProxyPanel proxyPanel; 119 120 private SessionManager sessionManager; 118 121 119 122 /** … … 184 187 comboLocales.setModel(model); 185 188 model.setSelectedItem(defautLocale.getDisplayLanguage(Locale.ENGLISH)); 189 190 this.sessionManager = SpringUtils.getSessionManager(); 191 186 192 this.getContentPane().add(panelInformations, BorderLayout.NORTH); 187 193 this.getContentPane().add(proxyPanel, BorderLayout.CENTER); … … 208 214 } 209 215 //instanciation of the session manager 210 Main.sessionManager = new SessionManager(loginField.getText(), passwordField.getText(), fieldUrl.getText()); 216 sessionManager.setLogin(loginField.getText()); 217 sessionManager.setPassword(passwordField.getText()); 218 sessionManager.setUrl(fieldUrl.getText() + "/ws.php"); 211 219 boolean echecProxy = false; 212 220 if (proxyPanel.getCheckBox().isSelected()) { … … 214 222 try { 215 223 portProxy = Integer.valueOf(proxyPanel.getFieldPort().getText()); 216 Main.sessionManager.setPortProxy(portProxy);217 Main.sessionManager.setUrlProxy(proxyPanel.getFieldUrl().getText());218 Main.sessionManager.setLoginProxy(proxyPanel.getFieldLogin().getText());219 Main.sessionManager.setPassProxy(proxyPanel.getFieldPassword().getText());220 Main.sessionManager.setUsesProxy(true);224 sessionManager.setPortProxy(portProxy); 225 sessionManager.setUrlProxy(proxyPanel.getFieldUrl().getText()); 226 sessionManager.setLoginProxy(proxyPanel.getFieldLogin().getText()); 227 sessionManager.setPassProxy(proxyPanel.getFieldPassword().getText()); 228 sessionManager.setUsesProxy(true); 221 229 } catch (Exception e) { 222 230 echecProxy = true; … … 260 268 JOptionPane.ERROR_MESSAGE); 261 269 } else { 262 int response = Main.sessionManager.processLogin();270 int response = sessionManager.processLogin(); 263 271 if (response == 0) { 264 272 Main.showFrame(); … … 267 275 } else if (response == 1) { 268 276 //if the login fails, an error is displayed 269 if (! Main.sessionManager.isProxyError()) {277 if (!sessionManager.isProxyError()) { 270 278 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_connexionError"), 271 279 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/comments/CommentsDialog.java
r9894 r9921 20 20 import javax.swing.JTextArea; 21 21 22 import fr.mael.jiwigo.Main;23 22 import fr.mael.jiwigo.om.Comment; 24 import fr.mael.jiwigo.service.CommentService;25 23 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 26 24 import fr.mael.jiwigo.transverse.util.Messages; 27 25 import fr.mael.jiwigo.transverse.util.Tools; 26 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 28 27 import fr.mael.jiwigo.ui.browser.BrowserPanel; 29 28 … … 124 123 this.getContentPane().removeAll(); 125 124 try { 126 List<Comment> commentsForImage = CommentService.getInstance(Main.sessionManager).list(imageId);125 List<Comment> commentsForImage = SpringUtils.getCommentService().list(imageId); 127 126 GridBagConstraints c = new GridBagConstraints(); 128 127 c.insets = new Insets(3, 3, 3, 3); … … 168 167 boolean reussite = true; 169 168 try { 170 reussite = CommentService.getInstance(Main.sessionManager).create(text, this.imageId,171 Main.sessionManager.getLogin());169 reussite = SpringUtils.getCommentService().create(text, this.imageId, 170 SpringUtils.getSessionManager().getLogin()); 172 171 } catch (IOException e) { 173 172 reussite = false; -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java
r9894 r9921 23 23 import javax.swing.tree.TreeSelectionModel; 24 24 25 import fr.mael.jiwigo.Main;26 25 import fr.mael.jiwigo.om.Category; 27 import fr.mael.jiwigo.service.CategoryService;28 26 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 29 27 import fr.mael.jiwigo.transverse.util.Messages; 30 28 import fr.mael.jiwigo.transverse.util.Tools; 29 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 31 30 32 31 /** … … 141 140 DefaultMutableTreeNode category = null; 142 141 try { 143 List<Category> list = CategoryService.getInstance(Main.sessionManager).makeTree();142 List<Category> list = SpringUtils.getCategoryService().makeTree(); 144 143 for (Category cat : list) { 145 144 if (cat.getParentCategories().size() == 0) { … … 232 231 //try to create a category 233 232 try { 234 if (CategoryService.getInstance(Main.sessionManager).create(nomcategorie, 235 selectedCategory.getIdentifier())) { 233 if (SpringUtils.getCategoryService().create(nomcategorie, selectedCategory.getIdentifier())) { 236 234 setUpUi(); 237 235 } else { … … 249 247 } else { 250 248 try { 251 if ( CategoryService.getInstance(Main.sessionManager).create(nomcategorie)) {249 if (SpringUtils.getCategoryService().create(nomcategorie)) { 252 250 setUpUi(); 253 251 } else { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailCategoryPanel.java
r9892 r9921 10 10 import javax.swing.JPanel; 11 11 12 import fr.mael.jiwigo.Main;13 12 import fr.mael.jiwigo.om.Category; 14 13 import fr.mael.jiwigo.om.Image; 15 import fr.mael.jiwigo.service.ImageService;16 14 import fr.mael.jiwigo.transverse.ImagesManagement; 17 15 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; … … 21 19 import fr.mael.jiwigo.transverse.util.filedrop.FileDrop; 22 20 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement; 21 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 23 22 import fr.mael.jiwigo.ui.layout.VerticalLayout; 24 23 … … 142 141 try { 143 142 MainFrame.getInstance().setMessage(Messages.getMessage("thumbviewer_loading")); 144 imagesManagement.setListImage(ImageService.getInstance(Main.sessionManager).listByCategory(categoryId, 145 rafraichir)); 143 imagesManagement.setListImage(SpringUtils.getImageService().listByCategory(categoryId, rafraichir)); 146 144 calculateThumbnailPerLine(); 147 145 addThumbnails(); … … 165 163 JPanel panelh = new JPanel(new FlowLayout()); 166 164 try { 167 imagesManagement.setListImage(ImageService.getInstance(Main.sessionManager).listByCategory(categoryId, 168 false)); 165 imagesManagement.setListImage(SpringUtils.getImageService().listByCategory(categoryId, false)); 169 166 } catch (IOException e1) { 170 167 LOG.error(Tools.getStackTrace(e1)); … … 253 250 .getLabel())); 254 251 255 ImageService.getInstance(Main.sessionManager).create(files[i].getCanonicalPath(), categoryId,256 widthOriginal,heightOriginal, chunkSize, imagesManagement.getPrivacyLevel());252 SpringUtils.getImageService().create(files[i].getCanonicalPath(), categoryId, widthOriginal, 253 heightOriginal, chunkSize, imagesManagement.getPrivacyLevel()); 257 254 MainFrame.getInstance() 258 255 .setMessage(files[i].getName() + " " + Messages.getMessage("sendingSuccess")); -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailPanel.java
r9431 r9921 27 27 import javax.swing.ListSelectionModel; 28 28 29 import fr.mael.jiwigo.Main;30 29 import fr.mael.jiwigo.om.Image; 31 30 import fr.mael.jiwigo.om.Tag; 32 import fr.mael.jiwigo.service.ImageService;33 import fr.mael.jiwigo.service.TagService;34 31 import fr.mael.jiwigo.transverse.ImagesManagement; 35 32 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 36 33 import fr.mael.jiwigo.transverse.util.Messages; 37 34 import fr.mael.jiwigo.transverse.util.Tools; 35 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 38 36 import fr.mael.jiwigo.ui.browser.BrowserPanel; 39 37 import fr.mael.jiwigo.ui.layout.VerticalLayout; … … 176 174 try { 177 175 //getting the list of tags 178 List<Tag> tagsDispo = TagService.getInstance(Main.sessionManager).list();176 List<Tag> tagsDispo = SpringUtils.getTagService().list(); 179 177 //list to array (cause fucking JList does not support Lists) 180 178 Tag[] tableauTagDispo = (Tag[]) tagsDispo.toArray(new Tag[tagsDispo.size()]); 181 179 //getting the image's tags to preselect them 182 List<Tag> tagsDeLimage = TagService.getInstance(Main.sessionManager).tagsForImage(image);180 List<Tag> tagsDeLimage = SpringUtils.getTagService().tagsForImage(image); 183 181 listTags = new JList(tableauTagDispo); 184 182 //multiple selection is allowed … … 227 225 try { 228 226 try { 229 if (! ImageService.getInstance(Main.sessionManager).addTags(image, tagIds.toString())) {227 if (!SpringUtils.getImageService().addTags(image, tagIds.toString())) { 230 228 JOptionPane.showMessageDialog(this, Messages.getMessage("addingTagsError"), Messages 231 229 .getMessage("error"), JOptionPane.ERROR_MESSAGE); -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/ThumbnailSearchPanel.java
r9393 r9921 6 6 import javax.swing.JPanel; 7 7 8 import fr.mael.jiwigo.Main;9 8 import fr.mael.jiwigo.om.Category; 10 9 import fr.mael.jiwigo.om.Image; 11 import fr.mael.jiwigo.service.ImageService;12 10 import fr.mael.jiwigo.transverse.ImagesManagement; 13 11 import fr.mael.jiwigo.transverse.util.Messages; 14 12 import fr.mael.jiwigo.transverse.util.Tools; 13 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 15 14 import fr.mael.jiwigo.ui.layout.VerticalLayout; 16 15 … … 90 89 try { 91 90 MainFrame.getInstance().setMessage(Messages.getMessage("thumbviewer_loading")); 92 ImagesManagement.getInstance().setListImage( 93 ImageService.getInstance(Main.sessionManager).search(queryString)); 91 ImagesManagement.getInstance().setListImage(SpringUtils.getImageService().search(queryString)); 94 92 for (Image image : ImagesManagement.getInstance().getListImage()) { 95 93 try { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/thread/ThreadPhotoSending.java
r9894 r9921 5 5 import javax.swing.JOptionPane; 6 6 7 import fr.mael.jiwigo.Main;8 import fr.mael.jiwigo.service.ImageService;9 7 import fr.mael.jiwigo.transverse.ImagesManagement; 10 8 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; … … 13 11 import fr.mael.jiwigo.transverse.util.Messages; 14 12 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement; 13 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 15 14 import fr.mael.jiwigo.ui.mainframe.MainFrame; 16 15 import fr.mael.jiwigo.ui.mainframe.ThumbnailCategoryPanel; … … 67 66 MainFrame.getInstance().setAdditionalMessage( 68 67 Messages.getMessage("file") + " " + (i + 1) + "/" + files.length + " : "); 69 ImageService.getInstance(Main.sessionManager).create(files[i].getCanonicalPath(), 70 thumbPanel.getCategoryId(), widthOriginal, heightOriginal, chunkSize, 71 ImagesManagement.getInstance().getPrivacyLevel()); 68 SpringUtils.getImageService().create(files[i].getCanonicalPath(), thumbPanel.getCategoryId(), 69 widthOriginal, heightOriginal, chunkSize, ImagesManagement.getInstance().getPrivacyLevel()); 72 70 MainFrame.getInstance().setMessage(files[i].getName() + " " + Messages.getMessage("sendingSuccess")); 73 71 } catch (FileAlreadyExistsException e) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/DialogChooseCategory.java
r9896 r9921 15 15 import javax.swing.JOptionPane; 16 16 17 import fr.mael.jiwigo.Main;18 17 import fr.mael.jiwigo.om.Category; 19 import fr.mael.jiwigo.service.CategoryService;20 import fr.mael.jiwigo.service.ImageService;21 18 import fr.mael.jiwigo.transverse.ImagesManagement; 22 19 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; … … 27 24 import fr.mael.jiwigo.transverse.util.Tools; 28 25 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement; 26 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 29 27 import fr.mael.jiwigo.ui.mainframe.MainFrame; 30 28 … … 99 97 comboCategories.setRenderer(new ComboCategoryRenderer()); 100 98 try { 101 categories = CategoryService.getInstance(Main.sessionManager).makeTree();99 categories = SpringUtils.getCategoryService().makeTree(); 102 100 createCategoriesTree(); 103 101 } catch (IOException e) { … … 178 176 Double chunkSize = Double.valueOf(PreferencesManagement.getValue(PreferencesEnum.CHUNK_SIZE 179 177 .getLabel())); 180 ImageService.getInstance(Main.sessionManager).create(file.getAbsolutePath(), 181 category.getIdentifier(), widthOriginal, heightOriginal, chunkSize, 182 ImagesManagement.getInstance().getPrivacyLevel()); 178 SpringUtils.getImageService().create(file.getAbsolutePath(), category.getIdentifier(), 179 widthOriginal, heightOriginal, chunkSize, ImagesManagement.getInstance().getPrivacyLevel()); 183 180 } catch (WrongChunkSizeException ex) { 184 181 JOptionPane.showMessageDialog(null, Messages.getMessage("wrongChunkSizeError"), Messages -
extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/TestBase.java
r9431 r9921 6 6 7 7 import fr.mael.jiwigo.transverse.session.SessionManager; 8 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 8 9 9 10 public class TestBase { 10 11 public TestBase() { 11 Main.sessionManager = new SessionManager("mael", "motdepasse", "http://mael.piwigo.com"); 12 if (Main.sessionManager.processLogin() != 0) { 12 SessionManager sessionManager = SpringUtils.getSessionManager(); 13 sessionManager.setLogin("mael"); 14 sessionManager.setPassword("motdepasse"); 15 sessionManager.setUrl("http://mael.piwigo.com/ws.php"); 16 if (sessionManager.processLogin() != 0) { 13 17 try { 14 18 throw new Exception("Connection failed"); -
extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/service/CategoryServiceTest.java
r9431 r9921 8 8 import org.junit.Test; 9 9 10 import fr.mael.jiwigo.Main;11 10 import fr.mael.jiwigo.TestBase; 12 import fr.mael.jiwigo.dao.CategoryDao;13 11 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 12 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 14 13 15 14 public class CategoryServiceTest extends TestBase { … … 25 24 public void ListerTest() throws ProxyAuthenticationException { 26 25 try { 27 CategoryDao.getInstance(Main.sessionManager).list(true);28 CategoryDao.getInstance(Main.sessionManager).list(false);26 SpringUtils.getCategoryService().list(true); 27 SpringUtils.getCategoryService().list(false); 29 28 } catch (IOException e) { 30 29 e.printStackTrace(); … … 39 38 public void creerTest() throws ProxyAuthenticationException { 40 39 Date date = new Date(); 41 Assert.assertSame(true, CategoryService.getInstance(Main.sessionManager).create("Category" + date.getTime()));40 Assert.assertSame(true, SpringUtils.getCategoryService().create("Category" + date.getTime())); 42 41 } 43 42 -
extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/service/ServicesTest.java
r9878 r9921 5 5 import org.junit.Test; 6 6 7 import fr.mael.jiwigo.Main;8 7 import fr.mael.jiwigo.TestBase; 9 8 import fr.mael.jiwigo.om.Category; 10 9 import fr.mael.jiwigo.om.Comment; 11 10 import fr.mael.jiwigo.om.Image; 11 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 12 12 13 13 public class ServicesTest extends TestBase { … … 20 20 public void testCreer() throws Exception { 21 21 Category cat = null; 22 for (Category category : CategoryService.getInstance(Main.sessionManager).list(true)) {22 for (Category category : SpringUtils.getCategoryService().list(true)) { 23 23 if (category.getIdentifier().equals(3)) { 24 24 cat = category; … … 27 27 } 28 28 29 Image image = ImageService.getInstance(Main.sessionManager).listByCategory(cat.getIdentifier(), true).get(0);30 List<Comment> comments = CommentService.getInstance(Main.sessionManager).list(image.getIdentifier());29 Image image = SpringUtils.getImageService().listByCategory(cat.getIdentifier(), true).get(0); 30 List<Comment> comments = SpringUtils.getCommentService().list(image.getIdentifier()); 31 31 // int firstCount = comments.size(); 32 CommentService.getInstance(Main.sessionManager).create("comment test", image.getIdentifier(), "none");32 SpringUtils.getCommentService().create("comment test", image.getIdentifier(), "none"); 33 33 // int secondCount = CommentService.getInstance(Main.sessionManager).list(image.getIdentifier()).size(); 34 34 // Assert.assertSame(firstCount + 1, secondCount); -
extensions/jiwigo/trunk/src/test/java/fr/mael/jiwigo/service/TagServiceTest.java
r9431 r9921 8 8 import org.junit.Test; 9 9 10 import fr.mael.jiwigo.Main;11 10 import fr.mael.jiwigo.TestBase; 12 import fr.mael.jiwigo.dao.TagDao;13 11 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 12 import fr.mael.jiwigo.transverse.util.spring.SpringUtils; 14 13 15 14 public class TagServiceTest extends TestBase { … … 26 25 public void ListerTest() throws ProxyAuthenticationException { 27 26 try { 28 TagDao.getInstance(Main.sessionManager).list();27 SpringUtils.getTagService().list(); 29 28 } catch (IOException e) { 30 29 e.printStackTrace(); … … 40 39 Date date = new Date(); 41 40 try { 42 Assert.assertSame(true, TagService.getInstance(Main.sessionManager).create("Tag" + date.getTime()));41 Assert.assertSame(true, SpringUtils.getTagService().create("Tag" + date.getTime())); 43 42 } catch (IOException e) { 44 43 // TODO Auto-generated catch block
Note: See TracChangeset
for help on using the changeset viewer.