From 604e11e93e45b691ac709bb8bf2908d6f05e0237 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 14 Jun 2011 20:06:38 +0000 Subject: [PATCH] That should be public; other entities use those values. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6658 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../presents/server/RebootManager.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/threerings/presents/server/RebootManager.java b/src/main/java/com/threerings/presents/server/RebootManager.java index 5a55efc2c..d8b0b8175 100644 --- a/src/main/java/com/threerings/presents/server/RebootManager.java +++ b/src/main/java/com/threerings/presents/server/RebootManager.java @@ -60,6 +60,9 @@ public abstract class RebootManager void shutdownPlanned (int warningsLeft, long msLeft); } + /** The default warning times. */ + public static final int[] DEFAULT_WARNINGS = { 30, 20, 15, 10, 5, 2 }; + /** * Finishes initialization of the manager. */ @@ -182,6 +185,16 @@ public abstract class RebootManager } } + /** + * Returns the minutes at which we give warnings. The last value is also the minimum time at + * which we can possibly reboot after the value of the nextReboot field is changed, to prevent + * accidentally causing instant server reboots. + */ + public int[] getWarnings () + { + return DEFAULT_WARNINGS; + } + /** * Provides us with our dependencies. */ @@ -313,16 +326,6 @@ public abstract class RebootManager }); } - /** - * Returns the minutes at which we give warnings. The last value is also the minimum time at - * which we can possibly reboot after the value of the nextReboot field is changed, to prevent - * accidentally causing instant server reboots. - */ - protected int[] getWarnings () - { - return DEFAULT_WARNINGS; - } - /** The server that we're going to reboot. */ protected PresentsServer _server; @@ -350,8 +353,5 @@ public abstract class RebootManager /** Things that can delay the reboot. */ protected HashIntMap _rebootLocks = new HashIntMap(); - /** The default warning times. */ - public static final int[] DEFAULT_WARNINGS = { 30, 20, 15, 10, 5, 2 }; - protected static final String AUTOMATIC_INITIATOR = "automatic"; }