Fix timestamps and ValueQuery

2 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/StateMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/StateMessage.java
index 806d41f..c70f215 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/StateMessage.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/StateMessage.java
@@ -13,10 +13,10 @@ import pl.edu.mimuw.cloudatlas.model.ZMI;
 
 public class StateMessage extends ResponseMessage {
     private ZMI zmi;
-    private Map<Attribute, Entry<ValueQuery, ValueTime>> queries;
+    private Map<Attribute, ValueQuery> queries;
     private Set<ValueContact> contacts;
 
-    public StateMessage(String messageId, ModuleType destinationModule, long timestamp, long requestId, ZMI zmi, Map<Attribute, Entry<ValueQuery, ValueTime>> queries, Set<ValueContact> contacts) {
+    public StateMessage(String messageId, ModuleType destinationModule, long timestamp, long requestId, ZMI zmi, Map<Attribute, ValueQuery> queries, Set<ValueContact> contacts) {
         super(messageId, destinationModule, timestamp, Type.STATE, requestId);
         this.zmi = zmi;
         this.queries = queries;
@@ -29,7 +29,7 @@ public class StateMessage extends ResponseMessage {
         return zmi;
     }
 
-    public Map<Attribute, Entry<ValueQuery, ValueTime>> getQueries() {
+    public Map<Attribute, ValueQuery> getQueries() {
         return queries;
     }
 
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/UpdateQueriesMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/UpdateQueriesMessage.java
index 4b0b9c8..7f156df 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/UpdateQueriesMessage.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/UpdateQueriesMessage.java
@@ -8,16 +8,16 @@ import pl.edu.mimuw.cloudatlas.model.ValueQuery;
 import pl.edu.mimuw.cloudatlas.model.ValueTime;
 
 public class UpdateQueriesMessage extends StanikMessage {
-    private Map<Attribute, Entry<ValueQuery, ValueTime>> queries;
+    private Map<Attribute, ValueQuery> queries;
 
-    public UpdateQueriesMessage(String messageId, long timestamp, Map<Attribute, Entry<ValueQuery, ValueTime>> queries) {
+    public UpdateQueriesMessage(String messageId, long timestamp, Map<Attribute, ValueQuery> queries) {
         super(messageId, timestamp, Type.UPDATE_QUERIES);
         this.queries = queries;
     }
 
     public UpdateQueriesMessage() {}
 
-    public Map<Attribute, Entry<ValueQuery, ValueTime>> getQueries() {
+    public Map<Attribute, ValueQuery> getQueries() {
         return queries;
     }
 }