From d2b861df3f3faa46c8dcf72e5897ed31cfe40b40 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 17 Jul 2015 19:48:40 +1200 Subject: Add base protocol encoder --- src/org/traccar/BaseProtocol.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/org/traccar/BaseProtocol.java') diff --git a/src/org/traccar/BaseProtocol.java b/src/org/traccar/BaseProtocol.java index 932c0d9cc..4a408761d 100644 --- a/src/org/traccar/BaseProtocol.java +++ b/src/org/traccar/BaseProtocol.java @@ -15,10 +15,11 @@ */ package org.traccar; -import org.traccar.model.Command; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; import org.traccar.database.ActiveDevice; - -import java.util.*; +import org.traccar.model.Command; public abstract class BaseProtocol implements Protocol { @@ -29,6 +30,7 @@ public abstract class BaseProtocol implements Protocol { this.name = name; } + @Override public String getName() { return name; } @@ -39,15 +41,10 @@ public abstract class BaseProtocol implements Protocol { @Override public void sendCommand(ActiveDevice activeDevice, Command command) { - /*CommandTemplate commandMessage = commandTemplates.get(command.getType()); - - if (commandMessage == null) { - throw new RuntimeException("The command " + command + " is not yet supported in protocol " + this.getName()); + if (!supportedCommands.contains(command.getType())) { + throw new RuntimeException("Command " + command + " is not supported in protocol " + this.getName()); } - - Object response = commandMessage.applyTo(activeDevice, command); - - activeDevice.write(response);*/ + activeDevice.write(command); } } -- cgit v1.2.3