From 4d75b2732cdb3d5a0f8b99f9d9c948f583738d3f Mon Sep 17 00:00:00 2001
From: Aelita4 <kontakt@mikorosa.pl>
Date: Mon, 14 Nov 2022 21:41:09 +0100
Subject: [PATCH] Lab 4 full

---
 .idea/misc.xml                          |   2 +-
 .idea/uiDesigner.xml                    | 124 ++++++++++++++++++++++++
 .idea/workspace.xml                     |  45 +++++----
 src/geometry/GeoCalculator.java         |  28 ------
 src/{ => wsiiz}/Building.java           |   4 +-
 src/{ => wsiiz}/Genre.java              |   4 +-
 src/{ => wsiiz}/GetStudentData.java     |   2 +
 src/{ => wsiiz}/Main.java               |  46 ++++++---
 src/{ => wsiiz}/Person.java             |   2 +
 src/{ => wsiiz}/PersonData.java         |   2 +
 src/{ => wsiiz}/Rectangle1.java         |   2 +
 src/{ => wsiiz}/Student.java            |   2 +
 src/{ => wsiiz}/geometry/Circle.java    |   2 +-
 src/{ => wsiiz}/geometry/Cone.java      |   2 +-
 src/{ => wsiiz}/geometry/Cube.java      |   2 +-
 src/{ => wsiiz}/geometry/Cuboid.java    |   2 +-
 src/wsiiz/geometry/GeoCalculator.java   |  92 ++++++++++++++++++
 src/{ => wsiiz}/geometry/Rectangle.java |   2 +-
 src/{ => wsiiz}/geometry/Sphere.java    |   2 +-
 src/{ => wsiiz}/geometry/Square.java    |   2 +-
 src/wsiiz/students/StudentArray.java    |  99 +++++++++++++++++++
 21 files changed, 401 insertions(+), 67 deletions(-)
 create mode 100644 .idea/uiDesigner.xml
 delete mode 100644 src/geometry/GeoCalculator.java
 rename src/{ => wsiiz}/Building.java (87%)
 rename src/{ => wsiiz}/Genre.java (94%)
 rename src/{ => wsiiz}/GetStudentData.java (98%)
 rename src/{ => wsiiz}/Main.java (65%)
 rename src/{ => wsiiz}/Person.java (97%)
 rename src/{ => wsiiz}/PersonData.java (95%)
 rename src/{ => wsiiz}/Rectangle1.java (97%)
 rename src/{ => wsiiz}/Student.java (98%)
 rename src/{ => wsiiz}/geometry/Circle.java (93%)
 rename src/{ => wsiiz}/geometry/Cone.java (95%)
 rename src/{ => wsiiz}/geometry/Cube.java (93%)
 rename src/{ => wsiiz}/geometry/Cuboid.java (94%)
 create mode 100644 src/wsiiz/geometry/GeoCalculator.java
 rename src/{ => wsiiz}/geometry/Rectangle.java (94%)
 rename src/{ => wsiiz}/geometry/Sphere.java (94%)
 rename src/{ => wsiiz}/geometry/Square.java (93%)
 create mode 100644 src/wsiiz/students/StudentArray.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 07115cd..05b1176 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bbbc306..a9b4807 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,23 +2,26 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="563d5a49-589a-44ca-b92d-59680eab1914" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Building.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Genre.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/GetStudentData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Person.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/PersonData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Rectangle1.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Student.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/geometry/Circle.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/geometry/Cone.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/geometry/Cube.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/geometry/Cuboid.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/geometry/GeoCalculator.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/geometry/Rectangle.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/geometry/Sphere.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/geometry/Square.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/wsiiz/geometry/GeoCalculator.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/wsiiz/students/StudentArray.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Building.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/Building.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Genre.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/Genre.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GetStudentData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/GetStudentData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Person.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/Person.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/PersonData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/PersonData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Rectangle1.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/Rectangle1.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Student.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/Student.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/geometry/Circle.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/geometry/Circle.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/geometry/Cone.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/geometry/Cone.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/geometry/Cube.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/geometry/Cube.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/geometry/Cuboid.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/geometry/Cuboid.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/geometry/GeoCalculator.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/geometry/Rectangle.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/geometry/Rectangle.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/geometry/Sphere.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/geometry/Sphere.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/geometry/Square.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/wsiiz/geometry/Square.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -49,12 +52,14 @@
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true"
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "last_opened_file_path": "/mnt/SSD/lab4"
   }
 }]]></component>
   <component name="RunManager">
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Main" />
+      <option name="MAIN_CLASS_NAME" value="wsiiz.Main" />
       <module name="Lab4" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -74,9 +79,13 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1667890605459</updated>
+      <workItem from="1668454790509" duration="3115000" />
     </task>
     <servers />
   </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
diff --git a/src/geometry/GeoCalculator.java b/src/geometry/GeoCalculator.java
deleted file mode 100644
index 3d8b10e..0000000
--- a/src/geometry/GeoCalculator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package geometry;
-
-import java.util.Scanner;
-
-public class GeoCalculator {
-    public static void start() {
-        int choice;
-        Scanner scanner = new Scanner(System.in);
-
-        System.out.println("1. Circle");
-        System.out.println("2. Cone");
-        System.out.println("3. Cube");
-        System.out.println("4. Cuboid");
-        System.out.println("5. Rectangle");
-        System.out.println("6. Sphere");
-        System.out.println("7. Square");
-
-        while(true) {
-            choice = scanner.nextInt();
-            if(choice >= 1 && choice <= 7) break;
-        }
-
-        switch(choice) {
-            case 1:
-
-        }
-    }
-}
diff --git a/src/Building.java b/src/wsiiz/Building.java
similarity index 87%
rename from src/Building.java
rename to src/wsiiz/Building.java
index c8ee8d4..a19f6d3 100644
--- a/src/Building.java
+++ b/src/wsiiz/Building.java
@@ -1,3 +1,5 @@
+package wsiiz;
+
 import java.time.LocalDate;
 import java.time.Period;
 
@@ -13,7 +15,7 @@ public class Building {
     }
 
     public void displayBuildingData() {
-        System.out.println("Building " + name);
+        System.out.println("wsiz.Building " + name);
         System.out.println("with " + floors + " floors");
         System.out.println("Built " + Math.abs(Period.between(LocalDate.now(), date).getYears()) + " years ago");
     }
diff --git a/src/Genre.java b/src/wsiiz/Genre.java
similarity index 94%
rename from src/Genre.java
rename to src/wsiiz/Genre.java
index ea192a5..8d68585 100644
--- a/src/Genre.java
+++ b/src/wsiiz/Genre.java
@@ -1,3 +1,5 @@
+package wsiiz;
+
 public class Genre {
     String typeName;
     String genreName;
@@ -23,7 +25,7 @@ public class Genre {
 
     public String getAll() {
         return "Type name: " + typeName +
-                "\nGenre name: " + genreName +
+                "\nwsiz.Genre name: " + genreName +
                 "\nChromosomes number: " + chromosomes +
                 "\nBase X chromosomes number: " + baseXchromosomes +
                 "\nDescription: " + desc;
diff --git a/src/GetStudentData.java b/src/wsiiz/GetStudentData.java
similarity index 98%
rename from src/GetStudentData.java
rename to src/wsiiz/GetStudentData.java
index f9ffab0..b81f92a 100644
--- a/src/GetStudentData.java
+++ b/src/wsiiz/GetStudentData.java
@@ -1,3 +1,5 @@
+package wsiiz;
+
 import java.util.Scanner;
 
 public class GetStudentData {
diff --git a/src/Main.java b/src/wsiiz/Main.java
similarity index 65%
rename from src/Main.java
rename to src/wsiiz/Main.java
index 8bd5328..b58d480 100644
--- a/src/Main.java
+++ b/src/wsiiz/Main.java
@@ -1,11 +1,15 @@
-import geometry.*;
+package wsiiz;
 
+import wsiiz.geometry.*;
+import wsiiz.students.StudentArray;
+
+import java.io.IOException;
 import java.time.LocalDate;
 
 public class Main {
     public static void main(String[] args) {
         System.out.println("=== Zadanie L.1 (prostokąt) ===");
-        Rectangle1 rect1 = new Rectangle1(3, 4);
+        wsiiz.Rectangle1 rect1 = new wsiiz.Rectangle1(3, 4);
         System.out.println("Rectangle W:" + rect1.width + " H:" + rect1.height);
         System.out.println("Area: " + rect1.getArea());
         System.out.println("Circumference: " + rect1.getCircumference());
@@ -13,17 +17,17 @@ public class Main {
 
 
         System.out.println("=== Zadanie L.2 (budynek) ===");
-        Building b1 = new Building(LocalDate.of(1991, 4, 1), "wsiz", 3);
+        wsiiz.Building b1 = new wsiiz.Building(LocalDate.of(1991, 4, 1), "wsiiz", 3);
         b1.displayBuildingData();
 
 
         System.out.println("=== Zadanie L.3 (gatunki) ===");
-        Genre cat = new Genre("cat", "felis domestic", 20, 10, "Garfield");
+        wsiiz.Genre cat = new wsiiz.Genre("cat", "felis domestic", 20, 10, "Garfield");
         System.out.println(cat.getAll());
         System.out.println(cat.getFullName());
         System.out.println(cat.getChromosomes());
 
-        Genre notDog = cat.clone();
+        wsiiz.Genre notDog = cat.clone();
         System.out.println(notDog.getAll());
         System.out.println(notDog.getFullName());
         System.out.println(notDog.getChromosomes());
@@ -36,14 +40,14 @@ public class Main {
 
 
         System.out.println("=== Zadanie K.1 (osoba) ===");
-        PersonData.getPersonData();
+        wsiiz.PersonData.getPersonData();
 
 
         System.out.println("=== Zadanie K.2 (student) ===");
-        Student s1 = new Student("Zdzichu", "Zdzichowski", 19, 12345, "IT", 2021);
-        Student s2 = new Student("Eustachy", 21, 54321, "Cosmetics", 2019);
-        Student s3 = new Student(11223, "Management", 2018);
-        Student s4 = new Student("Andrzej", "Kula", 22, 32213, "Networking");
+        wsiiz.Student s1 = new wsiiz.Student("Zdzichu", "Zdzichowski", 19, 12345, "IT", 2021);
+        wsiiz.Student s2 = new wsiiz.Student("Eustachy", 21, 54321, "Cosmetics", 2019);
+        wsiiz.Student s3 = new wsiiz.Student(11223, "Management", 2018);
+        wsiiz.Student s4 = new wsiiz.Student("Andrzej", "Kula", 22, 32213, "Networking");
 
         s1.getStudentData();
         s2.getStudentData();
@@ -52,7 +56,7 @@ public class Main {
 
 
         System.out.println("=== Zadanie K.3 (wprowadź studenta) ===");
-        GetStudentData.getStudentData();
+        wsiiz.GetStudentData.getStudentData();
 
 
         System.out.println("=== Zadanie K.4 (figury) ===");
@@ -92,5 +96,25 @@ public class Main {
         System.out.println(square.getCircumference());
 
 
+        System.out.println("=== Zadanie K.4* (kalkulator geometryczny) ===");
+        GeoCalculator.start();
+
+
+        System.out.println("=== Zadanie K.5 (studenty w tablicy) ===");
+        StudentArray sa = new StudentArray();
+        sa.createStudent();
+        sa.createStudent();
+        sa.createStudent();
+        sa.editStudent();
+        sa.deleteStudent();
+        sa.getStudent();
+        System.out.println("Press Enter to get all students...");
+        try {
+            System.in.read();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        sa.getAllStudents();
+        sa.getStudentsBetween();
     }
 }
\ No newline at end of file
diff --git a/src/Person.java b/src/wsiiz/Person.java
similarity index 97%
rename from src/Person.java
rename to src/wsiiz/Person.java
index d66eed3..363e289 100644
--- a/src/Person.java
+++ b/src/wsiiz/Person.java
@@ -1,3 +1,5 @@
+package wsiiz;
+
 public class Person {
     String name, surname;
     int age;
diff --git a/src/PersonData.java b/src/wsiiz/PersonData.java
similarity index 95%
rename from src/PersonData.java
rename to src/wsiiz/PersonData.java
index 21d15f0..85b84b8 100644
--- a/src/PersonData.java
+++ b/src/wsiiz/PersonData.java
@@ -1,3 +1,5 @@
+package wsiiz;
+
 public class PersonData {
     public static void getPersonData() {
         Person p1 = new Person("Zdzichu", "Zdzichowski", 19);
diff --git a/src/Rectangle1.java b/src/wsiiz/Rectangle1.java
similarity index 97%
rename from src/Rectangle1.java
rename to src/wsiiz/Rectangle1.java
index a74c9dd..3312fbf 100644
--- a/src/Rectangle1.java
+++ b/src/wsiiz/Rectangle1.java
@@ -1,3 +1,5 @@
+package wsiiz;
+
 public class Rectangle1 {
     int width, height;
 
diff --git a/src/Student.java b/src/wsiiz/Student.java
similarity index 98%
rename from src/Student.java
rename to src/wsiiz/Student.java
index 594b3f2..bf8d6b6 100644
--- a/src/Student.java
+++ b/src/wsiiz/Student.java
@@ -1,3 +1,5 @@
+package wsiiz;
+
 public class Student extends Person {
     int indexNumber;
     String specialty;
diff --git a/src/geometry/Circle.java b/src/wsiiz/geometry/Circle.java
similarity index 93%
rename from src/geometry/Circle.java
rename to src/wsiiz/geometry/Circle.java
index ce144e9..09cc424 100644
--- a/src/geometry/Circle.java
+++ b/src/wsiiz/geometry/Circle.java
@@ -1,4 +1,4 @@
-package geometry;
+package wsiiz.geometry;
 
 public class Circle {
     int radius;
diff --git a/src/geometry/Cone.java b/src/wsiiz/geometry/Cone.java
similarity index 95%
rename from src/geometry/Cone.java
rename to src/wsiiz/geometry/Cone.java
index 07452c6..b3e6bcf 100644
--- a/src/geometry/Cone.java
+++ b/src/wsiiz/geometry/Cone.java
@@ -1,4 +1,4 @@
-package geometry;
+package wsiiz.geometry;
 
 public class Cone {
     double height, radius, slant;
diff --git a/src/geometry/Cube.java b/src/wsiiz/geometry/Cube.java
similarity index 93%
rename from src/geometry/Cube.java
rename to src/wsiiz/geometry/Cube.java
index 9d5e8e1..454fafa 100644
--- a/src/geometry/Cube.java
+++ b/src/wsiiz/geometry/Cube.java
@@ -1,4 +1,4 @@
-package geometry;
+package wsiiz.geometry;
 
 public class Cube {
     int edge;
diff --git a/src/geometry/Cuboid.java b/src/wsiiz/geometry/Cuboid.java
similarity index 94%
rename from src/geometry/Cuboid.java
rename to src/wsiiz/geometry/Cuboid.java
index a994bb8..886049f 100644
--- a/src/geometry/Cuboid.java
+++ b/src/wsiiz/geometry/Cuboid.java
@@ -1,4 +1,4 @@
-package geometry;
+package wsiiz.geometry;
 
 public class Cuboid {
     int a, b, c;
diff --git a/src/wsiiz/geometry/GeoCalculator.java b/src/wsiiz/geometry/GeoCalculator.java
new file mode 100644
index 0000000..3f47500
--- /dev/null
+++ b/src/wsiiz/geometry/GeoCalculator.java
@@ -0,0 +1,92 @@
+package wsiiz.geometry;
+
+import java.util.Scanner;
+
+public class GeoCalculator {
+    public static void start() {
+        int choice;
+        Scanner scanner = new Scanner(System.in);
+
+        System.out.println("1. Circle");
+        System.out.println("2. Cone");
+        System.out.println("3. Cube");
+        System.out.println("4. Cuboid");
+        System.out.println("5. Rectangle");
+        System.out.println("6. Sphere");
+        System.out.println("7. Square");
+
+        while(true) {
+            choice = scanner.nextInt();
+            if(choice >= 1 && choice <= 7) break;
+        }
+
+        switch(choice) {
+            case 1: // Circle
+                int circleRadius;
+                System.out.print("Input radius: ");
+                circleRadius = scanner.nextInt();
+                Circle circle = new Circle(circleRadius);
+                System.out.println("Area: " + circle.getArea());
+                System.out.println("Circumference: " + circle.getCircumference());
+                break;
+            case 2: // Cone
+                int coneHeight, coneRadius;
+                System.out.print("Input height: ");
+                coneHeight = scanner.nextInt();
+                System.out.print("Input radius: ");
+                coneRadius = scanner.nextInt();
+                Cone cone = new Cone(coneHeight, coneRadius);
+                System.out.println("Area: " + cone.getArea());
+                System.out.println("Volume: " + cone.getVolume());
+                break;
+            case 3: // Cube
+                int cubeEdge;
+                System.out.print("Input edge: ");
+                cubeEdge = scanner.nextInt();
+                Cube cube = new Cube(cubeEdge);
+                System.out.println("Area: " + cube.getArea());
+                System.out.println("Circumference: " + cube.getCircumference());
+                break;
+            case 4: // Cuboid
+                int cuboidEdgeA, cuboidEdgeB, cuboidEdgeC;
+                System.out.print("Input edge A: ");
+                cuboidEdgeA = scanner.nextInt();
+                System.out.print("Input edge B: ");
+                cuboidEdgeB = scanner.nextInt();
+                System.out.print("Input edge C: ");
+                cuboidEdgeC = scanner.nextInt();
+                Cuboid cuboid = new Cuboid(cuboidEdgeA, cuboidEdgeB, cuboidEdgeC);
+                System.out.println("Area: " + cuboid.getArea());
+                System.out.println("Volume: " + cuboid.getVolume());
+                break;
+            case 5: // Rectangle
+                int rectangleEdgeA, rectangleEdgeB;
+                System.out.print("Input edge A: ");
+                rectangleEdgeA = scanner.nextInt();
+                System.out.print("Input edge B: ");
+                rectangleEdgeB = scanner.nextInt();
+                Rectangle rectangle = new Rectangle(rectangleEdgeA, rectangleEdgeB);
+                System.out.println("Area: " + rectangle.getArea());
+                System.out.println("Circumference: " + rectangle.getCircumference());
+                break;
+            case 6: // Sphere
+                int sphereRadius;
+                System.out.print("Input radius: ");
+                sphereRadius = scanner.nextInt();
+                Sphere sphere = new Sphere(sphereRadius);
+                System.out.println("Area: " + sphere.getArea());
+                System.out.println("Volume: " + sphere.getVolume());
+                break;
+            case 7: // Square
+                int squareEdge;
+                System.out.print("Input edge: ");
+                squareEdge = scanner.nextInt();
+                Square square = new Square(squareEdge);
+                System.out.println("Area: " + square.getArea());
+                System.out.println("Circumference: " + square.getCircumference());
+                break;
+            default:
+                System.out.println("Unknown figure");
+        }
+    }
+}
diff --git a/src/geometry/Rectangle.java b/src/wsiiz/geometry/Rectangle.java
similarity index 94%
rename from src/geometry/Rectangle.java
rename to src/wsiiz/geometry/Rectangle.java
index 20b2325..d361eac 100644
--- a/src/geometry/Rectangle.java
+++ b/src/wsiiz/geometry/Rectangle.java
@@ -1,4 +1,4 @@
-package geometry;
+package wsiiz.geometry;
 
 public class Rectangle {
     int width, height;
diff --git a/src/geometry/Sphere.java b/src/wsiiz/geometry/Sphere.java
similarity index 94%
rename from src/geometry/Sphere.java
rename to src/wsiiz/geometry/Sphere.java
index e8a7172..52d3d30 100644
--- a/src/geometry/Sphere.java
+++ b/src/wsiiz/geometry/Sphere.java
@@ -1,4 +1,4 @@
-package geometry;
+package wsiiz.geometry;
 
 public class Sphere {
     int radius;
diff --git a/src/geometry/Square.java b/src/wsiiz/geometry/Square.java
similarity index 93%
rename from src/geometry/Square.java
rename to src/wsiiz/geometry/Square.java
index 240fd0d..194bac0 100644
--- a/src/geometry/Square.java
+++ b/src/wsiiz/geometry/Square.java
@@ -1,4 +1,4 @@
-package geometry;
+package wsiiz.geometry;
 
 public class Square {
     int edge;
diff --git a/src/wsiiz/students/StudentArray.java b/src/wsiiz/students/StudentArray.java
new file mode 100644
index 0000000..aa3878b
--- /dev/null
+++ b/src/wsiiz/students/StudentArray.java
@@ -0,0 +1,99 @@
+package wsiiz.students;
+
+import wsiiz.Student;
+
+import java.util.Scanner;
+
+public class StudentArray {
+    Student[] students = new Student[100];
+    boolean[] initialized = new boolean[100];
+    private Scanner scanner = new Scanner(System.in);
+
+    public StudentArray() {
+        for (int i = 0; i < 100; i++) {
+            students[i] = new Student("", "", 0, 0, "", 0);
+            initialized[i] = false;
+        }
+    }
+
+    public void createStudent() {
+        System.out.print("Adding new student\nInput index number (0-99): ");
+        int index = scanner.nextInt();
+        if(index < 0 || index > 99) throw new IllegalArgumentException("Value must be between 0-99");
+
+        if(!initialized[index]) {
+            initialized[index] = true;
+            modifyStudent(index);
+        }
+        else System.out.println("Student already exists at index " + index + ", can't create");
+    }
+
+    public void editStudent() {
+        System.out.print("Editing student\nInput index number (0-99): ");
+        int index = scanner.nextInt();
+        if(index < 0 || index > 99) throw new IllegalArgumentException("Value must be between 0-99");
+
+        if(initialized[index]) modifyStudent(index);
+        else System.out.println("Student doesn't exist at index " + index + ", can't modify");
+    }
+
+    private void modifyStudent(int index) {
+        String name, surname, specialty;
+        int age, indexNumber, collegeYear;
+
+        System.out.print("Input new name: ");
+        name = scanner.next();
+        System.out.print("Input new surname: ");
+        surname = scanner.next();
+        System.out.print("Input new age: ");
+        age = scanner.nextInt();
+        System.out.print("Input new index number: ");
+        indexNumber = scanner.nextInt();
+        System.out.print("Input new specialty: ");
+        specialty = scanner.next();
+        System.out.print("Input new college year: ");
+        collegeYear = scanner.nextInt();
+
+        students[index] = new Student(name, surname, age, indexNumber, specialty, collegeYear);
+    }
+
+    public void deleteStudent() {
+        System.out.print("Deleting student\nInput index number (0-99): ");
+        int index = scanner.nextInt();
+        if(index < 0 || index > 99) throw new IllegalArgumentException("Value must be between 0-99");
+
+        if(initialized[index]) {
+            students[index] = new Student("", "", 0, 0, "", 0);
+            initialized[index] = false;
+        } else System.out.println("Student doesn't exist");
+    }
+
+    public void getStudent() {
+        System.out.print("Getting student\nInput index number (0-99): ");
+        int index = scanner.nextInt();
+        if(index < 0 || index > 99) throw new IllegalArgumentException("Value must be between 0-99");
+
+        if(initialized[index]) obtainStudent(index);
+        else System.out.println("Student doesn't exist");
+    }
+
+    public void getAllStudents() {
+        for(int i = 0; i < 100; i++) obtainStudent(i);
+    }
+
+    public void getStudentsBetween() {
+        System.out.print("Gettings students between\nInput first index number (0-99): ");
+        int indexOne = scanner.nextInt();
+        if(indexOne < 0 || indexOne > 99) throw new IllegalArgumentException("Value must be between 0-99");
+        System.out.print("Input second index number (" + (indexOne + 1) + "-99): ");
+        int indexTwo = scanner.nextInt();
+        if(indexTwo < indexOne || indexTwo > 99) throw new IllegalArgumentException("Value must be between " + (indexOne + 1) + "-99");
+
+        for(int i = indexOne; i <= indexTwo; i++) obtainStudent(i);
+    }
+
+    private void obtainStudent(int index) {
+        System.out.print("Info for student " + index + ": ");
+        students[index].getStudentData();
+    }
+}