Skip to content

Commit b1176a1

Browse files
committed
Updated formatting of files to adhere to style guide, ready for release
1 parent 2d70dae commit b1176a1

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

src/main/Ingredient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
public class Ingredient {
2-
32
private final String id;
43
private final String name;
54
private final String currAmt;

src/main/ManagerController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import javafx.scene.control.TableColumn.CellDataFeatures;
1313
import javafx.util.Callback;
1414

15-
1615
public class ManagerController {
1716
private jdbcpostgreSQL db = new jdbcpostgreSQL();
1817
ObservableList<ObservableList<String>> inventoryData = FXCollections.observableArrayList();

src/main/ServerController.java

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
1-
import java.util.*;
21
import java.sql.*;
2+
import java.util.*;
3+
import javafx.collections.*;
34
import javafx.event.ActionEvent;
45
import javafx.fxml.FXML;
56
import javafx.scene.Node;
6-
import javafx.scene.layout.*;
77
import javafx.scene.control.*;
8-
import javafx.collections.*;
8+
import javafx.scene.layout.*;
9+
910

1011
public class ServerController {
1112
private Vector<Integer> currOrder = new Vector<Integer>();
1213
private ObservableList<String> currOrderNames = FXCollections.observableArrayList();
1314
private jdbcpostgreSQL db = new jdbcpostgreSQL();
1415
private int employeeID = 0; // TODO get session user's (employee) id
15-
@FXML
16-
private Label totalPriceField;
17-
@FXML
18-
private ListView<String> orderListView;
19-
@FXML
20-
private GridPane comboGridPane;
21-
@FXML
22-
private GridPane entreeGridPane;
23-
@FXML
24-
private GridPane drinkGridPane;
25-
@FXML
26-
private GridPane sweetGridPane;
27-
@FXML
28-
private GridPane sideGridPane;
16+
@FXML private Label totalPriceField;
17+
@FXML private ListView<String> orderListView;
18+
@FXML private GridPane comboGridPane;
19+
@FXML private GridPane entreeGridPane;
20+
@FXML private GridPane drinkGridPane;
21+
@FXML private GridPane sweetGridPane;
22+
@FXML private GridPane sideGridPane;
2923

3024
public void initialize() {
3125
populateButtons(1, comboGridPane);

0 commit comments

Comments
 (0)