maven move

6 files changed, 36 insertions, 21 deletions

diff --git a/src/com/snilius/xquery/FrameDisplayer.java b/src/main/java/com/snilius/xquery/FrameDisplayer.java
index 6874b4f..cd9da75 100644
--- a/src/com/snilius/xquery/FrameDisplayer.java
+++ b/src/main/java/com/snilius/xquery/FrameDisplayer.java
@@ -1,5 +1,5 @@
 //  Copyright 2003 Elliotte Rusty Harold
-//
+//  Copyright 2013-2014 Victor Häggqvist
 //  This file is part of XQuisitor.
 //
 //  XQuisitor is free software; you can redistribute it and/or modify
diff --git a/src/com/snilius/xquery/MacOSHandler.java b/src/main/java/com/snilius/xquery/MacOSHandler.java
index 07bf757..2332c46 100644
--- a/src/com/snilius/xquery/MacOSHandler.java
+++ b/src/main/java/com/snilius/xquery/MacOSHandler.java
@@ -1,4 +1,5 @@
 //  Copyright 2004 Elliotte Rusty Harold
+//  Copyright 2013-2014 Victor Häggqvist
 //
 //  This file is part of XQuisitor.
 //
@@ -38,21 +39,27 @@ import com.apple.eawt.ApplicationAdapter;
 import com.apple.eawt.ApplicationEvent;
 import com.apple.eawt.Application;
 
+import javax.swing.*;
+
 /**
  * @author Elliotte Rusty Harold
  * @version 1.0a5
+ *
+ * @author Victor Häggqvist
+ * @since 2013-12-18
+ * @version 2.0
  */
 public class MacOSHandler extends Application {
 
     private QueryFrame frame;
-    private Dialog about;
+    private JFrame about;
     
     // can I add a hiddenFrame of some kind to keep the 
     // menu bar onscreen????
     
     public MacOSHandler(QueryFrame frame) {
         this.frame = frame;
-        about = new AboutDialog(frame);
+        about = new AboutDialog();
         addApplicationListener(new AboutBoxHandler());
     }
 
diff --git a/src/com/snilius/xquery/Messages.java b/src/main/java/com/snilius/xquery/Messages.java
index 6a6891e..02ade7f 100644
--- a/src/com/snilius/xquery/Messages.java
+++ b/src/main/java/com/snilius/xquery/Messages.java
@@ -1,4 +1,5 @@
 //  Copyright 2003 Elliotte Rusty Harold
+//  Copyright 2013-2014 Victor Häggqvist
 //
 //  This file is part of XQuisitor.
 //
@@ -28,21 +29,25 @@
 
 package com.snilius.xquery;
 
+import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 /**
  * @author Elliotte Rusty Harold
  * @version 1.0a5
+ *
+ * @author Victor Häggqvist
+ * @since 2013-12-18
+ * @version 2.0
  */
 class Messages {
 
-    private static final String BUNDLE_NAME = "com.snilius.xquery.QueryFrame";
+    private static final String BUNDLE_NAME = "QueryFrame";
 
-    private static final ResourceBundle RESOURCE_BUNDLE =
-        ResourceBundle.getBundle(BUNDLE_NAME);
+    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME,Locale.ENGLISH);
 
-    private Messages() {}
+    private Messages() { }
     
     public static String getString(String key) {
         try {
diff --git a/src/com/snilius/xquery/QueryFrame.java b/src/main/java/com/snilius/xquery/QueryFrame.java
index f1e6d17..eb02396 100644
--- a/src/com/snilius/xquery/QueryFrame.java
+++ b/src/main/java/com/snilius/xquery/QueryFrame.java
@@ -1,4 +1,5 @@
 //  Copyright 2003-2005 Elliotte Rusty Harold
+//  Copyright 2013-2014 Victor Häggqvist
 //
 //  This file is part of XQuisitor.
 //
@@ -84,6 +85,9 @@ import java.util.prefs.Preferences;
  * @author Elliotte Rusty Harold
  * @version 1.0a5
  *
+ * @author Victor Häggqvist
+ * @since 2013-12-18
+ * @version 2.0
  */
 final class QueryFrame extends JFrame {
 
@@ -928,8 +932,8 @@ final class QueryFrame extends JFrame {
     private class AboutListener implements ActionListener {
         
         public void actionPerformed(ActionEvent evt) {
-            JDialog dialog = new AboutDialog(QueryFrame.this);
-            dialog.show();
+            JFrame about = new AboutDialog();
+            about.show();
         }
 
     }
diff --git a/src/com/snilius/xquery/XQuisitor.java b/src/main/java/com/snilius/xquery/XQuisitor.java
index f56a41d..2ce00d7 100644
--- a/src/com/snilius/xquery/XQuisitor.java
+++ b/src/main/java/com/snilius/xquery/XQuisitor.java
@@ -1,4 +1,5 @@
 //  Copyright 2003, 2004 Elliotte Rusty Harold
+//  Copyright 2013-2014 Victor Häggqvist
 //
 //  This file is part of XQuisitor.
 //
@@ -42,20 +43,19 @@ import javax.swing.UIManager;
  * 
  * @author Elliotte Rusty Harold
  * @version 1.0a5
+ *
+ * @author Victor Häggqvist
+ * @since 2013-12-18
+ * @version 2.0
  */
 class XQuisitor {
-    // write a shell script to launch it????
-
 
     public static void main(String[] args) {
-        
         initAppleProperties();
         
         try {
-            UIManager.setLookAndFeel(
-              UIManager.getSystemLookAndFeelClassName());
-        } 
-        catch (Exception ex) {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        }catch (Exception ex) {
             // no big deal; just use Metal
         }
         
@@ -64,14 +64,12 @@ class XQuisitor {
             QueryFrame frame = new QueryFrame();
             Runnable runner = new FrameDisplayer(frame);
             EventQueue.invokeLater(runner);
-        }
-        catch (NoClassDefFoundError ex) {
+        }catch (NoClassDefFoundError ex) {
             if (ex.getMessage().indexOf("saxon") != -1) {
                 JOptionPane.showMessageDialog(null, 
                   "Saxon 8 is not in the CLASSPATH. (Try using -Xbootclasspath/p:)"
                 );
-            }
-            else {
+            }else {
                 ex.printStackTrace();
             }
             System.exit(1);
diff --git a/src/com/snilius/xquery/QueryFrame.properties b/src/main/resources/QueryFrame.properties
index 9d3025f..9ce6d46 100644
--- a/src/com/snilius/xquery/QueryFrame.properties
+++ b/src/main/resources/QueryFrame.properties
@@ -51,4 +51,5 @@ Printing_error_57=Printing error
 Could_not_locate_a_printer._58=Could not locate a printer.
 gpl=XQuisitor2 is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published \nby the Free Software Foundation; either version 2 of the License, \nor (at your option) any later version.\n\nXQuisitor is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with XQuisitor; if not, write to the\n\nFree Software Foundation, Inc. \n59 Temple Place, Suite 330\nBoston, MA  02111-1307\nUSA
 Error_on_line=Error on line
-column=column
\ No newline at end of file
+column=column
+copyright_credits=<html>XQuisitor2<br>Version: 2.0<br><br>Copyright 2003-2005 Elliotte Rusty Harold<br>Copyright 2013-2014 Victor H&auml;ggqvist<br><br>Saxon-HE XSLT Processor http://www.saxonica.com/ Mozilla Public License Version 2.0<br>RSyntaxTextArea http://www.fifesoft.com/rsyntaxtextarea/ <a href="http://fifesoft.com/rsyntaxtextarea/RSyntaxTextArea.License.txt">Modified BSD License</a><br><br></html>
\ No newline at end of file