From 909243510cab563c05c9ea64b7ac0ad4b243fa96 Mon Sep 17 00:00:00 2001
From: Anyx <anyxp@protonmail.com>
Date: Fri, 3 Nov 2023 22:04:30 +0200
Subject: [PATCH] Update

---
 Bookcase.java         |  7 +++----
 Chair.java            |  5 ++---
 Furniture.java        |  4 ++--
 FurnitureCompany.java |  5 ++++-
 FurnitureFrame.java   | 17 ++++++++++-------
 Main.java             |  6 +++++-
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Bookcase.java b/Bookcase.java
index ff4550c..793b895 100644
--- a/Bookcase.java
+++ b/Bookcase.java
@@ -24,10 +24,10 @@ public class Bookcase extends Furniture{
 	public String chooseCategory() {
 		String aCategory="";
 		 if(this.getCategory()==1) {
-			 return aCategory ="Plastic";
+			 aCategory ="Plastic";
 		 }
 		 else if(this.getCategory()==2) {
-			 return aCategory = "Metallic";
+			 aCategory = "Metallic";
 		 }else if(this.getCategory()==3) {
 			 aCategory = "Wooden";
 		 }
@@ -39,8 +39,7 @@ public class Bookcase extends Furniture{
 	}
 	
 	public String getInfo() {
-		super.getInfo();
-		return "Shelves: "+this.getShelves();
+		return super.getInfo() + "Shelves: "+this.getShelves();
 	}
 
 	
diff --git a/Chair.java b/Chair.java
index e9d6d99..ffb68e4 100644
--- a/Chair.java
+++ b/Chair.java
@@ -28,7 +28,7 @@ public class Chair extends Furniture{
 			 return aCategory ="Office chair";
 		 }
 		 else if(this.getCategory()==2) {
-			 return aCategory = "Cooperation Chair";
+			 return aCategory = "Cooperation chair";
 		 }else if(this.getCategory()==3) {
 			 aCategory = "Armchair";
 		 }
@@ -36,7 +36,6 @@ public class Chair extends Furniture{
 	}
 	
 	public String getInfo() {
-		super.getInfo();
-		return "Shelves: "+this.getColor();
+		return super.getInfo() + "Fabric color: "+this.getColor();
 	}
 }
diff --git a/Furniture.java b/Furniture.java
index 82998a5..3e31d1d 100644
--- a/Furniture.java
+++ b/Furniture.java
@@ -38,8 +38,8 @@ public abstract class Furniture implements Comparable{
 		return model;
 	}
 	public String getInfo() {
-		return "-"+this.getClass()+"info:\n"+
-				this.getModel()+","+this.calculatePrice()+"Euro: \n"+
+		return "- "+this.getClass().getName()+" info:\n"+
+				this.getModel()+", "+this.calculatePrice()+" Euro: \n"+
 				"Category: "+this.chooseCategory()+"\n"+
 				"Weight: "+this.getWeight()+"\n";
 				
diff --git a/FurnitureCompany.java b/FurnitureCompany.java
index 7689955..2c31332 100644
--- a/FurnitureCompany.java
+++ b/FurnitureCompany.java
@@ -16,6 +16,9 @@ public class FurnitureCompany{
 	public ArrayList<Furniture> getAllFurnitures() {
 		return this.allFurniture;
 	}
-
+	
+	public void addFurniture(Furniture furniture) {
+		allFurniture.add(furniture);
+	}
 	
 }
diff --git a/FurnitureFrame.java b/FurnitureFrame.java
index 499b97f..625f213 100644
--- a/FurnitureFrame.java
+++ b/FurnitureFrame.java
@@ -42,14 +42,17 @@ public class FurnitureFrame extends JFrame{
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				String modelName =t1.getText();
+				boolean found = false;
 				for(Furniture furniture: allFurniture) {
 					if(furniture.getModel().equals(modelName)) {
-					     furniture.getInfo(); 
+					     found = true;
+					     System.out.println(furniture.getInfo());
+					     break;
 					}
-					else {
-						System.out.println("There is no furniture of model "+modelName);
-					}
-				}	
+				}
+				if(!found) {
+					System.out.println("There is no furniture of model "+modelName);
+				}
 			}
 		});
 		
@@ -64,11 +67,11 @@ public class FurnitureFrame extends JFrame{
 					FileWriter write = new FileWriter(f);
 					for(Furniture furniture:furnitures) {
 						if(furniture.chooseCategory().equals(textCategory)) {
-						
 							write.write(furniture.getInfo());
-							write.write(System.lineSeparator());
+							for(int i=0; i<2; i++) write.write(System.lineSeparator());
 						}
 					}
+					write.close();
 				} catch (IOException e1) {
 					// TODO Auto-generated catch block
 					e1.printStackTrace();
diff --git a/Main.java b/Main.java
index 7d3b60f..56e0df6 100644
--- a/Main.java
+++ b/Main.java
@@ -7,8 +7,12 @@ public class Main {
 		Furniture b1 = new Bookcase("Ikea",70,3,8);
 		Furniture c1 = new Chair("HermanMiller",40,2,"Grey");
 		FurnitureCompany bestFurniture = new FurnitureCompany(b1,c1);
-
+		
+		bestFurniture.addFurniture(b1);
+		bestFurniture.addFurniture(c1);
+		
 		new FurnitureFrame(bestFurniture.getAllFurnitures());
+		
 	}
 
 }