From 00736054bcd20aa0a7aac8ef5139fba5db54a782 Mon Sep 17 00:00:00 2001
From: khaireddine mejri <mejrikhaireddine@gmail.com>
Date: Fri, 20 Apr 2018 18:25:21 +0200
Subject: [PATCH 1/2] Created HexaDecimalToDecimal.java

added HexaDecimalToDecimal.java on conversions.
it converts Hexadecimal input to decimal.
---
 Conversions/HexaDecimalToDecimal.java | 43 +++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 Conversions/HexaDecimalToDecimal.java

diff --git a/Conversions/HexaDecimalToDecimal.java b/Conversions/HexaDecimalToDecimal.java
new file mode 100644
index 000000000000..fe9aea3b4d32
--- /dev/null
+++ b/Conversions/HexaDecimalToDecimal.java
@@ -0,0 +1,43 @@
+package Conversions;
+
+import java.util.Scanner;
+
+public class HexaDecimalToDecimal {
+
+    // convert hexadecimal to decimal
+    public static int getHexaToDec(String hex){
+        String digits = "012345678910ABCDEFF";
+        hex = hex.toUpperCase();
+        int val = 0;
+        for (int i = 0; i < hex.length(); i++)
+        {
+            char c = hex.charAt(i);
+            int d = digits.indexOf(c);
+            val = 16*val + d;
+        }
+        return val;
+    }
+
+    // Main method gets the hexadecimal input from user and converts it into Decimal output.
+
+    public static void main(String args[])
+    {
+        String hexa_Input;
+        int dec_output;
+        Scanner scan = new Scanner(System.in);
+
+        System.out.print("Enter Hexadecimal Number : ");
+        hexa_Input = scan.nextLine();
+
+        // convert hexadecimal to decimal
+
+        dec_output = getHexaToDec(hexa_Input);
+        /*
+        Pass the string to the getHexaToDec function
+        and it returns the decimal form in the variable dec_output.
+        */
+        System.out.println("Number in Decimal: "+dec_output);
+
+
+    }
+}

From d5c673aa97a20fd43401f698cdf702dcaed8505c Mon Sep 17 00:00:00 2001
From: khaireddine mejri <mejrikhaireddine@gmail.com>
Date: Sat, 19 May 2018 16:20:35 +0200
Subject: [PATCH 2/2] Update HexaDecimalToDecimal.java

---
 Conversions/HexaDecimalToDecimal.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Conversions/HexaDecimalToDecimal.java b/Conversions/HexaDecimalToDecimal.java
index fe9aea3b4d32..24c4e0a8570c 100644
--- a/Conversions/HexaDecimalToDecimal.java
+++ b/Conversions/HexaDecimalToDecimal.java
@@ -11,8 +11,7 @@ public static int getHexaToDec(String hex){
         int val = 0;
         for (int i = 0; i < hex.length(); i++)
         {
-            char c = hex.charAt(i);
-            int d = digits.indexOf(c);
+            int d = digits.indexOf(hex.charAt(i));
             val = 16*val + d;
         }
         return val;