package slogo_team02;

import java.util.ResourceBundle;

import commands.Command;
import model.Model;
import parse.Node;

public class Controller {
	/*
	 * The Controller class serves as a bridge between the View and the Model
	 */
	private void doModel(String input){
		Model model = new Model();		
		model.setState(0, 0, 0);
		model.doCommands(input);	
	}
	
	//main method to test
	public static void main(String[] args) {
		Controller c = new Controller();
		
//		c.doModel("repeat 5 [ fd sum 4 sum 4 5 ]");
		c.doModel("Forward 50");
	}


}

@@ -50,16 +50,44 @@
 undle;%0A%0A
+import javax.swing.JFrame;%0A%0A
 import c
@@ -103,16 +103,16 @@
 ommand;%0A
-
 import m
@@ -141,16 +141,37 @@
 se.Node;
+%0Aimport view.Display;
 %0A%0Apublic
@@ -274,16 +274,65 @@
 el%0A%09 */%0A
+%09private static final String TITLE = %22SLogo%22;%0A%09 %0A
 %09private
@@ -451,16 +451,118 @@
 ;%09%0A%09%7D%0A%09%0A
+%09private void doView()%7B%0A%09%09Display display = new Display(); %0A%09%09JFrame frame = new JFrame(TITLE); %0A%09%7D%0A%09%0A
 %09//main 
@@ -657,13 +657,23 @@
 ();%0A
+%0A
 %09%09
-%0A//
+c.doView();%0A
 %09%09c.
@@ -687,10 +687,10 @@
 (%22re
-pe
+PE
 at 5
@@ -718,34 +718,8 @@
 %22);%0A
-%09%09c.doModel(%22Forward 50%22);
 %0A%09%7D%0A

fix merge conflict