Started work on a new GUI frontend

5 files changed, 56 insertions, 16 deletions

diff --git a/RGens/src/main/java/bjc/RGens/gui/GrammarStudio.java b/RGens/src/main/java/bjc/RGens/gui/GrammarStudio.java
new file mode 100644
index 0000000..ffc9be8
--- /dev/null
+++ b/RGens/src/main/java/bjc/RGens/gui/GrammarStudio.java
@@ -0,0 +1,26 @@
+package bjc.RGens.gui;
+
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+public class GrammarStudio {
+	public static void main(String[] args) {
+		try {
+			UIManager.setLookAndFeel(
+					UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException
+				| UnsupportedLookAndFeelException ex) {
+			System.out.println(
+					"WARNING: Could not use system look and feel");
+			ex.printStackTrace();
+		}
+
+		GrammarStudioFrame mainFrame = new GrammarStudioFrame();
+
+		mainFrame.setDefaultCloseOperation(
+				GrammarStudioFrame.EXIT_ON_CLOSE);
+
+		mainFrame.setVisible(true);
+	}
+}
diff --git a/RGens/src/main/java/bjc/RGens/gui/GrammarStudioFrame.java b/RGens/src/main/java/bjc/RGens/gui/GrammarStudioFrame.java
new file mode 100644
index 0000000..7197edd
--- /dev/null
+++ b/RGens/src/main/java/bjc/RGens/gui/GrammarStudioFrame.java
@@ -0,0 +1,11 @@
+package bjc.RGens.gui;
+
+import javax.swing.JFrame;
+
+public class GrammarStudioFrame extends JFrame {
+	private static final long serialVersionUID = 1476431892446002428L;
+
+	public GrammarStudioFrame() {
+		super("Grammar Studio");
+	}
+}
diff --git a/RGens/src/main/java/bjc/RGens/parser/GrammarReaderApp.java b/RGens/src/main/java/bjc/RGens/parser/GrammarReaderApp.java
index abf9d1f..6f96874 100644
--- a/RGens/src/main/java/bjc/RGens/parser/GrammarReaderApp.java
+++ b/RGens/src/main/java/bjc/RGens/parser/GrammarReaderApp.java
@@ -27,7 +27,6 @@ public class GrammarReaderApp {
 	 * @param args
 	 *            CLI args
 	 */
-	@SuppressWarnings("null")
 	public static void main(String[] args) {
 		try {
 			UIManager.setLookAndFeel(
@@ -39,6 +38,11 @@ public class GrammarReaderApp {
 			System.exit(1);
 		}
 
+		doSingleFile();
+	}
+
+	@SuppressWarnings("null")
+	private static void doSingleFile() {
 		File gramFile = SimpleFileDialog.getOpenFile(null,
 				"Choose Grammar File", ".gram");
 
@@ -67,7 +71,7 @@ public class GrammarReaderApp {
 		}
 
 		int count = SimpleDialogs.getWhole(null,
-				"Enter number of repititions",
+				"Enter number of repetitions",
 				"Enter the number of items to generate from the rule");
 
 		File outputFile = SimpleFileDialog.getSaveFile(null,
diff --git a/RGens/src/main/java/bjc/RGens/text/markov/StandaloneTextGenerator.java b/RGens/src/main/java/bjc/RGens/text/markov/StandaloneTextGenerator.java
index 7e89c27..78369d0 100644
--- a/RGens/src/main/java/bjc/RGens/text/markov/StandaloneTextGenerator.java
+++ b/RGens/src/main/java/bjc/RGens/text/markov/StandaloneTextGenerator.java
@@ -11,13 +11,13 @@ public class StandaloneTextGenerator {
 	 * Build a markov generator from a provided source
 	 * 
 	 * @param k
-	 * @param M
-	 * @param text
+	 *            The markov order to use
 	 * @param reader
+	 *            The source to seed the generator from
 	 * @return The markov generator for the provided text
 	 */
-	public static StandaloneMarkov generateMarkovMap(int k, int M,
-			StringBuilder text, Reader reader) {
+	public static StandaloneMarkov generateMarkovMap(int k,
+			Reader reader) {
 		Map<String, Markov> hash = new HashMap<>();
 
 		Character next = null;
@@ -41,7 +41,7 @@ public class StandaloneTextGenerator {
 				next = (char) reader.read();
 			} catch (IOException e) {
 				System.out.println(
-						"IOException in stepping through the file");
+						"IOException in stepping through the reader");
 				e.printStackTrace();
 			}
 
@@ -64,11 +64,7 @@ public class StandaloneTextGenerator {
 			}
 		}
 
-		StandaloneMarkov markovGen = new StandaloneMarkov(k, hash, firstSub);
-		
-		text.append(markovGen.generateTextFromMarkov(M));
-
-		return markovGen;
+		return new StandaloneMarkov(k, hash, firstSub);
 	}
 
 }
diff --git a/RGens/src/main/java/bjc/RGens/text/markov/TextGenerator.java b/RGens/src/main/java/bjc/RGens/text/markov/TextGenerator.java
index 41a08f0..e8f9ea7 100755
--- a/RGens/src/main/java/bjc/RGens/text/markov/TextGenerator.java
+++ b/RGens/src/main/java/bjc/RGens/text/markov/TextGenerator.java
@@ -48,8 +48,14 @@ public class TextGenerator {
 			System.exit(1);
 		}
 
+		StandaloneMarkov markov = null;
+
 		try (FileReader reader = new FileReader(file)) {
-			StandaloneTextGenerator.generateMarkovMap(k, M, text, reader);
+			markov = StandaloneTextGenerator.generateMarkovMap(k,
+					reader);
+
+			System.out.println(markov.generateTextFromMarkov(M)
+					.substring(0, Math.min(M, text.length())));
 		} catch (FileNotFoundException e) {
 			System.out.println("File not found.");
 			e.printStackTrace();
@@ -59,8 +65,5 @@ public class TextGenerator {
 			ioex.printStackTrace();
 			System.exit(1);
 		}
-
-		System.out.println(
-				text.toString().substring(0, Math.min(M, text.length())));
 	}
 }
\ No newline at end of file