From f6000c35aaa9b89c97f4ab3d6068bba69b64c500 Mon Sep 17 00:00:00 2001 From: nitin-tayal Date: Wed, 13 Dec 2023 10:57:38 +0530 Subject: [PATCH 1/5] assignment-2 --- Assignment-2/Problem-1.java | 27 +++++++++++ Assignment-2/Problem-2.java | 97 +++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 Assignment-2/Problem-1.java create mode 100644 Assignment-2/Problem-2.java diff --git a/Assignment-2/Problem-1.java b/Assignment-2/Problem-1.java new file mode 100644 index 0000000..c837fad --- /dev/null +++ b/Assignment-2/Problem-1.java @@ -0,0 +1,27 @@ +public class Calculate { + int firstOperand; + double secondOperand; + String convertedUppercaseText; + + public void printCalculatedSum(int firstOperand, int secondOperand) { + int additionResult = firstOperand + secondOperand; + System.out.println("Result: " + additionResult); + } + + public void printUpperCaseString(String inputText) { + convertedUppercaseText = inputText.toUpperCase(); + System.out.println("Updated String: " + convertedUppercaseText); + } +} + +public class Computation { + public static void main(String[] args) { + Computation calculate = new Calculator(); + calculate.firstOperand = 10; + calculate.secondOperand = 20.5; + calculate.convertedUppercaseText = "hello"; + + calculate.printCalculatedSum(calculate.firstOperand, 5); + calculate.printUpperCaseString("world"); + } +} \ No newline at end of file diff --git a/Assignment-2/Problem-2.java b/Assignment-2/Problem-2.java new file mode 100644 index 0000000..13a2c06 --- /dev/null +++ b/Assignment-2/Problem-2.java @@ -0,0 +1,97 @@ +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + +class Product { + private String name; + private double price; + private int quantity; + + public setProductDetails(String name, double price, int quantity) { + this.name = name; + this.price = price; + this.quantity = quantity; + } + + public String getName() { + return name; + } + + public double getPrice() { + return price; + } + + public int getQuantity() { + return quantity; + } + + public void setQuantity(int newQuantity) { + this.quantity = newQuantity; + } +} + +class InventoryManager { + private List inventory; + + public InventoryManager() { + this.inventory = new ArrayList<>(); + } + + public void addProduct(Product product) { + inventory.add(product); + } + + public List getInventory() { + return inventory; + } +} + +public class Main { + public static void main(String[] args) { + InventoryManager inventoryManager = new InventoryManager(); + Scanner scanner = new Scanner(System.in); + + while (true) { + System.out.println("\nInventory Management System"); + System.out.println("1. Add Product"); + System.out.println("2. Display Inventory"); + System.out.println("3. Exit"); + System.out.print("Enter your choice: "); + + int userChoice = scanner.nextInt(); + + switch (userChoice) { + case 1: + System.out.print("Enter product name: "); + String productName = scanner.next(); + System.out.print("Enter product price: "); + double productPrice = scanner.nextDouble(); + System.out.print("Enter product quantity: "); + int productQuantity = scanner.nextInt(); + + Product newProduct = new Product(productName, productPrice, productQuantity); + inventoryManager.addProduct(newProduct); + + System.out.println("Product added successfully!"); + break; + + case 2: + System.out.println("\nCurrent Inventory:"); + List products = inventoryManager.getInventory(); + for (Product product : products) { + System.out.println("Name: " + product.getName() + + ", Price: $" + product.getPrice() + + ", Quantity: " + product.getQuantity()); + } + break; + + case 3: + System.out.println("Exiting program. Goodbye!"); + System.exit(0); + + default: + System.out.println("Invalid choice. Please enter a valid option."); + } + } + } +} \ No newline at end of file From 76dcc126143b7521480619fb8e12e71970e4ab1a Mon Sep 17 00:00:00 2001 From: nitin-tayal Date: Wed, 13 Dec 2023 10:59:37 +0530 Subject: [PATCH 2/5] assignment-2 --- Assignment-2/Problem-1.java | 2 +- Assignment-2/Problem-2.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assignment-2/Problem-1.java b/Assignment-2/Problem-1.java index c837fad..363dfa9 100644 --- a/Assignment-2/Problem-1.java +++ b/Assignment-2/Problem-1.java @@ -24,4 +24,4 @@ public static void main(String[] args) { calculate.printCalculatedSum(calculate.firstOperand, 5); calculate.printUpperCaseString("world"); } -} \ No newline at end of file +} diff --git a/Assignment-2/Problem-2.java b/Assignment-2/Problem-2.java index 13a2c06..fd9375a 100644 --- a/Assignment-2/Problem-2.java +++ b/Assignment-2/Problem-2.java @@ -94,4 +94,4 @@ public static void main(String[] args) { } } } -} \ No newline at end of file +} From 5da2172082a0fb3008c2636151aed3d647c9d96c Mon Sep 17 00:00:00 2001 From: nitin-tayal Date: Wed, 13 Dec 2023 17:48:21 +0530 Subject: [PATCH 3/5] assignment-2 --- Assignment-2/Problem-1.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assignment-2/Problem-1.java b/Assignment-2/Problem-1.java index 363dfa9..f95e4d8 100644 --- a/Assignment-2/Problem-1.java +++ b/Assignment-2/Problem-1.java @@ -16,7 +16,7 @@ public void printUpperCaseString(String inputText) { public class Computation { public static void main(String[] args) { - Computation calculate = new Calculator(); + Calculate calculate = new Calculator(); calculate.firstOperand = 10; calculate.secondOperand = 20.5; calculate.convertedUppercaseText = "hello"; From 0e7d3247d094ce26106ddbb3e7c6a1f0923b62f9 Mon Sep 17 00:00:00 2001 From: nitin-tayal Date: Tue, 26 Dec 2023 17:40:18 +0530 Subject: [PATCH 4/5] Assignment-3 --- Assignment-3/OCP/Device.java | 3 +++ Assignment-3/OCP/DeviceFactory.java | 3 +++ Assignment-3/OCP/Laptop.java | 6 ++++++ Assignment-3/OCP/LaptopFactory.java | 6 ++++++ Assignment-3/OCP/Main.java | 12 ++++++++++++ Assignment-3/OCP/Smartphone.java | 6 ++++++ Assignment-3/OCP/SmartphoneFactory.java | 6 ++++++ Assignment-3/SRP/problem-1/AreaCalculator.java | 5 +++++ Assignment-3/SRP/problem-1/Main.java | 12 ++++++++++++ Assignment-3/SRP/problem-1/Rectangle.java | 17 +++++++++++++++++ .../SRP/problem-2/AreaFileCalculator.java | 12 ++++++++++++ Assignment-3/SRP/problem-2/Main.java | 11 +++++++++++ Assignment-3/SRP/problem-2/Rectangle.java | 13 +++++++++++++ personal github token.txt | 1 + 14 files changed, 113 insertions(+) create mode 100644 Assignment-3/OCP/Device.java create mode 100644 Assignment-3/OCP/DeviceFactory.java create mode 100644 Assignment-3/OCP/Laptop.java create mode 100644 Assignment-3/OCP/LaptopFactory.java create mode 100644 Assignment-3/OCP/Main.java create mode 100644 Assignment-3/OCP/Smartphone.java create mode 100644 Assignment-3/OCP/SmartphoneFactory.java create mode 100644 Assignment-3/SRP/problem-1/AreaCalculator.java create mode 100644 Assignment-3/SRP/problem-1/Main.java create mode 100644 Assignment-3/SRP/problem-1/Rectangle.java create mode 100644 Assignment-3/SRP/problem-2/AreaFileCalculator.java create mode 100644 Assignment-3/SRP/problem-2/Main.java create mode 100644 Assignment-3/SRP/problem-2/Rectangle.java create mode 100644 personal github token.txt diff --git a/Assignment-3/OCP/Device.java b/Assignment-3/OCP/Device.java new file mode 100644 index 0000000..7efd0c3 --- /dev/null +++ b/Assignment-3/OCP/Device.java @@ -0,0 +1,3 @@ +interface Device { + void displayDetails(); +} diff --git a/Assignment-3/OCP/DeviceFactory.java b/Assignment-3/OCP/DeviceFactory.java new file mode 100644 index 0000000..ccc7289 --- /dev/null +++ b/Assignment-3/OCP/DeviceFactory.java @@ -0,0 +1,3 @@ +interface DeviceFactory { + Device createDevice(); +} diff --git a/Assignment-3/OCP/Laptop.java b/Assignment-3/OCP/Laptop.java new file mode 100644 index 0000000..3232c05 --- /dev/null +++ b/Assignment-3/OCP/Laptop.java @@ -0,0 +1,6 @@ +class Laptop implements Device { + @Override + public void displayDetails() { + System.out.println("Laptop: Model Y, RAM: 16GB, Storage: 512GB"); + } +} diff --git a/Assignment-3/OCP/LaptopFactory.java b/Assignment-3/OCP/LaptopFactory.java new file mode 100644 index 0000000..03c16ce --- /dev/null +++ b/Assignment-3/OCP/LaptopFactory.java @@ -0,0 +1,6 @@ +class LaptopFactory implements DeviceFactory { + @Override + public Device createDevice() { + return new Laptop(); + } +} diff --git a/Assignment-3/OCP/Main.java b/Assignment-3/OCP/Main.java new file mode 100644 index 0000000..53cc17c --- /dev/null +++ b/Assignment-3/OCP/Main.java @@ -0,0 +1,12 @@ +public class Main { + public static void main(String[] args) { + DeviceFactory smartphoneFactory = new SmartphoneFactory(); + DeviceFactory laptopFactory = new LaptopFactory(); + + Device smartphone = smartphoneFactory.createDevice(); + Device laptop = laptopFactory.createDevice(); + + smartphone.displayDetails(); + laptop.displayDetails(); + } +} diff --git a/Assignment-3/OCP/Smartphone.java b/Assignment-3/OCP/Smartphone.java new file mode 100644 index 0000000..7d6651a --- /dev/null +++ b/Assignment-3/OCP/Smartphone.java @@ -0,0 +1,6 @@ +class Smartphone implements Device { + @Override + public void displayDetails() { + System.out.println("Smartphone: Model X, RAM: 8GB, Storage: 128GB"); + } +} diff --git a/Assignment-3/OCP/SmartphoneFactory.java b/Assignment-3/OCP/SmartphoneFactory.java new file mode 100644 index 0000000..533e575 --- /dev/null +++ b/Assignment-3/OCP/SmartphoneFactory.java @@ -0,0 +1,6 @@ +class SmartphoneFactory implements DeviceFactory { + @Override + public Device createDevice() { + return new Smartphone(); + } +} diff --git a/Assignment-3/SRP/problem-1/AreaCalculator.java b/Assignment-3/SRP/problem-1/AreaCalculator.java new file mode 100644 index 0000000..2080307 --- /dev/null +++ b/Assignment-3/SRP/problem-1/AreaCalculator.java @@ -0,0 +1,5 @@ +public class AreaCalculator { + public double calculateArea(Rectangle rectangle) { + return rectangle.getLength() * rectangle.getWidth(); + } +} diff --git a/Assignment-3/SRP/problem-1/Main.java b/Assignment-3/SRP/problem-1/Main.java new file mode 100644 index 0000000..2672d63 --- /dev/null +++ b/Assignment-3/SRP/problem-1/Main.java @@ -0,0 +1,12 @@ +public class Main { + public static void main(String[] args) { + Rectangle rectangle = new Rectangle(5.0, 3.0); + AreaCalculator calculator = new AreaCalculator(); + double area = calculator.calculateArea(rectangle); + printArea(area); + } + + public static void printArea(double area) { + System.out.println("Area: " + area); + } +} diff --git a/Assignment-3/SRP/problem-1/Rectangle.java b/Assignment-3/SRP/problem-1/Rectangle.java new file mode 100644 index 0000000..b574d89 --- /dev/null +++ b/Assignment-3/SRP/problem-1/Rectangle.java @@ -0,0 +1,17 @@ +public class Rectangle { + private double length; + private double width; + + public Rectangle(double length, double width) { + this.length = length; + this.width = width; + } + + public double getLength() { + return length; + } + + public double getWidth() { + return width; + } +} diff --git a/Assignment-3/SRP/problem-2/AreaFileCalculator.java b/Assignment-3/SRP/problem-2/AreaFileCalculator.java new file mode 100644 index 0000000..d29f171 --- /dev/null +++ b/Assignment-3/SRP/problem-2/AreaFileCalculator.java @@ -0,0 +1,12 @@ +import java.io.FileWriter; +import java.io.IOException; + +public class AreaFileWriter { + public void writeAreaToFile(double area) { + try (FileWriter writer = new FileWriter("area.txt")) { + writer.write("Area: " + area); + } catch (IOException e) { + System.err.println("Error writing to file: " + e.getMessage()); + } + } +} diff --git a/Assignment-3/SRP/problem-2/Main.java b/Assignment-3/SRP/problem-2/Main.java new file mode 100644 index 0000000..70076ee --- /dev/null +++ b/Assignment-3/SRP/problem-2/Main.java @@ -0,0 +1,11 @@ +public class Main { + public static void main(String[] args) { + Rectangle rectangle = new Rectangle(5.0, 3.0); + double area = rectangle.calculateArea(); + + AreaFileWriter fileWriter = new AreaFileWriter(); + fileWriter.writeAreaToFile(area); + + System.out.println("Calculated Area: " + area); + } +} diff --git a/Assignment-3/SRP/problem-2/Rectangle.java b/Assignment-3/SRP/problem-2/Rectangle.java new file mode 100644 index 0000000..452006e --- /dev/null +++ b/Assignment-3/SRP/problem-2/Rectangle.java @@ -0,0 +1,13 @@ +public class Rectangle { + private double length; + private double width; + + public Rectangle(double length, double width) { + this.length = length; + this.width = width; + } + + public double calculateArea() { + return length * width; + } +} diff --git a/personal github token.txt b/personal github token.txt new file mode 100644 index 0000000..d886300 --- /dev/null +++ b/personal github token.txt @@ -0,0 +1 @@ +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 From 72629ab7989efb89936a3a23d5de7d3a0ecfc369 Mon Sep 17 00:00:00 2001 From: nitin-tayal Date: Tue, 26 Dec 2023 17:50:45 +0530 Subject: [PATCH 5/5] Assignment-3 --- personal github token.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 personal github token.txt diff --git a/personal github token.txt b/personal github token.txt deleted file mode 100644 index d886300..0000000 --- a/personal github token.txt +++ /dev/null @@ -1 +0,0 @@ -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