Skip to content

Patchbranch6 #3

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
ShaimaaAbdeen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Patchbranch6 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd514cf
fixing bugs
ShaimaaTarek Mar 23, 2018
880d102
fixing
ShaimaaTarek Mar 23, 2018
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
33 changes: 33 additions & 0 deletions src/firstpatch.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--- a/src/mainwindow/Mainwindow.java
+++ b/src/mainwindow/Mainwindow.java
@@ -123,7 +123,12 @@ public class Mainwindow extends JFrame {
JButton btnSubmit = new JButton("Submit");
btnSubmit.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- add();
+ if(textField_4.getText().toString().compareTo("")==0 ||textField_3.getText().toString().compareTo("")==0 ||textField_1.getText().toString().compareTo("")==0 ||textField_2.getText().toString().compareTo("")==0 )
+ {
+ System.out.println("Enter All required data");
+ }
+ else{
+ add();
search(newrakam);
panel.show();
panel_3.hide();
@@ -139,6 +144,7 @@ public class Mainwindow extends JFrame {
view_id.setText("");
view_package.setText("");
view_recieved.setText("");
+ }
}
});
btnSubmit.setBounds(75, 345, 89, 23);
@@ -154,7 +160,7 @@ public class Mainwindow extends JFrame {
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);

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

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


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();
temp.setGeneratedNumber(Integer.parseInt(reader.nextLine()));
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;
}
}
public int FindWithGeneratedCode(int number){
int i = 0;
while(i < tokens.size() ){
if(tokens.get(i).getGeneratedNumber() == number){
return i;
}
i++;
}
return -1;
}

public void addToList(Data temp){
tokens.add(temp);
}
}
50 changes: 50 additions & 0 deletions src/mainwindow/Data.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
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;
}
}
11 changes: 9 additions & 2 deletions src/Mainwindow.java → src/mainwindow/Mainwindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
package mainwindow;
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
Expand Down Expand Up @@ -122,7 +123,12 @@ public void actionPerformed(ActionEvent e) {
JButton btnSubmit = new JButton("Submit");
btnSubmit.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
add();
if(textField_4.getText().toString().compareTo("")==0 ||textField_3.getText().toString().compareTo("")==0 ||textField_1.getText().toString().compareTo("")==0 ||textField_2.getText().toString().compareTo("")==0 )
{
System.out.println("Enter All required data");
}
else{
add();
search(newrakam);
panel.show();
panel_3.hide();
Expand All @@ -138,6 +144,7 @@ public void actionPerformed(ActionEvent e) {
view_id.setText("");
view_package.setText("");
view_recieved.setText("");
}
}
});
btnSubmit.setBounds(75, 345, 89, 23);
Expand All @@ -153,7 +160,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