Linux popup (#35)

* updated the type of the error JFrame to see if that would remove its transparency on Linux

* updated how logs are created and fixed Popup issue

* fixed issue with the different file separators

* Updated the routines.py to make it compatible with python 3.7

* Updated the README and the routines script

* Updated the README

Author: pjkaufman

.gitignore

@@ -7,5 +7,8 @@ build/
 # test data
 test/
 
+# log data
+logs/
+
 # vs code files
-.vscode
+.vscode

README.md

@@ -12,10 +12,10 @@
     <a href="#installation">Installation</a>
   </li>
   <li>
-    <a href="#features">Features</a>
+    <a href="#usage">Usage</a>
   </li>
   <li>
-    <a href="#usage">Usage</a>
+    <a href="#features">Features</a>
   </li>
   <li>
     <a href="#documentation">Documentation</a>
@@ -34,21 +34,72 @@
     <a href="https://java.com/en/download/">Java</a>
   </li>
   <li>
-    <a href="https://www.python.org/downloads/">Python 2.7</a>
+    <a href="https://www.python.org/downloads/">Python 2.7 or later</a>
   </li>
   <li>
     Some kind of hosting service for MySQL such as <a href="http://wampserver.aviatechno.net/">WAMP</a>
   </li>
 </ol>
 
-_Note: the python scripts have only been tested in Python 2.7_
+_Note: the python scripts have only been tested in Python 2.7 and 3.7_
 
 Clone this repo by running `git clone https://github.com/pjkaufman/Java_DiffChecker.git`.
 
 Make sure that Python and the jre paths have been added to your PATH variable.
 
 <a href="#table_of_contents">Back to Table of Contents</a>
 
+<h2 id="usage">Usage</h2>
+
+Go to the base directory and run
+
+```
+python routines.py
+```
+
+You should see
+
+``` 
+Routine Options
+run - makes and runs the JAR file
+push - commits the current repo and pushes it
+debug - runs the current code base for testing
+clean - deletes the test, logs, and build directories
+Enter desired option:
+```
+
+### Running 
+
+When prompted by the script for a routine to run, type 'run'.
+
+If there are no errors you will see the following GUI:
+
+<div align="center">
+  <img src="UserGuides\images\runResult.png" alt="Database Difference Checker Home" height = "300"/>
+</div>
+
+### Testing
+
+After modifying any of the Java files in the repository, you can go to the base directory of this repository and run 
+
+```
+python routines.py
+```
+
+When prompted for the routine to run, enter 'debug'. This will compile all of the current Java files into the test/db_diff_checker_gui folder where it will be run if no errors occur (no JAR file will be created).
+
+### Manually Running The JAR File
+
+In order to use the JAR file with logs, make sure that where you run the jar file you have a logs folder.
+
+To run the applciation through the JAR file run
+
+```
+java -jar path_to_jar_file
+```
+
+<a href="#table_of_contents">Back to Table of Contents</a>
+
 <h2 id="features">Features</h2>
 
 <ol> 
@@ -107,47 +158,6 @@ Make sure that Python and the jre paths have been added to your PATH variable.
 
 <a href="#table_of_contents">Back to Table of Contents</a>
 
-<h2 id="usage">Usage</h2>
-
-Go to the base directory and run
-
-```
-python routines.py
-```
-
-You should see
-
-``` 
-Routine Options
-run - makes and runs the JAR file
-push - commits the current repo and pushes it
-debug - runs the current code base for testing
-clean - deletes the test and builds directories
-Enter desired option:
-```
-
-### Running 
-
-When prompted by the script for a routine to run, type 'run'.
-
-If there are no errors you will see the following GUI:
-
-<div align="center">
-  <img src="UserGuides\images\runResult.png" alt="Database Difference Checker Home" height = "300"/>
-</div>
-
-### Testing
-
-After modifying any of the Java files in the repository, you can go to the base directory and run 
-
-```
-python routines.py
-```
-
-When prompted for the routine to run, enter 'debug'. This will compile all of the current Java files into the test/db_diff_checker_gui folder where it will be run if no errors occur (no JAR file will be created).
-
-<a href="#table_of_contents">Back to Table of Contents</a>
-
 <h2 id="documentation">Documentation</h2>
 
 ### How It Works

dbdiffchecker/ErrorPopup.java

@@ -11,14 +11,15 @@
 import java.util.ArrayList;
 import javax.swing.JLabel;
 import javax.swing.SwingWorker;
+import javax.swing.BorderFactory;
+import java.awt.Color;
 
 /**
  * ErrorPopup is a JFrame that shows a message about an error that occurred.
- * Program Name: Database Difference Checker
- * CSCI Course: 325
- * Grade Received: Pass
+ * Program Name: Database Difference Checker CSCI Course: 325 Grade Received:
+ * Pass
  * @author Peter Kaufman
- * @version 2-16-19
+ * @version 3-17-19
  * @since 9-21-17
  */
 public class ErrorPopup extends JFrameV2 {
@@ -33,30 +34,32 @@ public class ErrorPopup extends JFrameV2 {
    */
   public ErrorPopup(DatabaseDiffernceCheckerException error) {
 
+    String errorMessage = "";
     StringWriter sw = new StringWriter();
     error.printStackTrace(new PrintWriter(sw));
     String exceptionAsString = sw.toString();
     try {
       log(exceptionAsString);
-    } catch(DatabaseDiffernceCheckerException err) {
+    } catch (DatabaseDiffernceCheckerException err) {
       System.out.println("Could not log the error...");
-    } 
-    error.printStackTrace();
+    }
     this.error = false;
-    initComponents();
-    this.errorLabel.setText(error.getMessage().substring(error.getMessage().indexOf(":") + 2));
+    errorMessage = error.getMessage().substring(error.getMessage().indexOf(":") + 2);
+    initComponents(errorMessage.length());
+    this.errorLabel.setText(errorMessage);
     this.setVisible(true);
   }
 
   /**
-   * Sets up the GUI Layout, sets up all action events, and initializes instance variables.
+   * Sets up the GUI Layout, sets up all action events, and initializes instance
+   * variables.
    * @author Peter Kaufman
    */
-  private void initComponents() {
+  private void initComponents(int sizeFactor) {
     // set up JFrame properties
     setTitle("Error");
-    setType(Window.Type.POPUP);
-    setMinimumSize(new Dimension(430, 100));
+    setType(Window.Type.UTILITY);
+    setMinimumSize(new Dimension(7 * sizeFactor, 100));
     setResizable(false);
     // set component properties
     titleLabel.setFont(new Font("Tahoma", 1, 18));
@@ -66,6 +69,7 @@ private void initComponents() {
     getContentPane().setLayout(new BorderLayout());
     add(titleLabel, BorderLayout.NORTH);
     add(errorLabel, BorderLayout.CENTER);
+    this.getRootPane().setBorder(BorderFactory.createMatteBorder(0, 1, 1, 1, Color.white));
     pack();
   }
 }

dbdiffchecker/FileHandler.java

@@ -25,7 +25,7 @@
 public class FileHandler {
 
   // static variables
-  static final String logFileName = "activity.log"; 
+  static final String logFileName = "activity.log";
   static final String lastSequelStatementFileName = "lastRun.txt";
   static final String databaseSnapshotFileName = "dbsnapshot";
 
@@ -38,7 +38,7 @@ public class FileHandler {
   public static void serializeDatabase(Database database) throws DatabaseDiffernceCheckerException {
     try {
       FileOutputStream fileOutput = new FileOutputStream(
-          new File("logs\\" + databaseSnapshotFileName));
+          new File("logs" + File.separator + databaseSnapshotFileName));
       ObjectOutputStream outputStream = new ObjectOutputStream(fileOutput);
 
       // Write object to file
@@ -67,7 +67,7 @@ public static void serializeDatabase(Database database) throws DatabaseDiffernce
   public static void writeToFile(ArrayList<String> sequelStatements) throws IOException {
 
     PrintWriter out = new PrintWriter(new FileWriter(
-        new File("logs\\" + lastSequelStatementFileName)));
+        new File("logs" + File.separator + lastSequelStatementFileName)));
     for (String statement: sequelStatements) {
 
       out.println(statement);
@@ -84,7 +84,7 @@ public static void writeToFile(ArrayList<String> sequelStatements) throws IOExce
   public static void writeToFile(String data) throws IOException {
 
     Date currentTime = new Date();
-    PrintWriter out = new PrintWriter(new FileWriter(new File("logs\\" + logFileName), true));
+    PrintWriter out = new PrintWriter(new FileWriter(new File("logs" + File.separator + logFileName), true));
     out.println(currentTime.toString() + " " + data);
     out.close();
   }
@@ -100,7 +100,7 @@ public static Database deserailizDatabase() throws DatabaseDiffernceCheckerExcep
     Database database = null;
     try {
       FileInputStream fileInput = new FileInputStream(
-          new File("logs\\" + databaseSnapshotFileName));
+          new File("logs" + File.separator + databaseSnapshotFileName));
       ObjectInputStream inputStream = new ObjectInputStream(fileInput);
 
       // Read object
@@ -118,7 +118,7 @@ public static Database deserailizDatabase() throws DatabaseDiffernceCheckerExcep
             .indexOf(":") + 1);
       }
       throw new DatabaseDiffernceCheckerException(errorMessage, cause);
-    } 
+    }
 
     return database;
   }
@@ -132,7 +132,7 @@ public static Database deserailizDatabase() throws DatabaseDiffernceCheckerExcep
    */
   public static ArrayList<String> readFrom(String file) throws IOException {
 
-    Scanner in = new Scanner(new File("logs\\" + file));
+    Scanner in = new Scanner(new File("logs" + File.separator + file));
     ArrayList<String> fileLines = new ArrayList<>();
     while (in.hasNextLine()) {
 
@@ -144,14 +144,14 @@ public static ArrayList<String> readFrom(String file) throws IOException {
   }
 
   /**
-   * Ttakes a file path and determines whether the file exists or not.
+   * Takes a file path and determines whether the file exists or not.
    * @author Chris Dail
    * @param file The file path to the file.
    * @return Whether the file exists or not.
    * @see <a href="https://stackoverflow.com/questions/1816673/how-do-i-check-if-a-file-exists-in-java">https://stackoverflow.com/questions/1816673/how-do-i-check-if-a-file-exists-in-java</a>
    */
   public static boolean fileExists(String file) {
 
-    return new File("logs\\" + file).isFile();
+    return new File("logs" + File.separator + file).isFile();
   }
 }

docs/allclasses-frame.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Mar 07 05:09:06 EST 2019 -->
+<!-- Generated by javadoc (1.8.0_101) on Mon Mar 18 18:58:19 EDT 2019 -->
 <title>All Classes</title>
-<meta name="date" content="2019-03-07">
+<meta name="date" content="2019-03-18">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/allclasses-noframe.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Mar 07 05:09:06 EST 2019 -->
+<!-- Generated by javadoc (1.8.0_101) on Mon Mar 18 18:58:19 EDT 2019 -->
 <title>All Classes</title>
-<meta name="date" content="2019-03-07">
+<meta name="date" content="2019-03-18">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/constant-values.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Mar 07 05:09:06 EST 2019 -->
+<!-- Generated by javadoc (1.8.0_101) on Mon Mar 18 18:58:19 EDT 2019 -->
 <title>Constant Field Values</title>
-<meta name="date" content="2019-03-07">
+<meta name="date" content="2019-03-18">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/dbdiffchecker/Column.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Mar 07 05:08:58 EST 2019 -->
+<!-- Generated by javadoc (1.8.0_101) on Mon Mar 18 18:58:13 EDT 2019 -->
 <title>Column</title>
-<meta name="date" content="2019-03-07">
+<meta name="date" content="2019-03-18">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>

docs/dbdiffchecker/DBCompare.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Mar 07 05:09:01 EST 2019 -->
+<!-- Generated by javadoc (1.8.0_101) on Mon Mar 18 18:58:16 EDT 2019 -->
 <title>DBCompare</title>
-<meta name="date" content="2019-03-07">
+<meta name="date" content="2019-03-18">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>

docs/dbdiffchecker/DB_Diff_Checker_GUI.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Mar 07 05:09:00 EST 2019 -->
+<!-- Generated by javadoc (1.8.0_101) on Mon Mar 18 18:58:15 EDT 2019 -->
 <title>DB_Diff_Checker_GUI</title>
-<meta name="date" content="2019-03-07">
+<meta name="date" content="2019-03-18">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>