- made API interface object constructors and instance accessors private

(mainly for clean docs)

Author: owagner

build.gradle

@@ -40,7 +40,9 @@ jar {
 }
 
 task generateApiDocs(type: Javadoc) {	
-	source = fileTree("src/main/java/com/tellerulam/logic4mqtt/api")
+	source = fileTree("src/main/java/com/tellerulam/logic4mqtt/api").matching {
+		exclude "InstanceManager.java"
+	}
 	destinationDir = file("apidocs")
 	options.setMemberLevel(JavadocMemberLevel.PUBLIC)
 }

src/main/java/com/tellerulam/logic4mqtt/NattyTimer.java

@@ -36,7 +36,7 @@ public void start()
 	/* Overridable for unit testing only */
 	protected Time getTimeInstance()
 	{
-		return Time.getInstance();
+		return InstanceManager.getTimeInstance();
 	}
 
 	public static class ParsedSpec

src/main/java/com/tellerulam/logic4mqtt/ScriptScanner.java

@@ -40,10 +40,10 @@ static private ScriptEngine getEngine(String ext)
 			if(se!=null)
 			{
 				// Configure the engine
-				se.put("Events", Events.getInstance());
-				se.put("Timers", Timers.getInstance());
-				se.put("Utilities", Utilities.getInstance());
-				se.put("Time", Time.getInstance());
+				se.put("Events", InstanceManager.getEventsInstance());
+				se.put("Timers", InstanceManager.getTimersInstance());
+				se.put("Utilities", InstanceManager.getUtilitiesInstance());
+				se.put("Time", InstanceManager.getTimeInstance());
 				engines.put(ext,se);
 			}
 		}

src/main/java/com/tellerulam/logic4mqtt/api/Events.java

@@ -11,11 +11,11 @@
 
 public class Events
 {
-	private static final Events instance=new Events();
+	static final Events instance=new Events();
 
-	public static Events getInstance()
+	private Events()
 	{
-		return instance;
+		/* Keep private */
 	}
 
 	/**

src/main/java/com/tellerulam/logic4mqtt/api/InstanceManager.java

@@ -0,0 +1,21 @@
+package com.tellerulam.logic4mqtt.api;
+
+public class InstanceManager
+{
+	public static Events getEventsInstance()
+	{
+		return Events.instance;
+	}
+	public static Time getTimeInstance()
+	{
+		return Time.instance;
+	}
+	public static Timers getTimersInstance()
+	{
+		return Timers.instance;
+	}
+	public static Utilities getUtilitiesInstance()
+	{
+		return Utilities.instance;
+	}
+}

src/main/java/com/tellerulam/logic4mqtt/api/Time.java

@@ -23,7 +23,13 @@
 
 public class Time
 {
-	private static final Time instance=new Time();
+	static final Time instance=new Time();
+
+	private Time()
+	{
+		/* Keep private */
+	}
+
 
 	private LnLnlatPosn location=new LnLnlatPosn();
 	{
@@ -382,10 +388,5 @@ public boolean isBetween(String timespec1,String timespec2)
 		return cal_start.before(now) && cal_end.after(now);
 	}
 
-	public static Time getInstance()
-	{
-		return instance;
-	}
-
 	private static Logger L=Logger.getLogger(Time.class.getName());
 }

src/main/java/com/tellerulam/logic4mqtt/api/Timers.java

@@ -6,11 +6,10 @@
 
 public class Timers
 {
-	private static final Timers instance=new Timers();
-
-	public static Timers getInstance()
+	static final Timers instance=new Timers();
+	private Timers()
 	{
-		return instance;
+		/* Keep private */
 	}
 
 	public void addTimer(String symbolicName,String timespec,TimerCallbackInterface callback,Object userdata)

src/main/java/com/tellerulam/logic4mqtt/api/Utilities.java

@@ -13,11 +13,10 @@
 
 public class Utilities
 {
-	private static final Utilities instance=new Utilities();
-
-	public static Utilities getInstance()
+	static final Utilities instance=new Utilities();
+	private Utilities()
 	{
-		return instance;
+		/* Keep private */
 	}
 
 	/**

src/main/java/com/tellerulam/logic4mqtt/cmdline/CmdTimes.java

@@ -14,7 +14,7 @@ public class CmdTimes extends Cmd
 	@Override
 	public void exec(PrintWriter w, ArgSplitter args) throws Exception
 	{
-		Time t=Time.getInstance();
+		Time t=InstanceManager.getTimeInstance();
 		final String zeniths[]={"ASTRONOMICAL","NAUTICAL","CIVIL","OFFICIAL"};
 		for(String zenith:zeniths)
 		{