diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
commit | 7310ee5f15729ea8517bfb6b0890a46da1217610 (patch) | |
tree | 44504738f127708420179a7dbbe2942cb67d0849 /src/org/traccar/command | |
parent | 8e8da7019aab023ae255d0ed6d16b94d303fd468 (diff) | |
parent | 0a6faa86c4b634fa3a94633506c4422623e36f1e (diff) | |
download | traccar-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.gz traccar-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.bz2 traccar-server-7310ee5f15729ea8517bfb6b0890a46da1217610.zip |
Merge Java 7 update (fix #1273)
Diffstat (limited to 'src/org/traccar/command')
-rw-r--r-- | src/org/traccar/command/CommandType.java | 9 | ||||
-rw-r--r-- | src/org/traccar/command/FixPositioningCommand.java | 2 | ||||
-rw-r--r-- | src/org/traccar/command/NoParameterCommand.java | 2 | ||||
-rw-r--r-- | src/org/traccar/command/StringCommandTemplate.java | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/src/org/traccar/command/CommandType.java b/src/org/traccar/command/CommandType.java index b5f6393b6..56596fa41 100644 --- a/src/org/traccar/command/CommandType.java +++ b/src/org/traccar/command/CommandType.java @@ -8,8 +8,7 @@ public enum CommandType implements Factory { STOP_ENGINE(NoParameterCommand.class), RESUME_ENGINE(NoParameterCommand.class); - - private Class<? extends GpsCommand> commandClass; + private final Class<? extends GpsCommand> commandClass; CommandType(Class<? extends GpsCommand> commandClass) { this.commandClass = commandClass; @@ -19,10 +18,8 @@ public enum CommandType implements Factory { public Object create() { try { return commandClass.newInstance(); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); + } catch (InstantiationException | IllegalAccessException error) { + throw new RuntimeException(error); } } } diff --git a/src/org/traccar/command/FixPositioningCommand.java b/src/org/traccar/command/FixPositioningCommand.java index 1304e1f3f..18d5f32fb 100644 --- a/src/org/traccar/command/FixPositioningCommand.java +++ b/src/org/traccar/command/FixPositioningCommand.java @@ -10,7 +10,7 @@ public class FixPositioningCommand extends GpsCommand { @Override public Map<String, Object> getReplacements() { - Map<String, Object> replacements = new HashMap<String, Object>(); + Map<String, Object> replacements = new HashMap<>(); replacements.put(FREQUENCY, data); return replacements; } diff --git a/src/org/traccar/command/NoParameterCommand.java b/src/org/traccar/command/NoParameterCommand.java index afb0f3aee..f4e139b7b 100644 --- a/src/org/traccar/command/NoParameterCommand.java +++ b/src/org/traccar/command/NoParameterCommand.java @@ -6,6 +6,6 @@ import java.util.Map; public class NoParameterCommand extends GpsCommand { @Override public Map<String, Object> getReplacements() { - return new HashMap<String, Object>(); + return new HashMap<>(); } } diff --git a/src/org/traccar/command/StringCommandTemplate.java b/src/org/traccar/command/StringCommandTemplate.java index 12470d441..3f326e534 100644 --- a/src/org/traccar/command/StringCommandTemplate.java +++ b/src/org/traccar/command/StringCommandTemplate.java @@ -8,7 +8,7 @@ import java.util.Map; public class StringCommandTemplate<T extends GpsCommand> implements CommandTemplate<T> { private String messageTemplate; - private Map<Class<?>, CommandValueConversion> converters = new HashMap<Class<?>, CommandValueConversion>(); + private Map<Class<?>, CommandValueConversion> converters = new HashMap<>(); public StringCommandTemplate(String template, Object... replacements) { this.messageTemplate = String.format(template, replacements); |