Skip to content

Commit

Permalink
Merge pull request #11 from FlanFlanagan/master
Browse files Browse the repository at this point in the history
round 2
FlanFlanagan committed Sep 22, 2014
2 parents 788518f + 4517f92 commit f3fefc1
Showing 3 changed files with 5 additions and 5 deletions.
Binary file added cyclist/lib/javax.json-1.0.4.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions cyclist/src/edu/utexas/cycic/InstitutionView.java
Original file line number Diff line number Diff line change
@@ -297,12 +297,12 @@ public void handle(ActionEvent event){
HBox institSideBar = new HBox();
VBox facilitiesBox = new VBox();
facilitiesBox.getChildren().addAll(new Label("Starting Facilities"), facilityList);
VBox prototypesBox = new VBox();
prototypesBox.getChildren().addAll(new Label("Prototypes"), prototypeList);
//VBox prototypesBox = new VBox();
//prototypesBox.getChildren().addAll(new Label("Prototypes"), prototypeList);
institSideBar.setPadding(new Insets(0, 5, 0, 0));
institSideBar.setMinWidth(200);
institSideBar.setPrefWidth(200);
institSideBar.getChildren().addAll(facilitiesBox, prototypesBox);
institSideBar.getChildren().addAll(facilitiesBox);


VBox institGridBox = new VBox();
4 changes: 2 additions & 2 deletions cyclist/src/edu/utexas/cycic/SimulationInfo.java
Original file line number Diff line number Diff line change
@@ -233,7 +233,7 @@ public void handle(ActionEvent event){
}
});
simInfo.add(output, 0, 5);
Button load = new Button();
/*Button load = new Button();
load.setText("Load");
load.setOnAction(new EventHandler<ActionEvent>(){
public void handle(ActionEvent event){
@@ -243,7 +243,7 @@ public void handle(ActionEvent event){
OutPut.loadFile(file);
}
});
simInfo.add(load, 1, 5);
simInfo.add(load, 1, 5);*/
buildCommodPane();


0 comments on commit f3fefc1

Please sign in to comment.