Merge pull request #2012 from Abyss777/master

Implement Geofences on server side

1 files changed, 2 insertions, 43 deletions

diff --git a/src/org/traccar/model/Message.java b/src/org/traccar/model/Message.java
index 8722acc16..55d9fd0c7 100644
--- a/src/org/traccar/model/Message.java
+++ b/src/org/traccar/model/Message.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,7 @@
  */
 package org.traccar.model;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class Message {
+public class Message extends Extensible {
 
     private long deviceId;
 
@@ -40,42 +37,4 @@ public class Message {
         this.type = type;
     }
 
-    private Map<String, Object> attributes = new LinkedHashMap<>();
-
-    public Map<String, Object> getAttributes() {
-        return attributes;
-    }
-
-    public void setAttributes(Map<String, Object> attributes) {
-        this.attributes = attributes;
-    }
-
-    public void set(String key, boolean value) {
-        attributes.put(key, value);
-    }
-
-    public void set(String key, int value) {
-        attributes.put(key, value);
-    }
-
-    public void set(String key, long value) {
-        attributes.put(key, value);
-    }
-
-    public void set(String key, double value) {
-        attributes.put(key, value);
-    }
-
-    public void set(String key, String value) {
-        if (value != null && !value.isEmpty()) {
-            attributes.put(key, value);
-        }
-    }
-
-    public void add(Map.Entry<String, Object> entry) {
-        if (entry != null && entry.getValue() != null) {
-            attributes.put(entry.getKey(), entry.getValue());
-        }
-    }
-
 }