Switch DAO to using submission_id for finding students. Recursive code reformat.

mark.george / marking

Browse code Switch DAO to using submission_id for finding students. Recursive code reformat.
1 parent 9eed773 commit 9954dfde81327dedc8b9082006c37dd2e0a06eb5 Mark George authored on 17 Jun 2022

Patch

Showing 10 changed files

Ignore Space Show notes View src/main/java/Main.java
import com.formdev.flatlaf.FlatDarkLaf; import ui.SubmissionFrame; /** * * @author mark / public class Main { @SuppressWarnings("Convert2Lambda") public static void main(String args[]) throws Exception { FlatDarkLaf.setup(); java.awt.EventQueue.invokeLater(new Runnable() { @Override public void run() { SubmissionFrame dialog = new SubmissionFrame(); dialog.addWindowListener(new java.awt.event.WindowAdapter() { @Override public void windowClosing(java.awt.event.WindowEvent e) { System.exit(0); } }); dialog.setVisible(true); } }); } } import com.formdev.flatlaf.FlatDarkLaf; import ui.SubmissionFrame; /* * * @author mark */ public class Main { public static void main(String args[]) throws Exception { FlatDarkLaf.setup(); java.awt.EventQueue.invokeLater(new Runnable() { @Override public void run() { SubmissionFrame dialog = new SubmissionFrame(); dialog.addWindowListener(new java.awt.event.WindowAdapter() { @Override public void windowClosing(java.awt.event.WindowEvent e) { System.exit(0); } }); dialog.setVisible(true); } }); } }

Ignore Space Show notes View

src/main/java/Main.java

Ignore Space Show notes View src/main/java/dao/JdbcConnection.java
package dao; import java.sql.Connection; import java.sql.SQLException; import org.h2.jdbcx.JdbcConnectionPool; /** * * @author mark / public class JdbcConnection { private static final String url = MarkingProperties.jdbcUri(); private static final String username = "sa"; private static final String password = ""; private static final JdbcConnectionPool pool = JdbcConnectionPool.create(url, username, password); public static Connection getConnection() { try { return pool.getConnection(); } catch (SQLException ex) { throw new RuntimeException(ex); } } } package dao; import java.sql.Connection; import java.sql.SQLException; import org.h2.jdbcx.JdbcConnectionPool; /* * * @author mark */ public class JdbcConnection { // private static final String url = "jdbc:h2:tcp://localhost/~/work/202/2020/marking/project/m1/db/m1;IFEXISTS=TRUE"; // private static final String url = "jdbc:h2:./db/testing;IFEXISTS=TRUE"; private static final String url = MarkingProperties.jdbcUri(); private static final String username = "sa"; private static final String password = ""; private static final JdbcConnectionPool pool = JdbcConnectionPool.create(url, username, password); public static Connection getConnection() { try { return pool.getConnection(); } catch (SQLException ex) { throw new RuntimeException(ex); } } }

Ignore Space Show notes View

src/main/java/dao/JdbcConnection.java

Ignore Space Show notes View src/main/java/dao/MarkingProperties.java
package dao; import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; import javax.swing.JOptionPane; /** * * @author mark / @SuppressWarnings("StaticNonFinalUsedInInitialization") public class MarkingProperties { private static Properties properties = null; static { if (properties == null) { properties = new Properties(); try { // production properties.load(new FileInputStream("marking.properties")); } catch (IOException ex1) { try { // development properties.load(MarkingProperties.class.getResourceAsStream("/marking.properties")); } catch (IOException ex2) { JOptionPane.showMessageDialog(null, "marking.properties not found!"); } } } } public static String jdbcUri() { return properties.getProperty("jdbc.url").trim(); } public static String reportPath() { return properties.getProperty("report.dir").trim(); } public static String attachmentEmailName() { return properties.getProperty("attachment.email.name").trim(); } public static String attachmentFilePrefix() { return properties.getProperty("attachment.file.prefix").trim(); } public static String assessmentDescription() { return properties.getProperty("assessment.description").trim(); } public static Boolean isEmailEnabled() { return properties.getProperty("enable.email").trim().equalsIgnoreCase("true"); } public static String xidType() { return properties.getProperty("submission.key.type").trim(); } public static String smtpHost() { return properties.getProperty("smtp.host").trim(); } public static Boolean isTls() { return properties.getProperty("smtp.tls").trim().equalsIgnoreCase("true"); } public static String smtpUserName() { return properties.getProperty("smtp.user.name").trim(); } public static String markerName() { return properties.getProperty("marker.name").trim(); } public static String markerEmail() { return properties.getProperty("marker.email").trim(); } public static Integer smtpPort() { return Integer.valueOf(properties.getProperty("smtp.port").trim()); } public static Integer emailDelay() { return Integer.valueOf(properties.getProperty("email.delay").trim()); } public static Boolean reportShowMax() { return properties.getProperty("report.showmax").trim().equalsIgnoreCase("true"); } public static String reportTitle() { return properties.getProperty("report.title").trim(); } public static String reportFooter() { return properties.getProperty("report.footer").trim(); } public static String paperCode() { return properties.getProperty("paper.code").trim(); } } package dao; import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; import javax.swing.JOptionPane; /* * * @author mark */ @SuppressWarnings("StaticNonFinalUsedInInitialization") public class MarkingProperties { private static Properties properties = null; static { if (properties == null) { properties = new Properties(); try { // production properties.load(new FileInputStream("marking.properties")); } catch (IOException ex1) { try { // development properties.load(MarkingProperties.class.getResourceAsStream("/marking.properties")); } catch (IOException ex2) { JOptionPane.showMessageDialog(null, "marking.properties not found!"); } } } } public static String jdbcUri() { return properties.getProperty("jdbc.url").trim(); } public static String reportPath() { return properties.getProperty("report.dir").trim(); } public static String attachmentEmailName() { return properties.getProperty("attachment.email.name").trim(); } public static String attachmentFilePrefix() { return properties.getProperty("attachment.file.prefix").trim(); } public static String assessmentDescription() { return properties.getProperty("assessment.description").trim(); } public static Boolean isEmailEnabled() { return properties.getProperty("enable.email").trim().equalsIgnoreCase("true"); } public static String idType() { return properties.getProperty("submission.key.type").trim(); } public static String smtpHost() { return properties.getProperty("smtp.host").trim(); } public static Boolean isTls() { return properties.getProperty("smtp.tls").trim().equalsIgnoreCase("true"); } public static String smtpUserName() { return properties.getProperty("smtp.user.name").trim(); } public static String markerName() { return properties.getProperty("marker.name").trim(); } public static String markerEmail() { return properties.getProperty("marker.email").trim(); } public static Integer smtpPort() { return Integer.valueOf(properties.getProperty("smtp.port").trim()); } public static Integer emailDelay() { return Integer.valueOf(properties.getProperty("email.delay").trim()); } public static Boolean reportShowMax() { return properties.getProperty("report.showmax").trim().equalsIgnoreCase("true"); } public static String reportTitle() { return properties.getProperty("report.title").trim(); } public static String reportFooter() { return properties.getProperty("report.footer").trim(); } public static String paperCode() { return properties.getProperty("paper.code").trim(); } }

Ignore Space Show notes View

src/main/java/dao/MarkingProperties.java

package dao;

import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
import javax.swing.JOptionPane;

/**
 *
 * @author mark
 */
@SuppressWarnings("StaticNonFinalUsedInInitialization")
public class MarkingProperties {

private static Properties properties = null;

static {
		if (properties == null) {

properties = new Properties();
			try {
				// production
				properties.load(new FileInputStream("marking.properties"));
			} catch (IOException ex1) {
				try {
					// development
					properties.load(MarkingProperties.class.getResourceAsStream("/marking.properties"));
				} catch (IOException ex2) {
					JOptionPane.showMessageDialog(null, "marking.properties not found!");
				}
			}
		}
	}

public static String jdbcUri() {
		return properties.getProperty("jdbc.url").trim();
	}

public static String reportPath() {
		return properties.getProperty("report.dir").trim();
	}

public static String attachmentEmailName() {
		return properties.getProperty("attachment.email.name").trim();
	}

public static String attachmentFilePrefix() {
		return properties.getProperty("attachment.file.prefix").trim();
	}

public static String assessmentDescription() {
		return properties.getProperty("assessment.description").trim();
	}

public static Boolean isEmailEnabled() {
		return properties.getProperty("enable.email").trim().equalsIgnoreCase("true");
	}

public static String xidType() {
		return properties.getProperty("submission.key.type").trim();
	}

public static String smtpHost() {
		return properties.getProperty("smtp.host").trim();
	}

public static Boolean isTls() {
		return properties.getProperty("smtp.tls").trim().equalsIgnoreCase("true");
	}

public static String smtpUserName() {
		return properties.getProperty("smtp.user.name").trim();
	}

public static String markerName() {
		return properties.getProperty("marker.name").trim();
	}

public static String markerEmail() {
		return properties.getProperty("marker.email").trim();
	}

public static Integer smtpPort() {
		return Integer.valueOf(properties.getProperty("smtp.port").trim());
	}

public static Integer emailDelay() {
		return Integer.valueOf(properties.getProperty("email.delay").trim());
	}

public static Boolean reportShowMax() {
		return properties.getProperty("report.showmax").trim().equalsIgnoreCase("true");
	}

public static String reportTitle() {
		return properties.getProperty("report.title").trim();
	}

public static String reportFooter() {
		return properties.getProperty("report.footer").trim();
	}

public static String paperCode() {
		return properties.getProperty("paper.code").trim();
	}

}

package dao;

import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
import javax.swing.JOptionPane;

/**
 *
 * @author mark
 */
@SuppressWarnings("StaticNonFinalUsedInInitialization")
public class MarkingProperties {

private static Properties properties = null;

static {
		if (properties == null) {

public static String jdbcUri() {
		return properties.getProperty("jdbc.url").trim();
	}

public static String reportPath() {
		return properties.getProperty("report.dir").trim();
	}

public static String attachmentEmailName() {
		return properties.getProperty("attachment.email.name").trim();
	}

public static String attachmentFilePrefix() {
		return properties.getProperty("attachment.file.prefix").trim();
	}

public static String assessmentDescription() {
		return properties.getProperty("assessment.description").trim();
	}

public static Boolean isEmailEnabled() {
		return properties.getProperty("enable.email").trim().equalsIgnoreCase("true");
	}

public static String idType() {
		return properties.getProperty("submission.key.type").trim();
	}