renamed factories to clearer names

Author: SergeMerzliakov

build.gradle

@@ -85,7 +85,7 @@ task runApp3(type: JavaExec) {
 
 task runApp4(type: JavaExec) {
     group = "Application"
-    description = "Runs Application 4 - Nested Controllers"
+    description = "Runs Application 4 - Table View Cell Factories"
     classpath sourceSets.main.runtimeClasspath
     main = 'org.epistatic.app4.Main'
     doFirst {
@@ -96,19 +96,6 @@ task runApp4(type: JavaExec) {
     }
 }
 
-task runApp5(type: JavaExec) {
-    group = "Application"
-    description = "Runs Application 5 - Table View Cell Factories"
-    classpath sourceSets.main.runtimeClasspath
-    main = 'org.epistatic.app5.Main'
-    doFirst {
-        jvmArgs = [
-                '--module-path', "${JFX_INSTALL}/lib",
-                '--add-modules', 'javafx.fxml,javafx.controls'
-        ]
-    }
-}
-
 task collateInstall(type:Copy){
     delete "installBuild"
     mkdir "installBuild/lib"

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

@@ -59,14 +59,14 @@ class ApplicationController {
       dateStringColumn.cellValueFactory = PropertyValueFactory<DateItem, String>("date")
 
       dateObjectColumn.cellValueFactory = PropertyValueFactory<DateItem, OffsetDateTime>("date")
-      dateObjectColumn.cellFactory = DateCellFactory1()
+      dateObjectColumn.cellFactory = ModifiedISODateCellFactory()
 
       dateCustomColumn.cellValueFactory = DateCellValueFactory()
-      dateCustomColumn.cellFactory = DateCellFactory2()
+      dateCustomColumn.cellFactory = ModifiedISODateCellFactory()
 
       // Offset date by 10 seconds
       dateCustomColumn2.cellValueFactory = DateOffsetCellValueFactory(40)
-      dateCustomColumn2.cellFactory = DateCellFactory2()
+      dateCustomColumn2.cellFactory = CustomDateCellFactory()
 
       // Use Lambda factories as lambdas
       dateLambdaColumn.setCellValueFactory { cell: TableColumn.CellDataFeatures<DateItem, OffsetDateTime> -> ReadOnlyObjectWrapper(cell.value.date) }

…atic/app4/controller/DateCellFactory2.kt …app4/controller/CustomDateCellFactory.ktsrc/main/kotlin/org/epistatic/app4/controller/DateCellFactory2.kt renamed to src/main/kotlin/org/epistatic/app4/controller/CustomDateCellFactory.kt src/main/kotlin/org/epistatic/app4/controller/DateCellFactory2.kt renamed to src/main/kotlin/org/epistatic/app4/controller/CustomDateCellFactory.kt

@@ -10,7 +10,7 @@ import java.time.format.DateTimeFormatter
 /**
  * Sets cell's text to be another formatted date
  */
-class DateCellFactory2 : Callback<TableColumn<DateItem, OffsetDateTime>, TableCell<DateItem, OffsetDateTime>> {
+class CustomDateCellFactory : Callback<TableColumn<DateItem, OffsetDateTime>, TableCell<DateItem, OffsetDateTime>> {
 
    companion object {
       private val customFormat = DateTimeFormatter.ofPattern("MMM-dd-yyyy *** HH:mm:ss")

…atic/app4/controller/DateCellFactory1.kt …controller/ModifiedISODateCellFactory.ktsrc/main/kotlin/org/epistatic/app4/controller/DateCellFactory1.kt renamed to src/main/kotlin/org/epistatic/app4/controller/ModifiedISODateCellFactory.kt src/main/kotlin/org/epistatic/app4/controller/DateCellFactory1.kt renamed to src/main/kotlin/org/epistatic/app4/controller/ModifiedISODateCellFactory.kt

@@ -10,7 +10,7 @@ import java.time.format.DateTimeFormatter
 /**
  * Sets cell's text to be a formatted date
  */
-class DateCellFactory1 : Callback<TableColumn<DateItem, OffsetDateTime>, TableCell<DateItem, OffsetDateTime>> {
+class ModifiedISODateCellFactory : Callback<TableColumn<DateItem, OffsetDateTime>, TableCell<DateItem, OffsetDateTime>> {
 
    companion object {
       private val customFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd => HH:mm:ss")