Author: echatellier Date: 2014-07-25 11:53:01 +0200 (Fri, 25 Jul 2014) New Revision: 440 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/440 Log: Fix somes warning and generics Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java trunk/faxtomail-ui-swing/src/main/resources/icons/action-archive.png trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java trunk/src/site/resources/img/notepad.png trunk/src/site/resources/img/txt-to-csv.png Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-25 09:53:01 UTC (rev 440) @@ -24,13 +24,10 @@ * #L% */ -import java.util.ArrayList; import java.util.List; -import java.util.Set; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.Binder; @@ -42,15 +39,11 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.NewClient; import com.franciaflex.faxtomail.persistence.entities.NewClientTopiaDao; import com.franciaflex.faxtomail.persistence.entities.NewClientType; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; -import com.google.common.base.Function; import com.google.common.base.Preconditions; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multimaps; /** * Service de gestion des clients. Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-25 09:53:01 UTC (rev 440) @@ -442,7 +442,7 @@ String userId = entry.getKey(); Collection<MailFolder> mailFolders = entry.getValue(); - FaxToMailUser user = faxToMailUserTopiaDao.findByTopiaId(userId); + FaxToMailUser user = faxToMailUserTopiaDao.forTopiaIdEquals(userId).findUnique(); user.clearAffectedFolders(); for (MailFolder mailFolder : mailFolders) { user.addAffectedFolders(mailFolder); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-25 09:53:01 UTC (rev 440) @@ -117,7 +117,7 @@ BinderFactory.newBinder(Attachment.class, Attachment.class); public Email getEmailById(String id) { - Email email = getPersistenceContext().getEmailDao().findByTopiaId(id); + Email email = getPersistenceContext().getEmailDao().forTopiaIdEquals(id).findUnique(); return email; } @@ -519,7 +519,7 @@ public Email addToHistory(String emailId, HistoryType type, FaxToMailUser user, Date date, String... fields) { EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); - Email email = emailDao.findByTopiaId(emailId); + Email email = emailDao.forTopiaIdEquals(emailId).findUnique(); HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao(); History history = historyDao.create(History.PROPERTY_TYPE, type, @@ -544,7 +544,7 @@ */ public Email takeEmail(String emailId, FaxToMailUser user) { EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); - Email email = emailDao.findByTopiaId(emailId); + Email email = emailDao.forTopiaIdEquals(emailId).findUnique(); email.setTakenBy(user); HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao(); @@ -570,7 +570,7 @@ EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); // verrouillage du mail courant - Email email = emailDao.findByTopiaId(emailId); + Email email = emailDao.forTopiaIdEquals(emailId).findUnique(); email.setLockedBy(currentUser); email = emailDao.update(email); getPersistenceContext().commit(); @@ -599,7 +599,7 @@ */ public Email unlockEmail(String emailId) { EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); - Email email = emailDao.findByTopiaId(emailId); + Email email = emailDao.forTopiaIdEquals(emailId).findUnique(); email.setLockedBy(null); email = emailDao.update(email); getPersistenceContext().commit(); @@ -788,7 +788,7 @@ public AttachmentFile getAttachmentFile(String attachmentId, boolean original) { AttachmentTopiaDao dao = getPersistenceContext().getAttachmentDao(); - Attachment attachment = dao.findByTopiaId(attachmentId); + Attachment attachment = dao.forTopiaIdEquals(attachmentId).findUnique(); return original ? attachment.getOriginalFile() : attachment.getEditedFile(); } @@ -812,7 +812,7 @@ public void unlockMails(List<String> unlockMails) { EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); for (String unlockMail : unlockMails) { - Email mail = emailDao.findByTopiaId(unlockMail); + Email mail = emailDao.forTopiaIdEquals(unlockMail).findUnique(); mail.setLockedBy(null); emailDao.update(mail); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-07-25 09:53:01 UTC (rev 440) @@ -207,7 +207,7 @@ public MailFolder getMailFolder(String topiaId) { MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); - MailFolder result = dao.findByTopiaId(topiaId); + MailFolder result = dao.forTopiaIdEquals(topiaId).findUnique(); return result; } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-25 09:53:01 UTC (rev 440) @@ -28,19 +28,15 @@ import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; import org.nuiton.csv.ImportRuntimeException; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -48,12 +44,10 @@ import com.franciaflex.faxtomail.persistence.entities.ClientImpl; import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; import com.franciaflex.faxtomail.persistence.entities.DemandType; -import com.franciaflex.faxtomail.persistence.entities.DemandTypeImpl; import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; -import com.franciaflex.faxtomail.persistence.entities.EtatAttenteImpl; import com.franciaflex.faxtomail.persistence.entities.EtatAttenteTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; @@ -70,7 +64,6 @@ import com.franciaflex.faxtomail.services.service.imports.EtatAttenteImportModel; import com.franciaflex.faxtomail.services.service.imports.PriorityImportModel; import com.franciaflex.faxtomail.services.service.imports.RangeImportModel; -import com.google.common.collect.Maps; /** * @author kmorin - kmorin@codelutin.com Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java 2014-07-25 09:53:01 UTC (rev 440) @@ -24,10 +24,8 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Range; -import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIModel; @@ -37,8 +35,6 @@ import java.awt.*; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Map; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-07-25 09:53:01 UTC (rev 440) @@ -34,11 +34,9 @@ import javax.swing.JTextArea; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; -import com.itextpdf.awt.geom.AffineTransform; import com.itextpdf.text.DocumentException; import com.itextpdf.text.Element; import com.itextpdf.text.ExceptionConverter; -import com.itextpdf.text.pdf.PdfTemplate; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-07-25 09:53:01 UTC (rev 440) @@ -31,7 +31,6 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -41,7 +40,6 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.HighlighterFactory; -import org.nuiton.util.FileUtil; import java.awt.Component; import java.beans.PropertyChangeEvent; @@ -49,7 +47,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; -import java.util.List; import javax.swing.AbstractCellEditor; import javax.swing.Icon; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-07-25 09:53:01 UTC (rev 440) @@ -40,7 +40,6 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - org.jdesktop.swingx.JXDatePicker org.jdesktop.swingx.JXTitledPanel org.jdesktop.swingx.JXTable Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-07-25 09:53:01 UTC (rev 440) @@ -26,20 +26,15 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; import javax.swing.JCheckBox; import javax.swing.JComponent; -import com.franciaflex.faxtomail.persistence.entities.HistoryType; import com.franciaflex.faxtomail.ui.swing.actions.PrintOnDefaultPrinterAction; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-07-25 09:53:01 UTC (rev 440) @@ -24,14 +24,10 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.google.common.base.Preconditions; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx 2014-07-25 09:53:01 UTC (rev 440) @@ -39,7 +39,6 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXDatePicker - org.jdesktop.swingx.JXTitledPanel org.jdesktop.swingx.JXTable java.awt.FlowLayout @@ -233,7 +232,7 @@ <JLabel id='gammeLabel'/> </cell> <cell columns='3' weightx='1'> - <JComboBox id='gammeComboBox'/> + <JComboBox id='gammeComboBox' genericType="Range" /> </cell> </row> @@ -250,7 +249,7 @@ <JLabel id='docTypeLabel'/> </cell> <cell columns='3' weightx='1'> - <JComboBox id='docTypeComboBox'/> + <JComboBox id='docTypeComboBox' genericType="DemandType"/> </cell> </row> @@ -278,21 +277,21 @@ <JLabel id='priorityLabel'/> </cell> <cell weightx='1'> - <JComboBox id='priorityComboBox'/> + <JComboBox id='priorityComboBox' genericType="Priority"/> </cell> <cell> <JLabel id='statusLabel'/> </cell> <cell weightx='1'> - <JComboBox id='statusComboBox'/> + <JComboBox id='statusComboBox' genericType="DemandStatus"/> </cell> <cell> <JLabel id='etatAttenteLabel'/> </cell> <cell columns='3' weightx='2'> - <JComboBox id='etatAttenteComboBox'/> + <JComboBox id='etatAttenteComboBox' genericType="EtatAttente"/> </cell> </row> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-07-25 09:53:01 UTC (rev 440) @@ -29,7 +29,6 @@ import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.services.service.ReferentielService; import com.franciaflex.faxtomail.ui.swing.actions.GroupAction; -import com.franciaflex.faxtomail.ui.swing.actions.SearchAction; import com.franciaflex.faxtomail.ui.swing.actions.SearchToGroupAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-07-25 09:53:01 UTC (rev 440) @@ -39,7 +39,6 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXDatePicker - org.jdesktop.swingx.JXTitledPanel org.jdesktop.swingx.JXTable java.awt.FlowLayout @@ -244,7 +243,7 @@ <JLabel id='gammeLabel'/> </cell> <cell columns='3' weightx='1'> - <JComboBox id='gammeComboBox'/> + <JComboBox id='gammeComboBox' genericType="Range"/> </cell> </row> @@ -261,7 +260,7 @@ <JLabel id='docTypeLabel'/> </cell> <cell columns='3' weightx='1'> - <JComboBox id='docTypeComboBox'/> + <JComboBox id='docTypeComboBox' genericType="DemandType" /> </cell> </row> @@ -289,21 +288,21 @@ <JLabel id='priorityLabel'/> </cell> <cell weightx='1'> - <JComboBox id='priorityComboBox'/> + <JComboBox id='priorityComboBox' genericType="Priority"/> </cell> <cell> <JLabel id='statusLabel'/> </cell> <cell weightx='1'> - <JComboBox id='statusComboBox'/> + <JComboBox id='statusComboBox' genericType="DemandStatus"/> </cell> <cell> <JLabel id='etatAttenteLabel'/> </cell> <cell columns='3' weightx='2'> - <JComboBox id='etatAttenteComboBox'/> + <JComboBox id='etatAttenteComboBox' genericType="EtatAttente"/> </cell> </row> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-07-25 09:53:01 UTC (rev 440) @@ -40,8 +40,6 @@ import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.DefaultTreeCellRenderer; -import java.awt.*; import java.util.Collection; import java.util.HashSet; import java.util.Map; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java 2014-07-25 09:53:01 UTC (rev 440) @@ -115,12 +115,10 @@ //-- Entity methods --// //------------------------------------------------------------------------// -// @Override public Integer getIdAsInt() { return id == null ? null : Integer.valueOf(id); } -// @Override public void setId(Integer id) { if (id == null) { this.id = null; @@ -129,12 +127,10 @@ } } -// @Override public String getId() { return id; } -// @Override public void setId(String id) { Object oldValue = getId(); this.id = id; @@ -152,12 +148,12 @@ firePropertyChange(propertyName, oldValue, newValue); } - protected <B> B getChild(Collection<B> child, int index) { + /*protected <B> B getChild(Collection<B> child, int index) { return CollectionUtil.getOrNull(child, index); - } + }*/ - protected <B> B getChild(List<B> child, int index) { + /*protected <B> B getChild(List<B> child, int index) { return CollectionUtil.getOrNull(child, index); - } + }*/ } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-07-25 09:53:01 UTC (rev 440) @@ -256,7 +256,7 @@ getParentContainer(JFrame.class).setVisible(false); } - protected <HL extends HasLabel> void initCheckBoxComboBox(final JComboBox comboBox, + protected <HL extends HasLabel> void initCheckBoxComboBox(final JComboBox<HL> comboBox, java.util.List<HL> values, java.util.List<HL> selection, String property, @@ -269,9 +269,9 @@ if (values != null) { universe.addAll(values); } - final ComboBoxModel comboModel = new CheckBoxComboBoxModel(universe, selection); + final ComboBoxModel<HL> comboModel = new CheckBoxComboBoxModel<HL>(universe, selection); comboBox.setModel(comboModel); - comboBox.setRenderer(new CheckBoxListCellRenderer() { + comboBox.setRenderer(new CheckBoxListCellRenderer<HL>() { @Override protected boolean isCheckBoxSelected(Object value) { return ((java.util.List<Object>) comboModel.getSelectedItem()).contains(value); Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-archive.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-07-25 09:16:19 UTC (rev 439) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-07-25 09:53:01 UTC (rev 440) @@ -30,7 +30,6 @@ import org.apache.struts2.convention.annotation.InterceptorRef; import org.apache.struts2.convention.annotation.InterceptorRefs; import org.apache.struts2.convention.annotation.Result; -import org.nuiton.jaxx.application.ApplicationContext; import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; Property changes on: trunk/src/site/resources/img/notepad.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/img/txt-to-csv.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL