tanya7575 · Jul 27, 2022 · Jul 27, 2022 · Nov 27, 2022 · Nov 28, 2022 · Nov 29, 2022
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/build.gradle b/build.gradle
@@ -7,4 +7,5 @@ repositories {
 }
 
 dependencies {
+implementation 'org.jetbrains:annotations:15.0'
 }
diff --git a/settings.gradle b/settings.gradle
@@ -12,4 +12,4 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
-rootProject.name = "BillCalculator"
+rootProject.name = "Java-Module-Project"
diff --git a/src/main/java/Calculate.java b/src/main/java/Calculate.java
@@ -0,0 +1,22 @@
+public class Calculate {
+
+     private int people;
+
+      static String listProduct = "Добавленные товары: ";
+      static double sum = 0;
+
+    Calculate(int people){
+        this.people = people;
+    }
+    void addProduct(Product product) {
+        System.out.println(product.name + product.price + " Товар успешно добавлен ");
+        sum = sum + product.price;
+        listProduct = listProduct + "\n" + product.name + product.price;
+
+        System.out.println(listProduct);
+        System.out.println("Общая сумма всех добавленных товаров: " + sum);
+    }
+        public static double getSum() {
+            return sum;
+        }
+}
diff --git a/src/main/java/Calculator.java b/src/main/java/Calculator.java
diff --git a/src/main/java/Format.java b/src/main/java/Format.java
@@ -0,0 +1,21 @@
+public class Format {
+    String padeg(double price) {
+        double padeg = Math.floor(price);
+        if (padeg == 1) {
+            return "рубль";
+        } else if (padeg == 11 || padeg == 12 || padeg == 13 || padeg == 14) {
+            return "рублей";
+        } else if (padeg % 10 == 1) {
+            return "рубль";
+        } else if (padeg % 10 >= 2 && padeg % 10 <= 4) {
+            return "рубля";
+        } else {
+            return "рублей";
+        }
+    }
+        String round( final double result){
+            return String.format("%.2f", result);
+        }
+    }
+
+
diff --git a/src/main/java/Formatter.java b/src/main/java/Formatter.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,5 @@ repositories { @@
     }
     dependencies {
+    implementation 'org.jetbrains:annotations:15.0'
     }