updated code

SaketJNU · SaketJNU · commit 659678db4b11 · 2024-05-02T10:34:02.000+05:30
diff --git a/module2/CommandLineAgu.java b/module2/CommandLineAgu.java
@@ -12,4 +12,4 @@ public static void main(String args[])
 			System.out.print("\n"+args[i]);
 		}
 	}
-}
+}
diff --git a/module2/CompareMethod1.java b/module2/CompareMethod1.java
@@ -10,30 +10,30 @@ public class CompareMethod1
 	public static void main(String args[])
 	{
 		System.out.print("\nProgram to demonstate the Overloading of methods");
-		MethodOverloaded mo = new MethodOverloaded();
+		//MethodOverloaded mo = new MethodOverloaded();
 		Scanner reader = new Scanner(System.in);
 		System.out.print("\n\nEnter two integers: ");
 		System.out.print("\nFirst: ");
 		int num1 = reader.nextInt();
 		System.out.print("\nSecond: ");
 		int num2 = reader.nextInt();
-		mo.compare(num1, num2);
+		compare(num1, num2);
 		
 		System.out.print("\n\nEnter two characters: ");
 		System.out.print("\nFirst: ");
 		char c1 = reader.next().charAt(0) ;
 		System.out.print("\nSecond: ");
 		char c2 = reader.next().charAt(0) ;
-		mo.compare(c1, c2);	
+		compare(c1, c2);	
 
 		System.out.print("\n\nEnter two Strings: ");
 		System.out.print("\nFirst: ");
 		String s1 = reader.next();
 		System.out.print("\nSecond: ");
 		String s2 = reader.next();
-		mo.compare(s1, s2);
+		compare(s1, s2);
 	}
-  public void compare(int x, int y)
+  void compare(int x, int y)
   {
   	if (x > y)
   	{
@@ -45,7 +45,7 @@ public void compare(int x, int y)
   	}
   }
 
-  public void compare(char ch1, char ch2)
+  void compare(char ch1, char ch2)
   {
   	int x = (int) ch1;
   	int y = (int) ch2;
@@ -59,7 +59,7 @@ public void compare(char ch1, char ch2)
   	}
   }
 
-  public void compare(String str1, String str2)
+  void compare(String str1, String str2)
   {
   	if(str1.compareTo(str2) > 0)
   	{
diff --git a/module2/StaticVsNonStaticMethod.java b/module2/StaticVsNonStaticMethod.java
@@ -38,6 +38,12 @@ public static void main(String args[])
 		ob2.increaseCount();
 		ob2.increaseCount();
 		ob2.increaseCount();
-		ob2.printCount(); 
+		ob2.printCount();
+		StaticNonStaticMethod ob3 = new StaticNonStaticMethod();
+		StaticNonStaticMethod.objectCount();
+		StaticNonStaticMethod ob4 = new StaticNonStaticMethod();
+		StaticNonStaticMethod.objectCount();
+		ob4.printCount();
+
 	}
-}
+}
diff --git a/module2/VariableLenArgu.java b/module2/VariableLenArgu.java
@@ -16,11 +16,11 @@ public static void main(String args[])
 
 class VariableArgu
 {
-	void print_arguments(String... str)
+	void print_arguments(String... str)// Method Accepting Variable Length Aruguments
 	{
 		for(String s:str)
 			{
 				System.out.print(s);
 			}
 	}
-}
+}
diff --git a/module3/ReplaceVowels.java b/module3/ReplaceVowels.java
@@ -8,7 +8,7 @@ public static void main(String args[])
 		System.out.print("Enter a string: ");
 		String str= sc.nextLine(); //reads string
 		System.out.print("The string after replacing vowels: ");
-		str = str.replaceAll("[aeiouAEIOU]", "@");  // Replace Vowels by $
+		str = str.replaceAll("[a-zA-Z]", "@");  // Replace Vowels by $
 		System.out.println(str);
 	}
 }
diff --git a/module3/Uniquesubstringcount.java b/module3/Uniquesubstringcount.java
@@ -0,0 +1,26 @@
+//Program to count the number of occurrences of a search string in a given text string.
+import java.io.*;
+import java.util.Scanner;
+class SubStringCount 
+{
+ 	static int countOccurrences(String str, String word)
+	{
+		String a[] = str.split(" ");
+		int count = 0;
+		for (int i = 0; i < a.length; i++)
+		{
+			if (word.equals(a[i]))
+				count++;
+		}
+	return count;
+}
+	public static void main(String args[])
+	{
+		Scanner sc = new Scanner(System.in);
+		System.out.print("\nEnter a string:");
+		String str = sc.nextLine();
+		System.out.println("\nEnter a word to check for occurences:");
+		String word = sc.nextLine();
+		System.out.print(countOccurrences(str, word));
+	}
+}		

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@ public static void main(String args[])`
`12`	`12`	`System.out.print("\n"+args[i]);`
`13`	`13`	`}`
`14`	`14`	`}`
`15`		`-}`
	`15`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,30 +10,30 @@ public class CompareMethod1`
`10`	`10`	`public static void main(String args[])`
`11`	`11`	`{`
`12`	`12`	`System.out.print("\nProgram to demonstate the Overloading of methods");`
`13`		`- MethodOverloaded mo = new MethodOverloaded();`
	`13`	`+ //MethodOverloaded mo = new MethodOverloaded();`
`14`	`14`	`Scanner reader = new Scanner(System.in);`
`15`	`15`	`System.out.print("\n\nEnter two integers: ");`
`16`	`16`	`System.out.print("\nFirst: ");`
`17`	`17`	`int num1 = reader.nextInt();`
`18`	`18`	`System.out.print("\nSecond: ");`
`19`	`19`	`int num2 = reader.nextInt();`
`20`		`- mo.compare(num1, num2);`
	`20`	`+ compare(num1, num2);`
`21`	`21`
`22`	`22`	`System.out.print("\n\nEnter two characters: ");`
`23`	`23`	`System.out.print("\nFirst: ");`
`24`	`24`	`char c1 = reader.next().charAt(0) ;`
`25`	`25`	`System.out.print("\nSecond: ");`
`26`	`26`	`char c2 = reader.next().charAt(0) ;`
`27`		`- mo.compare(c1, c2);`
	`27`	`+ compare(c1, c2);`
`28`	`28`
`29`	`29`	`System.out.print("\n\nEnter two Strings: ");`
`30`	`30`	`System.out.print("\nFirst: ");`
`31`	`31`	`String s1 = reader.next();`
`32`	`32`	`System.out.print("\nSecond: ");`
`33`	`33`	`String s2 = reader.next();`
`34`		`- mo.compare(s1, s2);`
	`34`	`+ compare(s1, s2);`
`35`	`35`	`}`
`36`		`- public void compare(int x, int y)`
	`36`	`+ void compare(int x, int y)`
`37`	`37`	`{`
`38`	`38`	`if (x > y)`
`39`	`39`	`{`
`@@ -45,7 +45,7 @@ public void compare(int x, int y)`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- public void compare(char ch1, char ch2)`
	`48`	`+ void compare(char ch1, char ch2)`
`49`	`49`	`{`
`50`	`50`	`int x = (int) ch1;`
`51`	`51`	`int y = (int) ch2;`
`@@ -59,7 +59,7 @@ public void compare(char ch1, char ch2)`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- public void compare(String str1, String str2)`
	`62`	`+ void compare(String str1, String str2)`
`63`	`63`	`{`
`64`	`64`	`if(str1.compareTo(str2) > 0)`
`65`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ public static void main(String args[])`
`16`	`16`
`17`	`17`	`class VariableArgu`
`18`	`18`	`{`
`19`		`- void print_arguments(String... str)`
	`19`	`+ void print_arguments(String... str)// Method Accepting Variable Length Aruguments`
`20`	`20`	`{`
`21`	`21`	`for(String s:str)`
`22`	`22`	`{`
`23`	`23`	`System.out.print(s);`
`24`	`24`	`}`
`25`	`25`	`}`
`26`		`-}`
	`26`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public static void main(String args[])`
`8`	`8`	`System.out.print("Enter a string: ");`
`9`	`9`	`String str= sc.nextLine(); //reads string`
`10`	`10`	`System.out.print("The string after replacing vowels: ");`
`11`		`- str = str.replaceAll("[aeiouAEIOU]", "@"); // Replace Vowels by $`
	`11`	`+ str = str.replaceAll("[a-zA-Z]", "@"); // Replace Vowels by $`
`12`	`12`	`System.out.println(str);`
`13`	`13`	`}`
`14`	`14`	`}`