From bbc74e15134239f2660433e5f01f78edad21d497 Mon Sep 17 00:00:00 2001
From: Arthur <78031901+Arthur7770@users.noreply.github.com>
Date: Tue, 23 Mar 2021 17:45:20 +0100
Subject: [PATCH] First close tab button implementation

---
 src/lsystem/screen/main/Listener.java  |  8 ++++++++
 src/lsystem/screen/main/MainFrame.java | 11 ++++++++---
 src/lsystem/screen/main/Tab.java       | 18 ++++++++++--------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/lsystem/screen/main/Listener.java b/src/lsystem/screen/main/Listener.java
index cde62d9..913a63d 100644
--- a/src/lsystem/screen/main/Listener.java
+++ b/src/lsystem/screen/main/Listener.java
@@ -33,6 +33,14 @@ public class Listener implements ActionListener, KeyListener {
     @Override
     public void actionPerformed(ActionEvent e) {
         switch (type) {
+            case "Close":
+                frame.getTab().removeTabAt(index-1);
+                frame.decreaseTab();
+                for(int i = 0; i <frame.getTab().getComponentCount(); i++){
+                    frame.getTab().setTitleAt(i,"Génération"+(i+1));
+                }
+
+                break;
             case "Help":
                 frame.newHelp();
                 break;
diff --git a/src/lsystem/screen/main/MainFrame.java b/src/lsystem/screen/main/MainFrame.java
index 7003504..7a0845b 100644
--- a/src/lsystem/screen/main/MainFrame.java
+++ b/src/lsystem/screen/main/MainFrame.java
@@ -47,9 +47,14 @@ public class MainFrame extends JFrame {
         this.setPreferredSize(new Dimension(640,600));
         
         nbTabs++;
-		new Tab(nbTabs, nbRules, tabs);
-		// test
+		new Tab(nbTabs, nbRules, tabs,this);
     }
+	public JTabbedPane getTab(){
+		return tabs;
+	}
+	public void decreaseTab(){
+		nbTabs -=1;
+	}
 
 	public void newHelp() {
 		if(helpWindow){
@@ -88,7 +93,7 @@ public class MainFrame extends JFrame {
 			JOptionPane.showMessageDialog(null, "Nombre maximal de générations atteintes");
 		else {
 			nbTabs++;
-			new Tab(nbTabs, nbRules, tabs);
+			new Tab(nbTabs, nbRules, tabs,this);
 		}
 
 	}
diff --git a/src/lsystem/screen/main/Tab.java b/src/lsystem/screen/main/Tab.java
index bb58e33..1628c34 100644
--- a/src/lsystem/screen/main/Tab.java
+++ b/src/lsystem/screen/main/Tab.java
@@ -8,15 +8,12 @@ public class Tab extends JPanel{
 
     int nbTabs;
     int nbRules;
-    JSpinner nbIterations;
-    JTextField axiomeField;
-    JTextField rulesField;
-    JTextArea axiomList;
-    JTextArea rulesList;
-    JSpinner itSpinner;
-    JButton submitButton;
+    JSpinner nbIterations,itSpinner;
+    JTextField axiomeField,rulesField;
+    JTextArea axiomList,rulesList;;
+    JButton submitButton, close;
 
-    public Tab(int nbTabs,int nbRules,JTabbedPane tabs) {
+    public Tab(int nbTabs,int nbRules,JTabbedPane tabs,MainFrame frame) {
         this.nbRules = nbRules;
         this.nbTabs = nbTabs;
 
@@ -72,6 +69,11 @@ public class Tab extends JPanel{
         tab.add(southComponents);
         tab.setLayout(new BoxLayout(tab,1));
 
+        close = new JButton("Close");
+        close.addActionListener(new Listener(frame,nbTabs,"Close",this));
+        tab.add(close);
+
+
         tabs.addTab("Génération"+String.valueOf(nbTabs), tab);
     }
     public JTextArea textArea(String texte, int nb){