- Rename NotificationException to MessageException

- Simplify Notificator instantiation
- Make sms configuration more clear
- Move some defaults in code
- Some cleanup

2 files changed, 5 insertions, 30 deletions

diff --git a/src/org/traccar/sms/SMSException.java b/src/org/traccar/sms/SMSException.java
deleted file mode 100644
index 22ca95296..000000000
--- a/src/org/traccar/sms/SMSException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2018 Anton Tananaev (anton@traccar.org)
- * Copyright 2018 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.sms;
-
-
-import org.traccar.notification.NotificationException;
-
-public class SMSException extends NotificationException {
-
-    public SMSException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/src/org/traccar/sms/SMSManager.java b/src/org/traccar/sms/SmsManager.java
index c4cb68fb7..4bc4bd009 100644
--- a/src/org/traccar/sms/SMSManager.java
+++ b/src/org/traccar/sms/SmsManager.java
@@ -16,9 +16,12 @@
  */
 package org.traccar.sms;
 
-public interface SMSManager {
+import org.traccar.notification.MessageException;
 
-    void sendMessageSync(String destAddress, String message, boolean command) throws InterruptedException, SMSException;
+public interface SmsManager {
+
+    void sendMessageSync(String destAddress, String message, boolean command)
+            throws InterruptedException, MessageException;
     void sendMessageAsync(final String destAddress, final String message, final boolean command);
 
 }