aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-12-07 15:04:59 +0500
committerAbyss777 <abyss@fox5.ru>2016-12-07 15:04:59 +0500
commit23280c00e39bc1a7a899a6e2d5dda230f28a12b3 (patch)
treeb50cd6f8a4a38fb3d0bc73b8ee017d3f92c880a5
parent6c64c6e87a25b4d2339f2fd8d83fa4bc36d461f2 (diff)
downloadtraccar-server-23280c00e39bc1a7a899a6e2d5dda230f28a12b3.tar.gz
traccar-server-23280c00e39bc1a7a899a6e2d5dda230f28a12b3.tar.bz2
traccar-server-23280c00e39bc1a7a899a6e2d5dda230f28a12b3.zip
- Extract MailMessage class
- Move getting "unknown.vm" to catch
-rw-r--r--src/org/traccar/notification/MailMessage.java36
-rw-r--r--src/org/traccar/notification/NotificationFormatter.java17
-rw-r--r--src/org/traccar/notification/NotificationMail.java1
3 files changed, 36 insertions, 18 deletions
diff --git a/src/org/traccar/notification/MailMessage.java b/src/org/traccar/notification/MailMessage.java
new file mode 100644
index 000000000..0fce43740
--- /dev/null
+++ b/src/org/traccar/notification/MailMessage.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.notification;
+
+public class MailMessage {
+
+ private String subject;
+ private String body;
+
+ public MailMessage(String subject, String body) {
+ this.subject = subject;
+ this.body = body;
+ }
+
+ public String getSubject() {
+ return subject;
+ }
+
+ public String getBody() {
+ return body;
+ }
+}
diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java
index 5182f9b58..2d580922c 100644
--- a/src/org/traccar/notification/NotificationFormatter.java
+++ b/src/org/traccar/notification/NotificationFormatter.java
@@ -29,21 +29,6 @@ import org.traccar.reports.ReportUtils;
public final class NotificationFormatter {
- public static class MailMessage {
- private String subject;
- private String body;
- public MailMessage(String subject, String body) {
- this.subject = subject;
- this.body = body;
- }
- public String getSubject() {
- return subject;
- }
- public String getBody() {
- return body;
- }
- }
-
private NotificationFormatter() {
}
@@ -66,8 +51,6 @@ public final class NotificationFormatter {
template = Context.getVelocityEngine().getTemplate(event.getType() + ".vm");
} catch (ResourceNotFoundException error) {
Log.warning(error);
- }
- if (template == null) {
template = Context.getVelocityEngine().getTemplate("unknown.vm");
}
diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java
index dc68b82e9..7b7ef6e74 100644
--- a/src/org/traccar/notification/NotificationMail.java
+++ b/src/org/traccar/notification/NotificationMail.java
@@ -29,7 +29,6 @@ import org.traccar.helper.Log;
import org.traccar.model.Event;
import org.traccar.model.Position;
import org.traccar.model.User;
-import org.traccar.notification.NotificationFormatter.MailMessage;
public final class NotificationMail {