Skip to content

Commit 0b49177

Browse files
roopanshroopansh
committed
Better Server UI
1 parent 9e4ee83 commit 0b49177

File tree

4 files changed

+32
-42
lines changed

4 files changed

+32
-42
lines changed

‎JavaProgramming/src/task3/teastall/Constants.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public class Constants {
1515
public static final int DELIVERY_TIME = 2;
1616
public static final String COFFEE = "Coffee";
1717
public static final String TEA = "Tea";
18-
public static final String SNACKS = "Snacks";
19-
public static final String COOKIES = "Cookies";
18+
private static final String SNACKS = "Snacks";
19+
private static final String COOKIES = "Cookies";
2020

2121
public static Map<String, Integer> getInitialItems() {
2222
Map<String, Integer> items = new HashMap<>();

‎JavaProgramming/src/task3/teastall/client/Client.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private void establishConnection() {
4242
dataInputStream = new DataInputStream(socket.getInputStream());
4343
dataOutputStream = new DataOutputStream(socket.getOutputStream());
4444
} catch (IOException i) {
45-
System.out.println(i);
45+
System.out.println(i.toString());
4646
}
4747

4848
// string to read message from input
@@ -51,7 +51,7 @@ private void establishConnection() {
5151
try {
5252
dataOutputStream.writeUTF(Constants.GET_AVAILABLE_LIST);
5353
} catch (IOException e) {
54-
System.out.println(e);
54+
System.out.println(e.toString());
5555
}
5656

5757
// keep reading until "End" is input
@@ -60,13 +60,13 @@ private void establishConnection() {
6060
this.Items.add(line);
6161
line = dataInputStream.readUTF();
6262
} catch (IOException i) {
63-
System.out.println(i);
63+
System.out.println(i.toString());
6464
}
6565
}
6666
try {
6767
socket.close();
6868
} catch (IOException e) {
69-
System.out.println(e);
69+
System.out.println(e.toString());
7070
}
7171
}
7272

@@ -177,14 +177,14 @@ private String sendOrder() {
177177
dataInputStream = new DataInputStream(new BufferedInputStream(socket.getInputStream()));
178178
dataOutputStream = new DataOutputStream(socket.getOutputStream());
179179
} catch (IOException i) {
180-
System.out.println(i);
180+
System.out.println(i.toString());
181181
}
182182

183183
try {
184184
dataOutputStream.writeUTF(Constants.PLACE_ORDER);
185185
dataOutputStream.writeUTF("Roopansh");
186186
} catch (IOException e) {
187-
System.out.println(e);
187+
System.out.println(e.toString());
188188
}
189189

190190
// keep writing until "End"
@@ -193,13 +193,13 @@ private String sendOrder() {
193193
dataOutputStream.writeUTF(entry.getKey());
194194
dataOutputStream.writeUTF(Integer.toString(entry.getValue()));
195195
} catch (IOException e) {
196-
System.out.println(e);
196+
System.out.println(e.toString());
197197
}
198198
}
199199
try {
200200
dataOutputStream.writeUTF(Constants.MESSAGE_END);
201201
} catch (IOException e) {
202-
System.out.println(e);
202+
System.out.println(e.toString());
203203
}
204204

205205
try {
@@ -219,7 +219,7 @@ private String sendOrder() {
219219
try {
220220
socket.close();
221221
} catch (IOException e) {
222-
System.out.println(e);
222+
System.out.println(e.toString());
223223
}
224224
return line;
225225
}

‎JavaProgramming/src/task3/teastall/server/ItemProcessor.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ public class ItemProcessor extends Thread {
2222
@Override
2323
public void run() {
2424
int stock = this.server.getItems().getOrDefault(item, 0);
25-
if (quantity > stock) {
25+
if (!item.equals(Constants.TEA) && !item.equals(Constants.COFFEE) && quantity > stock) {
2626
delay = -1;
2727
} else {
2828
delay = this.server.getItemDelay().getOrDefault(item, -1);
2929
delay = delay * quantity + Constants.DELIVERY_TIME;
30-
if (!item.equals(Constants.TEA) && !item.equals(Constants.COFFEE)) {
31-
this.server.getItems().put(item, stock - quantity);
32-
}
30+
this.server.getItems().put(item, stock - quantity);
3331
}
3432
latch.countDown();
3533
}

‎JavaProgramming/src/task3/teastall/server/Server.java

+19-27
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import javax.swing.*;
77
import javax.swing.table.DefaultTableModel;
8+
import java.awt.*;
89
import java.io.DataInputStream;
910
import java.io.DataOutputStream;
1011
import java.io.IOException;
@@ -44,10 +45,10 @@ private Server() {
4445
}
4546

4647
private void generateGui() {
47-
JFrame f = new JFrame();
48-
JPanel p1 = new JPanel();
49-
JPanel p2 = new JPanel();
50-
JPanel p3 = new JPanel();
48+
JFrame frame = new JFrame();
49+
JPanel p1 = new JPanel(new BorderLayout());
50+
JPanel p2 = new JPanel(new BorderLayout());
51+
JPanel p3 = new JPanel(new BorderLayout());
5152
JButton refresh = new JButton("Refresh"); //creating instance of JButton
5253
DefaultTableModel orderDetailsTable = new DefaultTableModel(new String[]{"S.No.", "Name", "Date", "Item", "Qty", "Rate", "Price"}, 0);
5354
DefaultTableModel stockDetailsTable = new DefaultTableModel(new String[]{"S.No.", "Item", "Stock Available"}, 0);
@@ -60,30 +61,21 @@ private void generateGui() {
6061
JScrollPane stockDetails = new JScrollPane(stockTable);
6162
JScrollPane purchaseDetails = new JScrollPane(purchaseTable);
6263

63-
p1.add(orderDetails);
64-
p2.add(stockDetails);
65-
p3.add(purchaseDetails);
66-
6764
JTabbedPane tp = new JTabbedPane();
65+
refresh.addActionListener(actionEvent -> refreshAction(orderDetailsTable, stockDetailsTable, purchaseListTable));
66+
refreshAction(orderDetailsTable, stockDetailsTable, purchaseListTable);
6867

69-
tp.setBounds(50, 50, 500, 600);
68+
frame.setLayout(new BorderLayout());
69+
frame.setExtendedState(JFrame.MAXIMIZED_BOTH);
70+
p1.add(orderDetails, BorderLayout.CENTER);
71+
p2.add(stockDetails, BorderLayout.CENTER);
72+
p3.add(purchaseDetails, BorderLayout.CENTER);
7073
tp.add("Orders", p1);
7174
tp.add("Stock", p2);
7275
tp.add("Purchase List", p3);
73-
f.add(tp);
74-
f.setSize(600, 800);
75-
orderDetails.setBounds(50, 400, 500, 200);
76-
purchaseDetails.setBounds(50, 400, 500, 200);
77-
stockDetails.setBounds(50, 400, 500, 200);
78-
refresh.setBounds(250, 650, 100, 40);
79-
80-
refresh.addActionListener(actionEvent -> refreshAction(orderDetailsTable, stockDetailsTable, purchaseListTable));
81-
refreshAction(orderDetailsTable, stockDetailsTable, purchaseListTable);
82-
83-
f.add(refresh);
84-
f.setLayout(null);
85-
f.setVisible(true);
86-
76+
frame.add(tp, BorderLayout.CENTER);
77+
frame.add(refresh, BorderLayout.PAGE_END);
78+
frame.setVisible(true);
8779
}
8880

8981
private void refreshAction(DefaultTableModel orderDetailsTable, DefaultTableModel stockDetailsTable, DefaultTableModel purchaseListTable) {
@@ -96,7 +88,7 @@ private void refreshAction(DefaultTableModel orderDetailsTable, DefaultTableMode
9688
orderDetailsTable.addRow(new Object[]{"", "", "", item.get(0), item.get(2), item.get(1), item.get(3)});
9789
totalPrice.set(totalPrice.get() + Integer.parseInt(item.get(3)));
9890
});
99-
orderDetailsTable.addRow(new Object[]{"", "", "", "", "", "", totalPrice});
91+
orderDetailsTable.addRow(new Object[]{"", "", "", "", "", "TOTAL", totalPrice});
10092
orderDetailsTable.addRow(new Object[]{"", "", "", "", "", "", ""});
10193
});
10294
stockDetailsTable.setRowCount(0);
@@ -171,7 +163,7 @@ public void run() {
171163
}
172164
line = dataInputStream.readUTF();
173165
} catch (IOException i) {
174-
System.out.println(i);
166+
System.out.println(i.toString());
175167
}
176168
}
177169

@@ -180,7 +172,7 @@ public void run() {
180172
}
181173
}
182174
} catch (IOException i) {
183-
System.out.println(i);
175+
System.out.println(i.toString());
184176
}
185177

186178
}
@@ -197,7 +189,7 @@ Map<String, ItemsProcessor> getItemsProcessorMap() {
197189
return itemsProcessorMap;
198190
}
199191

200-
public Map<Pair<String, String>, List<List<String>>> getOrdersRecords() {
192+
Map<Pair<String, String>, List<List<String>>> getOrdersRecords() {
201193
return ordersRecords;
202194
}
203195

0 commit comments

Comments
 (0)