diff --git a/src/BarCode.java b/src/BarCode.java
new file mode 100644
index 0000000..476a26f
--- /dev/null
+++ b/src/BarCode.java
@@ -0,0 +1,60 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package barcodereader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Scanner;
+ 
+/**
+ *
+ * @author Osama Nasr
+ */
+public class Barcode {
+        private ArrayList<Data> tokens;
+       
+        public ArrayList<Data> getTokens() {
+            return tokens;
+        }
+
+	public void setTokens(ArrayList<Data> tokens) {
+            this.tokens = tokens;
+	}
+
+	Barcode(File input) throws FileNotFoundException{
+            tokens = new ArrayList<Data>();
+            loadFromFile(input);
+            System.out.println("the data already in the list");
+        }
+       
+        public void loadFromFile(File inputFile) throws FileNotFoundException{
+            if(inputFile.canRead()){
+                Scanner reader = new Scanner(inputFile);
+                while(reader.hasNext()){
+                    Data temp = new Data(Integer.parseInt(reader.nextLine()),reader.nextLine(),reader.nextLine(),reader.nextLine(),Integer.parseInt(reader.nextLine()),reader.nextLine());
+                    tokens.add(temp);
+                }
+                System.out.println(1);
+                reader.close();
+            }
+            else{
+                System.out.println(0);
+                tokens = null;
+            }
+        }
+        public int FindWithGeneratedCode(int number){
+            for(int i =0; i<tokens.size();i++){
+                if(tokens.get(i).getGeneratedNumber() == number){
+                    return i;
+                }
+            }
+            return -1;
+        }
+        
+        public void addToList(Data temp){
+            tokens.add(temp);
+    	}
+}
diff --git a/src/Data.java b/src/Data.java
new file mode 100644
index 0000000..5d61597
--- /dev/null
+++ b/src/Data.java
@@ -0,0 +1,65 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package barcodereader;
+
+/**
+ *
+ * @author Osama Nasr
+ */
+public class Data {
+ 
+        private int generatedNumber;
+        private String packageData;
+        private String dataSent;
+        private String recievedData;
+        private int IDNumber;
+        private String choice;
+        public Data(int generatedNumber,String packageData,String dataSent,String recievedData,int iDNumber,String choice){
+            this.generatedNumber = generatedNumber;
+            this.packageData = packageData;
+            this.dataSent = dataSent;
+            this.recievedData = recievedData;
+            this.IDNumber = iDNumber;
+            this.choice = choice;
+
+        }
+        public int getGeneratedNumber() {
+                return generatedNumber;
+        }
+        public void setGeneratedNumber(int generatedNumber) {
+                this.generatedNumber = generatedNumber;
+        }
+        public String getPackageData() {
+                return packageData;
+        }
+        public void setPackageData(String packageData) {
+                this.packageData = packageData;
+        }
+        public String getDataSent() {
+                return dataSent;
+        }
+        public void setDataSent(String dataSent) {
+                this.dataSent = dataSent;
+        }
+        public String getRecievedData() {
+                return recievedData;
+        }
+        public void setRecievedData(String recievedData) {
+                this.recievedData = recievedData;
+        }
+        public int getIDNumber() {
+                return IDNumber;
+        }
+        public void setIDNumber(int iDNumber) {
+                this.IDNumber = iDNumber;
+        }
+        public String getChoice() {
+                return choice;
+        }
+        public void setChoice(String choice) {
+                this.choice = choice;
+        }
+}
diff --git a/src/Mainwindow.java b/src/Mainwindow.java
index d778104..e1867e0 100644
--- a/src/Mainwindow.java
+++ b/src/Mainwindow.java
@@ -1,3 +1,14 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package barcodereader;
+
+/**
+ *
+ * @author Osama Nasr
+ */
 import java.awt.Color;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -23,10 +34,11 @@
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.oned.Code128Writer;
+import javax.swing.JOptionPane;
 
 public class Mainwindow extends JFrame {
 	private JTextField barCodeText;
-	private int newrakam;
+	private int newnumber;
 	private BufferedImage image;
 	private JFrame parent;
 	private JPanel panel;
@@ -54,12 +66,17 @@ public class Mainwindow extends JFrame {
 	 */
 	private Thread th;
 
-	private BarCode tokens;
+	private Barcode tokens;
 	private File storedData;
 	private boolean fileNotGenerated;
 
 	public static void main(String[] args) throws FileNotFoundException {
+            try{
 		new Mainwindow();
+            }
+            catch(FileNotFoundException e){
+                JOptionPane.showMessageDialog(new JFrame(), "File Not Found", "Dialog", JOptionPane.ERROR_MESSAGE);
+            }
 	}
 
 	@SuppressWarnings("deprecation")
@@ -122,8 +139,10 @@ public void actionPerformed(ActionEvent e) {
 		JButton btnSubmit = new JButton("Submit");
 		btnSubmit.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				add();
-				search(newrakam);
+				boolean res = add();
+                                if(!res)
+                                    return;
+				search(newnumber);
 				panel.show();
 				panel_3.hide();
 				label.setIcon(null);
@@ -145,15 +164,15 @@ public void actionPerformed(ActionEvent e) {
 
 		ButtonGroup group = new ButtonGroup();
 		
-		rdbtnStepA = new JRadioButton("step A");
+		rdbtnStepA = new JRadioButton("Step A");
 		rdbtnStepA.setBounds(55, 225, 109, 23);
 		panel_3.add(rdbtnStepA);
 		
-		rdbtnStepB = new JRadioButton("step B");
+		rdbtnStepB = new JRadioButton("Step B");
 		rdbtnStepB.setBounds(55, 247, 109, 23);
 		panel_3.add(rdbtnStepB);
 
-		rdbtnStepC = new JRadioButton("step B");
+		rdbtnStepC = new JRadioButton("Step C");
 		rdbtnStepC.setBounds(55, 273, 109, 23);
 		panel_3.add(rdbtnStepC);
 
@@ -191,7 +210,7 @@ public void actionPerformed(ActionEvent e) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
-		tokens = new BarCode(storedData);
+		tokens = new Barcode(storedData);
 		if (tokens == null) {
 			fileNotGenerated = true;
 		}
@@ -213,18 +232,17 @@ public void actionPerformed(ActionEvent e) {
 
 		JButton searchButton = new JButton("Enter Barcode");
 		searchButton.addActionListener(new ActionListener() {
-			String valueOfBarCodeText = null;
+			String valueOfBarcodeText = null;
 
 			public void actionPerformed(ActionEvent e) {
-				valueOfBarCodeText = barCodeText.getText();
-				if (valueOfBarCodeText != null) {
+				valueOfBarcodeText = barCodeText.getText();
+				if (valueOfBarcodeText != null) {
 					try {
-						newrakam=Integer.parseInt(valueOfBarCodeText);
-						search(newrakam);
+						newnumber=Integer.parseInt(valueOfBarcodeText);
+						search(newnumber);
 						barCodeText.setText("");
 					} catch (Exception ex) {
-						// this mean that the input was not a number
-						System.out.println("wrong entery");
+                                                JOptionPane.showMessageDialog(new JFrame(), "Wrong entry - Value entered is invalid.");
 						barCodeText.setText("");
 					}
 
@@ -258,8 +276,8 @@ public void run() {
 				while (true) {
 					// must check if not in adding case or program is not in
 					// error case
-					newrakam = sc.nextInt();
-					search(newrakam);
+					newnumber = sc.nextInt();
+					search(newnumber);
 				}
 			}
 		});
@@ -358,18 +376,38 @@ private void search(int barcode) {
 		}
 	}
 
-	private void add() {
-		System.out.println(newrakam);
-		Data temp = new Data();
-		String choice = null;
-		temp.setGeneratedNumber(newrakam);
-		temp.setPackageData(textField_1.getText());
-		temp.setDataSent(textField_2.getText());
-		temp.setRecievedData(textField_3.getText());
-		temp.setIDNumber(Integer.parseInt(textField_4.getText()));
-		choice = getSellectedButton();
-		temp.setChoice(choice);
+	private boolean add() {
+		System.out.println(newnumber);
+                String choice = null;
+                choice = getSellectedButton();
+                String packetdata, datasent, receiveddata;
+                int iDnumber = -1;
+                packetdata = textField_1.getText();
+                if(packetdata.equals("")){
+                    JOptionPane.showMessageDialog(new JFrame(), "Packet Data Left Empty", "ERROR", JOptionPane.ERROR_MESSAGE);
+                    return false;
+                }
+                datasent = textField_2.getText();
+                if(datasent.equals("")){
+                    JOptionPane.showMessageDialog(new JFrame(), "Data Sent Left Empty", "ERROR", JOptionPane.ERROR_MESSAGE);
+                    return false;
+                }
+                receiveddata = textField_3.getText();
+                if(receiveddata.equals("")){
+                    JOptionPane.showMessageDialog(new JFrame(), "Received Data Left Empty", "ERROR", JOptionPane.ERROR_MESSAGE);
+                    return false;
+                }
+                try{
+                iDnumber = Integer.parseInt(textField_4.getText());
+                }
+                catch(Exception e){}
+                if (iDnumber == -1){
+                    JOptionPane.showMessageDialog(new JFrame(), "Invalid number entered", "ERROR", JOptionPane.ERROR_MESSAGE);
+                    return false;
+                }
+		Data temp = new Data(newnumber,packetdata,datasent,receiveddata,iDnumber,choice);
 		tokens.addToList(temp);
+                return true;
 	}
 
 	private String getSellectedButton() {
@@ -398,18 +436,11 @@ void save(){
 			}
 			writer.flush();writer.close();
 		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	
 	}
 	
-	/**
-	 * This function initialzie the view panel with the element data of the
-	 * given barcode.
-	 * 
-	 * @param barcode
-	 */
 	private void view(int res) {
 		make_bar_code(tokens.getTokens().get(res).getGeneratedNumber());
 		view_package.setText(tokens.getTokens().get(res).getPackageData());
@@ -417,4 +448,7 @@ private void view(int res) {
 		view_datasent.setText(tokens.getTokens().get(res).getDataSent());
 		view_recieved.setText(tokens.getTokens().get(res).getRecievedData());
 	}
+        
 }
+
+