From 07079cc2e0ae059055c29e2f5555e5c26c82afad Mon Sep 17 00:00:00 2001
From: The-TJ <32796932+The-TJ@users.noreply.github.com>
Date: Tue, 28 Nov 2017 14:34:17 +0000
Subject: [PATCH 1/3] Create OctalToHexadecimal.java

Add Octal To Hexadecimal
---
 Conversions/OctalToHexadecimal.java | 63 +++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 Conversions/OctalToHexadecimal.java

diff --git a/Conversions/OctalToHexadecimal.java b/Conversions/OctalToHexadecimal.java
new file mode 100644
index 00000000..f7998925
--- /dev/null
+++ b/Conversions/OctalToHexadecimal.java
@@ -0,0 +1,63 @@
+/**
+ + + * Converts any Hexadecimal Number to Octal 
+ + + * 
+ + + * @author Tanmay Joshi
+ + + *
+ + + *
+ **/
+import java.util.Scanner;
+
+public class OctalToHexadecimal{
+	
+  /**
+ + +	 * This method converts a Octal number to
+ + +	 * a decimal number
+ + +	 * 
+ + +	 * @param The Octal Number
+ + +	 * @return The Decimal number
+ + +	 */ 
+ public static int OctToDec(String s)
+ {
+	 int i =0;
+	 for(int j =0;j<s.length();j++)
+	 {
+		 char num = s.charAt(j);
+		 num-='0';
+		 i*=8;
+		 i+=num;
+	 }
+	 return i;
+}
+
+/**
+ + +	 * This method converts a Decimal number to
+ + +	 * a Hexadecimal number
+ + +	 * 
+ + +	 * @param The Decimal Number
+ + +	 * @return The Hexadecimal number
+ + +	 */ 
+public static String DecimalToHex(int d) {
+    String digits = "0123456789ABCDEF";
+    if (d <= 0) 
+		return "0";  
+    String hex = "";
+    while (d > 0) {
+        int digit = d % 16;              
+        hex = digits.charAt(digit) + hex;
+        d = d / 16;
+    }
+    return hex;
+}
+
+           //Driver Program
+public static void main ( String args[]) {
+		
+     Scanner input = new Scanner(System.in);
+     System.out.print("Enter the Octal number: ");
+     String oct  = input.next();                     //Take octal number as input from user in a string
+	 int decimal = OctToDec(oct);                    //Pass the octal number to function and get converted deciaml form
+	 String hex = DecimalToHex(decimal);             //Pass the decimla number to function and get converted Hex form of the number
+	 System.out.println("The Hexadecimal equivalant is: "+hex);
+ }
+}
+

From 7ec9158582e528bc7d1bab61d46edd0cbe12aa94 Mon Sep 17 00:00:00 2001
From: The-TJ <32796932+The-TJ@users.noreply.github.com>
Date: Tue, 28 Nov 2017 14:35:20 +0000
Subject: [PATCH 2/3] Update OctalToHexadecimal.java

---
 Conversions/OctalToHexadecimal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Conversions/OctalToHexadecimal.java b/Conversions/OctalToHexadecimal.java
index f7998925..f5468a26 100644
--- a/Conversions/OctalToHexadecimal.java
+++ b/Conversions/OctalToHexadecimal.java
@@ -1,5 +1,5 @@
 /**
- + + * Converts any Hexadecimal Number to Octal 
+ + + * Converts any Octal Number to HexaDecimal 
  + + * 
  + + * @author Tanmay Joshi
  + + *

From b190206b767fbb0502c3a9365b34defa47b2467b Mon Sep 17 00:00:00 2001
From: The-TJ <32796932+The-TJ@users.noreply.github.com>
Date: Sat, 31 Mar 2018 00:02:10 +0100
Subject: [PATCH 3/3] Update OctalToHexadecimal.java

---
 Conversions/OctalToHexadecimal.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Conversions/OctalToHexadecimal.java b/Conversions/OctalToHexadecimal.java
index f5468a26..a68df621 100644
--- a/Conversions/OctalToHexadecimal.java
+++ b/Conversions/OctalToHexadecimal.java
@@ -7,7 +7,7 @@
  **/
 import java.util.Scanner;
 
-public class OctalToHexadecimal{
+public class OctalToHexadecimal {
 	
   /**
  + +	 * This method converts a Octal number to
@@ -55,9 +55,9 @@ public static void main ( String args[]) {
      Scanner input = new Scanner(System.in);
      System.out.print("Enter the Octal number: ");
      String oct  = input.next();                     //Take octal number as input from user in a string
-	 int decimal = OctToDec(oct);                    //Pass the octal number to function and get converted deciaml form
-	 String hex = DecimalToHex(decimal);             //Pass the decimla number to function and get converted Hex form of the number
-	 System.out.println("The Hexadecimal equivalant is: "+hex);
+     int decimal = OctToDec(oct);                    //Pass the octal number to function and get converted deciaml form
+     String hex = DecimalToHex(decimal);             //Pass the decimla number to function and get converted Hex form of the number
+     System.out.println("The Hexadecimal equivalant is: "+hex);
  }
 }