diff --git a/src/Main.java b/src/Main.java index 2be04f93764fd4d68a10f20ffb58a7fdb645093d..58eb12176a1231b868e50033b14014ad9125b7a8 100644 --- a/src/Main.java +++ b/src/Main.java @@ -4,29 +4,37 @@ import java.util.Scanner; import java.util.ArrayList; import java.util.HashSet; import java.util.HashMap; +import java.io.*; + public class Main { public static void main(String[] args) { - //TIP Press <shortcut actionId="ShowIntentionActions"/> with your caret at the highlighted text - // to see how IntelliJ IDEA suggests fixing it. - System.out.println("changes in the merge"); - System.out.println("Hello Class from merge request!"); - HashMap<String, Integer> grades = new HashMap<>(); - grades.put("Mahboobe", 87); - grades.put("Chris", 86); - System.out.println(grades); - grades.put("Mahboobe", 90); - System.out.println(grades); - for( String name : grades.keySet()){ - System.out.println(name + " " + grades.get(name)); - } - System.out.println("check if we have Anne grade: " + grades.containsKey("Anne")); - System.out.println("check if we have Mahboobe grade: " + grades.containsKey("Mahboobe")); - System.out.println("check if we have 90 grade: " + grades.containsValue(90)); - System.out.println("check if we have Anee grade: " + grades.get("anne")); + + + //TIP Press <shortcut actionId="ShowIntentionActions"/> with your caret at the highlighted text + // to see how IntelliJ IDEA suggests fixing it. +// System.out.println("changes in the merge"); +// System.out.println("Hello Class from merge request!"); +// +// HashMap<String, Integer> grades = new HashMap<>(); +// grades.put("Mahboobe", 87); +// grades.put("Chris", 86); +// +// System.out.println(grades); +// grades.put("Mahboobe", 90); +// System.out.println(grades); +// +// for( String name : grades.keySet()){ +// System.out.println(name + " " + grades.get(name)); +// } +// System.out.println("check if we have Anne grade: " + grades.containsKey("Anne")); +// System.out.println("check if we have Mahboobe grade: " + grades.containsKey("Mahboobe")); +// System.out.println("check if we have 90 grade: " + grades.containsValue(90)); +// +// System.out.println("check if we have Anee grade: " + grades.get("anne")); // HashMap<String, String> grades2 = new HashMap<>(); // grades2.put("Mahboobe", "A-");