guillaume.bonabau
/
OOP_F1_Project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge issues

This commit is contained in:
Guillaume LE CHARTIER 2024-05-29 11:45:15 +02:00
parent e87442bc14
commit 6bf5f8b659
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/Simulator.java
View File

@ -4,21 +4,7 @@ import java.awt.Color;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.awt.Color;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
//import for json
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.util.List;
import java.util.Scanner;
//import for json //import for json
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
@ -96,9 +82,6 @@ public class Simulator extends Thread {
//TODO-COMPLETE : replace with proper return //TODO-COMPLETE : replace with proper return
return this.height; return this.height;
} }
public ArrayList<ArrayList<Integer>> getColorArrayList() {
return colorArrayList;
}
public ArrayList<ArrayList<Integer>> getColorArrayList(){ public ArrayList<ArrayList<Integer>> getColorArrayList(){
return colorArrayList; return colorArrayList;