+ Added a display string to the GUI of the threaded buffers, showing seconds remaining before the thread belonging to this buffer is released. This will also show ms/25 lag info someday.

+ Added invokeGC() to SystemUtils.java.
$ More thread safety.

2 files changed, 16 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
index 0c752c20e0..52316c8a43 100644
--- a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
@@ -8,13 +8,13 @@ import gtPlusPlus.api.objects.data.AutoMap;
 
 public class ArrayUtils {
 
-	public static Object[] expandArray(final Object[] someArray, final Object newValueToAdd) {
-		Object[] series = someArray;
+	public static <V> V[] expandArray(final V[] someArray, final V newValueToAdd) {
+		V[] series = someArray;
 		series = addElement(series, newValueToAdd);
 		return series;
 	}
 
-	private static Object[] addElement(Object[] series, final Object newValueToAdd) {
+	private static <V> V[] addElement(V[] series, final V newValueToAdd) {
 		series  = Arrays.copyOf(series, series.length + 1);
 		series[series.length - 1] = newValueToAdd;
 		return series;
diff --git a/src/Java/gtPlusPlus/core/util/sys/SystemUtils.java b/src/Java/gtPlusPlus/core/util/sys/SystemUtils.java
index efcfaf8d04..2788ba688e 100644
--- a/src/Java/gtPlusPlus/core/util/sys/SystemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/sys/SystemUtils.java
@@ -14,6 +14,19 @@ public class SystemUtils {
 		}
 	}
 	
+	/**
+	 * Try invoke the runtime's Garbage Collector.
+	 */
+	public static void invokeGC() {
+		try {
+			Runtime r = Runtime.getRuntime();
+			r.gc();
+		}
+		catch (Throwable t) {
+			//Do nothing.
+		}
+	}
+	
 	public static boolean isWindows() {
 		return (getOSString().indexOf("win") >= 0);
 	}