vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-24 15:07:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor java 8 refactors.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2015-07-25 13:17:53 -03:00
parent 4acc9ec50f
commit 4acdc0b994
3 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
View File

@ -63,10 +63,10 @@ public class FreemindExporter
export(map.getUnzipXml(), outputStream); export(map.getUnzipXml(), outputStream);
} }
public void export(byte[] xml, @NotNull OutputStream outputStream) throws ExportException { public void export(@NotNull byte[] xml, @NotNull OutputStream outputStream) throws ExportException {
objectFactory = new com.wisemapping.jaxb.freemind.ObjectFactory(); objectFactory = new com.wisemapping.jaxb.freemind.ObjectFactory();
nodesMap = new HashMap<String, Node>(); nodesMap = new HashMap<>();
final com.wisemapping.jaxb.wisemap.Map mindmapMap; final com.wisemapping.jaxb.wisemap.Map mindmapMap;
try { try {
@ -124,15 +124,7 @@ public class FreemindExporter
} }
JAXBUtils.saveMap(freemindMap, outputStream); JAXBUtils.saveMap(freemindMap, outputStream);
} catch (JAXBException e) { } catch (JAXBException | SAXException | IOException | ParserConfigurationException e) {
throw new ExportException(e);
} catch (UnsupportedEncodingException e) {
throw new ExportException(e);
} catch (SAXException e) {
throw new ExportException(e);
} catch (ParserConfigurationException e) {
throw new ExportException(e);
} catch (IOException e) {
throw new ExportException(e); throw new ExportException(e);
} }
} }

21
wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
View File

@ -53,21 +53,16 @@ public final class Mailer {
public void sendEmail(final String from, final String to, final String subject, final Map model, public void sendEmail(final String from, final String to, final String subject, final Map model,
@NotNull final String templateMail) { @NotNull final String templateMail) {
final MimeMessagePreparator preparator =
new MimeMessagePreparator() {
public void prepare(MimeMessage mimeMessage)
throws Exception {
final MimeMessageHelper message = new MimeMessageHelper(mimeMessage);
message.setTo(to);
message.setFrom(from);
message.setSubject(subject);
final String messageBody = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, "/mail/" + templateMail, model); this.mailSender.send(mimeMessage -> {
message.setText(messageBody, true); final MimeMessageHelper message = new MimeMessageHelper(mimeMessage);
} message.setTo(to);
}; message.setFrom(from);
message.setSubject(subject);
this.mailSender.send(preparator); final String messageBody = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, "/mail/" + templateMail, model);
message.setText(messageBody, true);
});
} }
public void setMailSender(JavaMailSender mailer) { public void setMailSender(JavaMailSender mailer) {

2
wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
View File

@ -215,7 +215,7 @@ public class MindmapIcons {
private static void load() { private static void load() {
try { try {
if (iconsByFamily == null) { if (iconsByFamily == null) {
iconsByFamily = new TreeMap<IconFamily, List<MindmapIcon>>(); iconsByFamily = new TreeMap<>();
Field[] fields = MindmapIcons.class.getDeclaredFields(); Field[] fields = MindmapIcons.class.getDeclaredFields();
for (Field field : fields) { for (Field field : fields) {