From d17d09df315fd20014832121169dab4d3f8c2b32 Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Thu, 20 Dec 2018 17:26:57 +0100 Subject: [PATCH] Removed t from event --- src/opensesim/trader/SimpleTrader.java | 2 +- src/opensesim/world/scheduler/Event.java | 4 +--- src/opensesim/world/scheduler/Scheduler.java | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/opensesim/trader/SimpleTrader.java b/src/opensesim/trader/SimpleTrader.java index ac6bcc4..6af79d7 100644 --- a/src/opensesim/trader/SimpleTrader.java +++ b/src/opensesim/trader/SimpleTrader.java @@ -93,7 +93,7 @@ public class SimpleTrader extends AbstractTrader implements EventListener{ long diff = getWorld().currentTimeMillis()-last_time; last_time = getWorld().currentTimeMillis(); - System.out.printf("Here we are: %d - [%d] (%d)\n",Thread.currentThread().getId(),diff,task.t ); + System.out.printf("Here we are: %d - [%d]\n",Thread.currentThread().getId(),diff); getWorld().schedule(this, 1000); return -1; } diff --git a/src/opensesim/world/scheduler/Event.java b/src/opensesim/world/scheduler/Event.java index e0330a6..92a8f2c 100644 --- a/src/opensesim/world/scheduler/Event.java +++ b/src/opensesim/world/scheduler/Event.java @@ -33,9 +33,7 @@ package opensesim.world.scheduler; public class Event { EventListener listener; - - public long t; - + Event(EventListener listener) { this.listener = listener; } diff --git a/src/opensesim/world/scheduler/Scheduler.java b/src/opensesim/world/scheduler/Scheduler.java index f461287..7596c6f 100644 --- a/src/opensesim/world/scheduler/Scheduler.java +++ b/src/opensesim/world/scheduler/Scheduler.java @@ -99,7 +99,6 @@ public class Scheduler { public Event startTimerTask(EventListener listener, long time) { Event e = new Event(listener); long t = time + clock.currentTimeMillis(); - e.t=t; synchronized (event_queue) { LinkedList s = event_queue.get(t); if (s == null) {