X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIgnite.java;h=d4acda374c6a30de2689e998d20411576052e670;hp=b458911ec61884d4bd144a5b50d934d8fd2fc454;hb=HEAD;hpb=bd440afc2a6e37b74fffcf1b977e149485095316

diff --git a/altoslib/AltosIgnite.java b/altoslib/AltosIgnite.java
index b458911e..d1ec5104 100644
--- a/altoslib/AltosIgnite.java
+++ b/altoslib/AltosIgnite.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_14;
 
 import java.util.*;
 import java.io.*;
@@ -24,8 +25,10 @@ import java.util.concurrent.*;
 public class AltosIgnite {
 	AltosLink	link;
 	boolean		remote;
+	boolean		close_on_exit;
 	boolean		link_started;
-	boolean		have_npyro = false;
+	boolean		has_pyro_info = false;
+	boolean		has_standard = false;
 	int		npyro;
 	AltosConfigData	config_data;
 
@@ -100,15 +103,18 @@ public class AltosIgnite {
 	private void get_npyro() throws InterruptedException, TimeoutException {
 		if (config_data == null)
 			config_data = new AltosConfigData(link);
-		if (config_data != null)
+		if (config_data != null && config_data.npyro != AltosLib.MISSING)
 			npyro = config_data.npyro;
 		else
 			npyro = 0;
-		have_npyro = true;
+		if (config_data != null)
+			has_standard = config_data.ignite_mode != AltosLib.MISSING;
+
+		has_pyro_info = true;
 	}
 
 	public int npyro() throws InterruptedException, TimeoutException {
-		if (!have_npyro) {
+		if (!has_pyro_info) {
 			start_link();
 			get_npyro();
 			stop_link();
@@ -116,6 +122,15 @@ public class AltosIgnite {
 		return npyro;
 	}
 
+	public boolean has_standard() throws InterruptedException, TimeoutException {
+		if (!has_pyro_info) {
+			start_link();
+			get_npyro();
+			stop_link();
+		}
+		return has_standard;
+	}
+
 	public HashMap<String,Integer> status() throws InterruptedException, TimeoutException {
 		HashMap<String,Integer> status = new HashMap<String,Integer>();
 
@@ -172,6 +187,7 @@ public class AltosIgnite {
 		try {
 			start_link();
 			link.printf("i DoIt %s\n", igniter);
+			link.flush_output();
 		} catch (TimeoutException te) {
 		} finally {
 			stop_link();
@@ -180,14 +196,18 @@ public class AltosIgnite {
 
 	public void close() throws InterruptedException {
 		stop_link();
-		link.close();
+		if (close_on_exit)
+			link.close();
 		link = null;
 	}
 
-	public AltosIgnite(AltosLink in_link, boolean in_remote)
-		throws FileNotFoundException, TimeoutException, InterruptedException {
-
+	public AltosIgnite(AltosLink in_link, boolean in_remote, boolean in_close_on_exit) {
 		link = in_link;
 		remote = in_remote;
+		close_on_exit = in_close_on_exit;
+	}
+
+	public AltosIgnite(AltosLink in_link, boolean in_remote) {
+		this(in_link, in_remote, true);
 	}
-}
\ No newline at end of file
+}