Skip to content

Commit 2c30091

Browse files
Merge branch 'develop' - conflicts with app and some better comments
2 parents 1172a6e + 1afd5ab commit 2c30091

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/kotlin/org/epistatic/app4/controller/ApplicationController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class ApplicationController {
6868
dateCustomColumn2.cellValueFactory = DateOffsetCellValueFactory(40)
6969
dateCustomColumn2.cellFactory = CustomDateCellFactory()
7070

71-
// Use Lambda factories as lambdas
71+
// Use Lambda to create factories
7272
dateLambdaColumn.setCellValueFactory { cell: TableColumn.CellDataFeatures<DateItem, OffsetDateTime> -> ReadOnlyObjectWrapper(cell.value.date) }
7373
dateLambdaColumn.setCellFactory {
7474
object : TableCell<DateItem, OffsetDateTime>() {

src/main/resources/app4/app4.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<?import javafx.scene.layout.GridPane?>
1010
<?import javafx.scene.layout.RowConstraints?>
1111

12-
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="50" minWidth="150" prefHeight="200.0" prefWidth="800.0" stylesheets="@app5.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.epistatic.app4.controller.ApplicationController">
12+
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="50" minWidth="150" prefHeight="200.0" prefWidth="800.0" stylesheets="@app4.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.epistatic.app4.controller.ApplicationController">
1313
<columnConstraints>
1414
<ColumnConstraints halignment="CENTER" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="100.0" />
1515
</columnConstraints>

0 commit comments

Comments
 (0)