Добавлен gui на javafx, тесты

lab2.iml

@@ -4,9 +4,14 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src-test" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="library" name="junit" level="project" />
+    <orderEntry type="library" name="guava" level="project" />
+    <orderEntry type="library" name="hamcrest-core" level="project" />
+    <orderEntry type="library" name="jfxrt" level="project" />
   </component>
 </module>

src-test/com/app/junit/WorkerFactoryTest.kt

@@ -0,0 +1,31 @@
+package com.app.junit
+
+import org.junit.*
+import org.junit.Assert.*
+import org.junit.runner.*
+import org.junit.runners.*
+import com.app.model.*
+
+/**
+ * Created by IntelliJ IDEA.<br>
+ * User: TrofimovAA<br>
+ * Date: 28.03.2017<br>
+ * Time: 18:45<br>
+ * unit tests
+ */
+@RunWith(Parameterized::class)
+class WorkerFactoryTest(val type: SalaryType, val rate: Double, val effortInterval: Double, val message: String, val worker: AbstractWorker) {
+
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters
+        fun testCases() = listOf(
+                arrayOf(SalaryType.Hour, 10, -1, "HourWorker", HourWorker(10.0)),
+                arrayOf(SalaryType.Salary, 10, -1, "SalaryWorker", SalaryWorker(10.0)),
+                arrayOf(SalaryType.Wage, 10, -1, "WageWorker", WageWorker(10.0))
+        )
+    }
+    @Test
+    fun testIsValidWorkers() = assertEquals(message, worker, WorkerFactory.create(type, rate, effortInterval))
+
+}

src/Main.kt → src/com/app/Main.kt

@@ -1,4 +1,6 @@
-import model.*
+package com.app
+
+import com.app.model.*
 
 /**
  * Created by IntelliJ IDEA.<br>

src/com/app/MainApp.kt

@@ -0,0 +1,193 @@
+package com.app
+
+import com.app.model.*
+import com.app.view.*
+import javafx.application.*
+import javafx.collections.*
+import javafx.fxml.*
+import javafx.scene.*
+import javafx.scene.control.*
+import javafx.scene.layout.*
+import javafx.stage.*
+import java.io.*
+import java.util.prefs.*
+import javax.xml.bind.*
+
+/**
+ * Created by IntelliJ IDEA.<br>
+ * User: TrofimovAA<br>
+ * Date: 25.03.2017<br>
+ * Time: 15:39<br>
+ * Основной класс приложения. Является точкой входа для приложения с UI на JavaFX.
+ * Здесь же хранится список работников для таблицы.
+ */
+class MainApp : Application() {
+    /**
+     * Основной контейнер
+     */
+    lateinit var primaryStage: Stage
+
+    /**
+     * Базовый макет приложения
+     */
+    private lateinit var rootLayout: BorderPane
+
+    /**
+     * Данные таблицы работников
+     */
+    val workersData = FXCollections.observableArrayList<AbstractWorker>()!!
+
+    companion object {
+        @JvmStatic
+        fun main(arg: Array<String>) {
+            launch(MainApp::class.java)
+        }
+    }
+
+    override fun start(primaryStage: Stage) {
+        this.primaryStage = primaryStage
+        setFilePath(null)
+        initRootLayout()
+        showWorkersOverview()
+    }
+
+    /**
+     * Инициализация базового макета
+     */
+    private fun initRootLayout() {
+        try {
+            val loader = FXMLLoader()
+            loader.location = MainApp.javaClass.getResource("/com/app/view/RootLayout.fxml")
+            rootLayout = loader.load<Parent?>() as BorderPane
+            primaryStage.scene = Scene(rootLayout)
+            loader.getController<RootLayoutController>().mainApp = this
+            primaryStage.show()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    /**
+     * Открытие таблицы с работниками
+     */
+    private fun showWorkersOverview() {
+        try {
+            val loader = FXMLLoader()
+            loader.location = MainApp.javaClass.getResource("/com/app/view/WorkersOverview.fxml")
+            rootLayout.center = loader.load<Parent?>() as AnchorPane
+            loader.getController<WorkersOverviewController>().mainApp = this
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    /**
+     * Открытие дилога создания работника
+     * @return AbstractWorker
+     * @see AbstractWorker
+     * @see WorkerFactory.create
+     */
+    fun showWorkerEditDialog(): AbstractWorker? {
+        val loader = FXMLLoader()
+        loader.location = MainApp.javaClass.getResource("/com/app/view/WorkerEditDialog.fxml")
+        val dialogStage = Stage()
+        dialogStage.title = "Добавить работника"
+        dialogStage.initModality(Modality.WINDOW_MODAL)
+        dialogStage.initOwner(primaryStage)
+        dialogStage.scene = Scene(loader.load())
+        val controller = loader.getController<WorkerEditDialogController>()
+        controller.dialogStage = dialogStage
+        dialogStage.showAndWait()
+        if (controller.okClicked) {
+            return WorkerFactory.create(controller.getSalaryType(), controller.getRate(), controller.getEffortInterval())
+        }
+        return null
+    }
+
+    /**
+     * Открытие окна формы поиска
+     */
+    fun showSearchForm() {
+        val loader = FXMLLoader()
+        loader.location = MainApp.javaClass.getResource("/com/app/view/SearchForm.fxml")
+        val dialogStage = Stage()
+        dialogStage.title = "Поиск"
+        dialogStage.initModality(Modality.WINDOW_MODAL)
+        dialogStage.initOwner(primaryStage)
+        dialogStage.scene = Scene(loader.load())
+        val controller = loader.getController<SearchFormController>()
+        controller.mainApp = this
+        loader.getController<SearchFormController>().dialogStage = dialogStage
+        dialogStage.showAndWait()
+    }
+
+    /**
+     * Загрузка данных из файла
+     */
+    fun loadPersonDataFromFile(file: File) {
+        try {
+            val context = JAXBContext
+                    .newInstance(WorkersListWrapper::class.java)
+            val um = context.createUnmarshaller()
+            val wrapper = um.unmarshal(file) as WorkersListWrapper
+            workersData.clear()
+            workersData.addAll(wrapper.workers)
+            setFilePath(file)
+        } catch (e: Exception) {
+            val dialog = Alert(Alert.AlertType.ERROR)
+            dialog.title = "Ошибка"
+            dialog.headerText = "Невозможно загрузить информацию из файла:\n${file.path}"
+            dialog.contentText = e.message
+            dialog.showAndWait()
+        }
+    }
+
+    /**
+     * Сохранение данных таблицы в файл
+     */
+    fun saveWorkersDataToFile(file: File) {
+        try {
+            val context = JAXBContext
+                    .newInstance(WorkersListWrapper::class.java)
+            val m = context.createMarshaller()
+            m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true)
+            val wrapper = WorkersListWrapper()
+            wrapper.workers = workersData
+            m.marshal(wrapper, file)
+            setFilePath(file)
+        } catch (e: Exception) {
+            val dialog = Alert(Alert.AlertType.ERROR)
+            dialog.title = "Ошибка"
+            dialog.headerText = "Невозможно сохранить информацию в файл:\n${file.path}"
+            dialog.contentText = e.message
+            dialog.showAndWait()
+        }
+
+    }
+
+    /**
+     * Установка пути к файлу
+     */
+    fun setFilePath(file: File?) {
+        val prefs = Preferences.userNodeForPackage(MainApp::class.java)
+        if (file != null) {
+            prefs.put("filePath", file.path)
+            primaryStage.title = "Список работников - " + file.name
+        } else {
+            prefs.remove("filePath")
+            primaryStage.title = "Список работников"
+        }
+    }
+
+    /**
+     * Получение пути к файлу
+     */
+    fun getFilePath(): File? {
+        val filePath = Preferences.userNodeForPackage(MainApp::class.java).get("filePath", null)
+        if (filePath != null) {
+            return File(filePath)
+        } else {
+            return null
+        }
+    }
+}

src/com/app/debugUtils.kt

@@ -0,0 +1,15 @@
+package com.app
+
+import java.lang.management.*
+
+/**
+ * Created by IntelliJ IDEA.<br>
+ * User: TrofimovAA<br>
+ * Date: 27.03.2017<br>
+ * Time: 4:38<br>
+ * Утилиты для отладки
+ */
+/**
+ * Текущее значение режима приложения. true - если приложение в режиме отладки
+ */
+val DEBUG_MODE = ManagementFactory.getRuntimeMXBean().inputArguments.toString().indexOf("-agentlib:jdwp") > 0;

src/model/AbstractWorker.kt → src/com/app/model/AbstractWorker.kt

@@ -1,4 +1,6 @@
-package model
+package com.app.model
+
+import com.google.common.base.*
 
 /**
  * Created by IntelliJ IDEA.<br>
@@ -11,7 +13,7 @@ abstract class AbstractWorker {
     /**
      * Интервал времени для расчета
      */
-    var interval: Double = .0
+    var effortInterval: Double = .0
         set(value) {
             validateNonNegative(value)
             field = value
@@ -27,12 +29,27 @@ abstract class AbstractWorker {
      */
     abstract fun getSalaryInternal(duration: Double) : Double
 
+    /**
+     * Коэффициент зарплаты
+     */
+    abstract fun getRate() : Double
+
     /**
      * Расчет зарплаты за заданный интервал времени
      */
-    fun getSalary(duration: Double = interval): Double {
+    fun getSalary(duration: Double = effortInterval): Double {
         validateIsPositive(duration)
         return getSalaryInternal(duration)
     }
 
+    override fun equals(other: Any?): Boolean {
+        if (other !is AbstractWorker || !this.javaClass.equals(other.javaClass)) {
+            return false
+        }
+        return effortInterval.equals(other.effortInterval)
+    }
+
+    override fun hashCode(): Int {
+        return Objects.hashCode(effortInterval)
+    }
 }

src/model/HourWorker.kt → src/com/app/model/HourWorker.kt

@@ -1,4 +1,6 @@
-package model
+package com.app.model
+
+import com.google.common.base.*
 
 /**
  * Created by IntelliJ IDEA.<br>
@@ -28,4 +30,17 @@ class HourWorker() : AbstractWorker() {
     override fun getSalaryInternal(duration: Double): Double {
         return duration.times(hourRate)
     }
+
+    override fun getRate(): Double = hourRate
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is HourWorker || !this.javaClass.equals(other.javaClass)) {
+            return false
+        }
+        return super.equals(other) && hourRate.equals(other.hourRate)
+    }
+
+    override fun hashCode(): Int {
+        return Objects.hashCode(effortInterval, hourRate)
+    }
 }

src/com/app/model/SalaryType.kt

@@ -0,0 +1,41 @@
+package com.app.model
+
+/**
+ * Created by IntelliJ IDEA.<br>
+ * User: Alexey<br>
+ * Date: 25.03.2017<br>
+ * Time: 1:10<br>
+ * Способ начисления зарплаты
+ */
+enum class SalaryType(private val type: String) {
+
+    /**
+     * Почасовая
+     */
+    Hour("Почасовая"),
+
+    /**
+     * Оклад
+     */
+    Salary("Оклад"),
+
+    /**
+     * Ставка
+     */
+    Wage("Ставка");
+
+    companion object {
+        /**
+         * Получение SalaryType по строке
+         */
+        fun toEnum(type: String) =
+                when (type) {
+                    "Почасовая" -> Hour
+                    "Оклад" -> Salary
+                    "Ставка" -> Wage
+                    else -> null
+                }
+    }
+
+    override fun toString() = type
+}