Remove time actions from time plugin.

Just leave the timer command, don't fire events every N seconds etc.

time/src/com/dmdirc/addons/time/TimeActionMetaType.java

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.time;
-
-import com.dmdirc.interfaces.actions.ActionMetaType;
-
-import java.util.Calendar;
-
-/**
- * Encapsulates the meta types used by the various time actions.
- */
-public enum TimeActionMetaType implements ActionMetaType {
-
-    /** Time type. */
-    TIME_TIME {
-        @Override
-        public int getArity() {
-            return 1;
-        }
-
-        @Override
-        public Class<?>[] getArgTypes() {
-            return new Class<?>[]{Calendar.class};
-        }
-
-        @Override
-        public String[] getArgNames() {
-            return new String[]{"Date"};
-        }
-    };
-
-    @Override
-    public String getGroup() {
-        return "Time Events";
-    }
-
-}

time/src/com/dmdirc/addons/time/TimeActionType.java

@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.time;
-
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.interfaces.actions.ActionType;
-
-/**
- * Lists the actions that the time plugin will raise.
- */
-public enum TimeActionType implements ActionType {
-
-    /** Minute type. */
-    TIME_MINUTE("Every minute"),
-    /** Hour type. */
-    TIME_HOUR("Every hour"),
-    /** Day type. */
-    TIME_DAY("Every day");
-    /** Action type name. */
-    private final String name;
-
-    /**
-     * Creates a new instance of a TimeActionType.
-     *
-     * @param name The name of the action type
-     */
-    TimeActionType(final String name) {
-        this.name = name;
-    }
-
-    @Override
-    public ActionMetaType getType() {
-        return TimeActionMetaType.TIME_TIME;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-}

time/src/com/dmdirc/addons/time/TimePlugin.java

@@ -43,16 +43,10 @@ public class TimePlugin extends BaseCommandPlugin {
         manager = getObjectGraph().get(TimerManager.class);
     }
 
-    @Override
-    public void onLoad() {
-        manager.load();
-        super.onLoad();
-    }
-
     @Override
     public void onUnload() {
-        manager.unload();
         super.onUnload();
+        manager = null;
     }
 
 }

time/src/com/dmdirc/addons/time/TimerManager.java

@@ -23,15 +23,11 @@
 package com.dmdirc.addons.time;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.interfaces.ActionController;
 
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
 
 import javax.inject.Inject;
 
@@ -42,47 +38,14 @@ public class TimerManager {
 
     /** Map of all the timers that are running. */
     private final Map<Integer, TimedCommand> timerList = new HashMap<>();
-    /** Action controller. */
-    private final ActionController actionController;
-    /** Have we registered our types already? */
-    private static boolean registered;
     /** The timer factory to create timers with. */
     private final TimerFactory timerFactory;
-    /** The timer to use for scheduling. */
-    private Timer timer;
 
     @Inject
-    public TimerManager(final ActionController actionController, final TimerFactory timerFactory) {
-        this.actionController = actionController;
+    public TimerManager(final TimerFactory timerFactory) {
         this.timerFactory = timerFactory;
     }
 
-    public void load() {
-        if (!registered) {
-            actionController.registerTypes(TimeActionType.values());
-            registered = true;
-        }
-
-        final int offset = 60 - Calendar.getInstance().get(Calendar.SECOND);
-
-        timer = new Timer("Time plugin timer");
-
-        timer.schedule(new TimerTask() {
-
-            @Override
-            public void run() {
-                runTimer();
-            }
-        }, 1000 * offset, 1000 * 60);
-    }
-
-    public void unload() {
-        if (timer != null) {
-            timer.cancel();
-            timer = null;
-        }
-    }
-
     /**
      * Adds a timer to the internal list and starts the timer.
      *
@@ -167,19 +130,4 @@ public class TimerManager {
         return timerList.containsKey(id);
     }
 
-    /** Handles a timer event that occurs every minute. */
-    public void runTimer() {
-        final Calendar cal = Calendar.getInstance();
-
-        actionController.triggerEvent(TimeActionType.TIME_MINUTE, null, cal);
-
-        if (cal.get(Calendar.MINUTE) == 0) {
-            actionController.triggerEvent(TimeActionType.TIME_HOUR, null, cal);
-
-            if (cal.get(Calendar.HOUR_OF_DAY) == 0) {
-                actionController.triggerEvent(TimeActionType.TIME_DAY, null, cal);
-            }
-        }
-    }
-
 }