Skip to content

Tasneem's Team-Patch #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TasneemShaffee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Tasneem's Team-Patch #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions src/BarCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package mainwindow;

import java.io.File;
import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.Scanner;


public class BarCode {
public static int genetratedCode=0;
private ArrayList<Data> tokens;
//return items saved in array list
public ArrayList<Data> getTokens() {
return tokens;
}
// set the array list
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");
}
//load data from file
public void loadFromFile(File inputFile) throws FileNotFoundException{
if(inputFile.canRead()){
Scanner reader = new Scanner(inputFile);
while(reader.hasNext()){
Data temp = new Data();
genetratedCode=Integer.parseInt(reader.nextLine());
temp.setGeneratedNumber(genetratedCode);
temp.setPackageData(reader.nextLine());
temp.setDataSent(reader.nextLine());
temp.setRecievedData(reader.nextLine());
temp.setIDNumber(Integer.parseInt(reader.nextLine()));
temp.setChoice(reader.nextLine());
tokens.add(temp);
}
System.out.println(1);
reader.close();
}
else{
System.out.println(0);
tokens = null;
}
}
//Search by ID
public int FindWithID(int number){
int i = 0;
while(i < tokens.size() ){
if(tokens.get(i).getIDNumber()== number){
return i;
}
i++;
}
return -1;
}
// add a new package info in the list
public void addToList(Data temp){
tokens.add(temp);
}

}
48 changes: 48 additions & 0 deletions src/Data.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package mainwindow;

public class Data {

private int generatedNumber;
private String packageData;
private String dataSent;
private String recievedData;
private int IDNumber;
private String 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) {
IDNumber = iDNumber;
}
public String getChoice() {
return choice;
}
public void setChoice(String choice) {
this.choice = choice;
}
}
118 changes: 90 additions & 28 deletions src/Mainwindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
package mainwindow;

/*
* 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.
*/


import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
Expand All @@ -8,7 +17,6 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Scanner;

import javax.swing.ButtonGroup;
import javax.swing.ImageIcon;
import javax.swing.JButton;
Expand All @@ -18,14 +26,53 @@
import javax.swing.JRadioButton;
import javax.swing.JTextField;

/**
*
* @author dell
*/
import com.google.zxing.BarcodeFormat;
import com.google.zxing.WriterException;
import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.oned.Code128Writer;

public class Mainwindow extends JFrame {
private JTextField barCodeText;
/*

Matinenance Team : Tasneem Adel,Yomna Alaa,Mariam Maged,Basma Mohamed.
24/3/2018 12:35 am

The program is about entering Bar code (Id) of the package
and all its information is retreived from the file if it is found.
If the entered bar code is not found, The add new package panel is opened to add this item.

This maintenance is correctness maintenance as it is found a logical errors in this code.

The bugs that were fixed:

1- The search is made by comparing with an automatic generated number whic is always 0,
Therefore the comparison is made with the entered id as the user always knows it and can search
the package by it.

2-The save function is called in background thread which is started at once
and doesn't update the save by time or any event that can invoke this function.Therfore,the correction
of this that save function is moved to be called when the submit function is called to update the file data immediately.

3-Preventing the user from entering the same id if it is saved before in the file,
this is done to avoid wrong retrival of data as the search function retrieves the data of first found id.


4- Updating the GUI since the GUI of adding new package has two radio button with the same title "Step B".
So,the second radio button is "step B" and the third one is "Step C".

5- Auto increment the genrated number, by reading the last generated item and increment on it.

6- Commenting un-commentated parts in the code.

*/

public class Mainwindow extends JFrame{

private JTextField barCodeText;
private int newrakam;
private BufferedImage image;
private JFrame parent;
Expand Down Expand Up @@ -57,12 +104,12 @@ public class Mainwindow extends JFrame {
private BarCode tokens;
private File storedData;
private boolean fileNotGenerated;

public static void main(String[] args) throws FileNotFoundException {
new Mainwindow();
}

@SuppressWarnings("deprecation")
static int generatednumber=0;
public static void main(String[] args) throws FileNotFoundException {
// TODO code application logic here
new Mainwindow();
}
@SuppressWarnings("deprecation")
Mainwindow() throws FileNotFoundException {
storedData = null;

Expand Down Expand Up @@ -118,15 +165,18 @@ public void actionPerformed(ActionEvent e) {
});
btnBack.setBounds(75, 25, 89, 23);
panel_3.add(btnBack);

//save new package
JButton btnSubmit = new JButton("Submit");
btnSubmit.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
add();
search(newrakam);
panel.show();
//add new package
add();
//save the added data
save();
panel.show();
panel_3.hide();
label.setIcon(null);
//clearing the fields
textField_4.setText("");
textField_3.setText("");
textField_1.setText("");
Expand All @@ -153,7 +203,7 @@ public void actionPerformed(ActionEvent e) {
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);

Expand Down Expand Up @@ -186,6 +236,7 @@ public void actionPerformed(ActionEvent e) {
storedData = new File("data.txt");
if(!storedData.exists())
try {
//creating new file if it is not existed
storedData.createNewFile();
} catch (IOException e1) {
// TODO Auto-generated catch block
Expand All @@ -197,7 +248,8 @@ public void actionPerformed(ActionEvent e) {
}
// /////////////////////////////////////////////////////////////
JButton btnNewBarcode = new JButton("New Barcode");
btnNewBarcode.addActionListener(new ActionListener() {
//opening new pannel to add new bar code for new package
btnNewBarcode.addActionListener(new ActionListener() {
@SuppressWarnings("deprecation")
public void actionPerformed(ActionEvent e) {
panel.hide();
Expand All @@ -210,17 +262,21 @@ public void actionPerformed(ActionEvent e) {
barCodeText.setBounds(42, 184, 177, 20);
panel.add(barCodeText);
barCodeText.setColumns(10);

//searching for the given bar code
JButton searchButton = new JButton("Enter Barcode");
searchButton.addActionListener(new ActionListener() {
String valueOfBarCodeText = null;

public void actionPerformed(ActionEvent e) {
//get value of the barcode
valueOfBarCodeText = barCodeText.getText();
if (valueOfBarCodeText != null) {
try {
newrakam=Integer.parseInt(valueOfBarCodeText);
search(newrakam);
//search in the file about the entered bar code
search(newrakam);

//clear the barcode text
barCodeText.setText("");
} catch (Exception ex) {
// this mean that the input was not a number
Expand Down Expand Up @@ -258,8 +314,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);
//newrakam = sc.nextInt();
//search(newrakam);
}
}
});
Expand Down Expand Up @@ -300,14 +356,14 @@ public void run() {
view_id = new JLabel("");
view_id.setBounds(114, 268, 128, 14);
panel_1.add(view_id);

/*
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
public void run() {
save();
// save();
}

}));

*/
show();
}

Expand Down Expand Up @@ -338,7 +394,7 @@ void make_bar_code(int barcode) {
*/
private void search(int barcode) {
boolean found = false;
int result = tokens.FindWithGeneratedCode(barcode);
int result = tokens.FindWithID(barcode);
if (result == -1) {
found = false;
} else {
Expand All @@ -357,21 +413,27 @@ private void search(int barcode) {
panel_3.show();
}
}

//add new package wit its corresponding information
private void add() {
System.out.println(newrakam);
int result = tokens.FindWithID(Integer.parseInt(textField_4.getText()));
if(result==-1){
Data temp = new Data();
String choice = null;
temp.setGeneratedNumber(newrakam);
generatednumber=BarCode.genetratedCode +1;
temp.setGeneratedNumber(generatednumber);
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);
tokens.addToList(temp);
tokens.addToList(temp);}
else{
System.out.print("The id is already existed,Please enter new ID");
}
}

// get value from the selected radio button
private String getSellectedButton() {
String value = null;
if (rdbtnStepA.isSelected()) {
Expand All @@ -383,7 +445,7 @@ private String getSellectedButton() {
}
return value;
}

//saving in the file
void save(){
ArrayList<Data> allData = tokens.getTokens();
try {
Expand Down