wip

diff --git a/src/main/scala/jp/ymir/taskReporter/Main.scala b/src/main/scala/jp/ymir/taskReporter/Main.scala
index 94bd3c78374be41a1a5353883fe6d46efc8d4099..a2ba207b50973705ab7214156c1ebc0e1f766628 100644 (file)
--- a/src/main/scala/jp/ymir/taskReporter/Main.scala
+++ b/src/main/scala/jp/ymir/taskReporter/Main.scala
@@ -11,6 +11,9 @@ object Main {
   }
 
   def main(args: Array[String]) {
+    // THINKME: Needed only on OpenJDK?
+    //scala.sys.props.update("awt.useSystemAAFontSettings", "lcd")
+
     try {
       UIManager.setLookAndFeel(Preferences.lookAndFeel())
       JFrame.setDefaultLookAndFeelDecorated(true)

diff --git a/src/main/scala/jp/ymir/taskReporter/ui/MainFrame.scala b/src/main/scala/jp/ymir/taskReporter/ui/MainFrame.scala
index 3759437c664d32886a537faa6705fe0b79fdae03..4e7edbf578613c230a31676af9b46b7f9e110493 100644 (file)
--- a/src/main/scala/jp/ymir/taskReporter/ui/MainFrame.scala
+++ b/src/main/scala/jp/ymir/taskReporter/ui/MainFrame.scala
@@ -28,59 +28,6 @@ class MainFrame(reportFile: Option[File]) extends Frame {
     }
   })
 
-  override def closeOperation {
-    if (dirty) {
-      val r = JOptionPane.showConfirmDialog(
-        peer,
-        "The report file \"" + reportSet.file.get.getName + "\" has been modified.\n" +
-          "Do you want to save it before closing?",
-        "Confirmation",
-        JOptionPane.YES_NO_CANCEL_OPTION);
-
-      r match {
-        case JOptionPane.YES_OPTION => save; dispose
-        case JOptionPane.NO_OPTION  => dispose
-        case _ =>
-      }
-    }
-    else {
-      dispose
-    }
-  }
-
-  def dirty : Boolean = {
-    return reportSet.dirty
-  }
-
-  def save {
-    if (reportSet.file.isEmpty) {
-      val chooser = new FileChooser(Preferences.lastChosenDir())
-      val r = chooser.showSaveDialog(null)
-      if (r != FileChooser.Result.Approve) {
-        return
-      }
-
-      if (chooser.selectedFile.exists) {
-        val r = JOptionPane.showConfirmDialog(
-          peer,
-          "The chosen file or directory \"" + chooser.selectedFile.getName + "\" already exists.\n" +
-            "Do you want to overwrite it?",
-          "Confirmation",
-          JOptionPane.YES_NO_OPTION)
-
-        r match {
-          case JOptionPane.YES_OPTION =>
-          case JOptionPane.NO_OPTION  => return
-        }
-      }
-
-      Preferences.lastChosenDir() = chooser.selectedFile.getParentFile
-      reportSet.file = Some(chooser.selectedFile)
-    }
-
-    reportSet.save
-  }
-
   menuBar = new MenuBar {
     contents += new Menu("File") {
       mnemonic = Key.F
@@ -155,4 +102,57 @@ class MainFrame(reportFile: Option[File]) extends Frame {
   }
 
   visible = true
+
+  override def closeOperation {
+    if (dirty) {
+      val r = JOptionPane.showConfirmDialog(
+        peer,
+        "The report file \"" + reportSet.file.get.getName + "\" has been modified.\n" +
+          "Do you want to save it before closing?",
+        "Confirmation",
+        JOptionPane.YES_NO_CANCEL_OPTION);
+
+      r match {
+        case JOptionPane.YES_OPTION => save; dispose
+        case JOptionPane.NO_OPTION  => dispose
+        case _ =>
+      }
+    }
+    else {
+      dispose
+    }
+  }
+
+  def dirty : Boolean = {
+    return reportSet.dirty
+  }
+
+  def save {
+    if (reportSet.file.isEmpty) {
+      val chooser = new FileChooser(Preferences.lastChosenDir())
+      val r = chooser.showSaveDialog(null)
+      if (r != FileChooser.Result.Approve) {
+        return
+      }
+
+      if (chooser.selectedFile.exists) {
+        val r = JOptionPane.showConfirmDialog(
+          peer,
+          "The chosen file or directory \"" + chooser.selectedFile.getName + "\" already exists.\n" +
+            "Do you want to overwrite it?",
+          "Confirmation",
+          JOptionPane.YES_NO_OPTION)
+
+        r match {
+          case JOptionPane.YES_OPTION =>
+          case JOptionPane.NO_OPTION  => return
+        }
+      }
+
+      Preferences.lastChosenDir() = chooser.selectedFile.getParentFile
+      reportSet.file = Some(chooser.selectedFile)
+    }
+
+    reportSet.save
+  }
 }